Skip to content

Commit 757a893

Browse files
jeromevdljeromevdl
authored
Merge branch 'v2' into dependabot/maven/v2/commons-io-commons-io-2.16.1
2 parents 0c1d82c + 471c3a6 commit 757a893

File tree

23 files changed

+170
-32
lines changed

23 files changed

+170
-32
lines changed

‎.github/workflows/docs-v2-snapshot.yml

+40
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
name: Docs
2+
on:
3+
push:
4+
branches:
5+
- v2
6+
workflow_dispatch: {}
7+
8+
permissions:
9+
id-token: write
10+
contents: write
11+
pages: write
12+
13+
jobs:
14+
docs:
15+
runs-on: ubuntu-latest
16+
environment: Docs
17+
steps:
18+
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
19+
- name: Set up Python
20+
uses: actions/setup-python@bd6b4b6205c4dbad673328db7b31b7fab9e241c0 # v4.6.1
21+
with:
22+
python-version: "3.8"
23+
- name: Capture branch and tag
24+
id: branch_name
25+
run: |
26+
echo "SOURCE_BRANCH=${GITHUB_REF#refs/heads/}" >> $GITHUB_ENV
27+
echo "SOURCE_TAG=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
28+
- name: Build docs website
29+
run: |
30+
make build-docs-website
31+
- name: Configure AWS credentials
32+
uses: aws-actions/configure-aws-credentials@e1e17a757e536f70e52b5a12b2e8d1d1c60e04ef
33+
with:
34+
aws-region: us-east-1
35+
role-to-assume: ${{ secrets.AWS_DOCS_ROLE_ARN }}
36+
- name: Deploy Docs
37+
run: |
38+
aws s3 sync \
39+
dist \
40+
s3://${{ secrets.AWS_DOCS_BUCKET }}/lambda-java/preview/

‎.github/workflows/publish-v2-snapshot.yml

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: Publish v2
2+
on:
3+
push:
4+
branches:
5+
- v2
6+
workflow_dispatch: {}
7+
jobs:
8+
publish:
9+
runs-on: ubuntu-latest
10+
environment: snapshot
11+
steps:
12+
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
13+
- name: Set up Maven Central Repository
14+
uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 # v3.11.0
15+
with:
16+
distribution: 'corretto'
17+
java-version: 11
18+
server-id: ossrh
19+
server-username: MAVEN_USERNAME
20+
server-password: MAVEN_PASSWORD
21+
# TODO: use environments https://docs.github.com/en/actions/deployment/targeting-different-environments/using-environments-for-deployment
22+
gpg-private-key: ${{ secrets.GPG_SIGNING_KEY }} # Value of the GPG private key to import
23+
gpg-passphrase: GPG_PASSPHRASE # env variable for GPG private key passphrase
24+
- name: Publish package
25+
run: mvn -Prelease clean validate deploy -DskipTests # We use validate here to run maven enforcer, to make sure we are only publishing SNAPSHOT builds
26+
env:
27+
MAVEN_USERNAME: ${{ secrets.SNAPSHOT_PUBLISH_USERNAME }}
28+
MAVEN_PASSWORD: ${{ secrets.SNAPSHOT_PUBLISH_PASSWORD }}
29+
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}

‎.github/workflows/publish.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ jobs:
2727
- name: Publish package
2828
run: mvn -Prelease clean deploy -DskipTests
2929
env:
30-
MAVEN_USERNAME: ${{ secrets.OSSRH_JIRA_USERNAME }}
31-
MAVEN_PASSWORD: ${{ secrets.OSSRH_JIRA_PASSWORD }}
30+
MAVEN_USERNAME: ${{ secrets.SNAPSHOT_PUBLISH_USERNAME }}
31+
MAVEN_PASSWORD: ${{ secrets.SNAPSHOT_PUBLISH_PASSWORD }}
3232
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
3333
- name: Close issues related to this release
3434
uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6.4.1

‎.github/workflows/run-e2e-tests.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ on:
2424
pull_request:
2525
branches:
2626
- main
27-
- v2
2827
paths:
2928
- 'powertools-e2e-tests/**'
3029

@@ -63,4 +62,4 @@ jobs:
6362
if: ${{ matrix.java != '8' }} # If not 8 don't exclude the examples directory
6463
run: mvn -DskipTests install --file pom.xml
6564
- name: Run e2e test with Maven
66-
run: mvn -Pe2e -B verify --file powertools-e2e-tests/pom.xml
65+
run: mvn -Pe2e -B verify --file powertools-e2e-tests/pom.xml

‎docs/index.md

+7-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,13 @@ title: Homepage
33
description: Powertools for AWS Lambda (Java)
44
---
55

6-
![aws provider](https://img.shields.io/badge/provider-AWS-orange?logo=amazon-aws&color=ff9900) ![Build status](https://github.com/aws-powertools/powertools-lambda-java/actions/workflows/build.yml/badge.svg) ![Maven Central](https://img.shields.io/maven-central/v/software.amazon.lambda/powertools-parent)
6+
![aws provider](https://img.shields.io/badge/provider-AWS-orange?logo=amazon-aws&color=ff9900) ![Build status](https://github.com/aws-powertools/powertools-lambda-java/actions/workflows/publish-v2-snapshot.yml/badge.svg) ![Maven Central](https://img.shields.io/maven-metadata/v?metadataUrl=https%3A%2F%2Faws.oss.sonatype.org%2Fcontent%2Frepositories%2Fsnapshots%2Fsoftware%2Famazon%2Flambda%2Fpowertools-parent%2Fmaven-metadata.xml
7+
)
8+
9+
???+ warning
10+
You are browsing the documentation for Powertools for AWS Lambda (Java) - v2. This is a snapshot release and not stable!
11+
Check out our stable [v1](https://docs.powertools.aws.dev/lambda/java/) documentation if this is not what you wanted.
12+
The v2 maven snapshot repository can be found [here](https://aws.oss.sonatype.org/content/repositories/snapshots/software/amazon/lambda/) .
713

814
Powertools for AWS Lambda (Java) is a suite of utilities for AWS Lambda Functions that makes tracing with AWS X-Ray, structured logging and creating custom metrics asynchronously easier.
915

‎examples/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<plugin>
4949
<groupId>org.apache.maven.plugins</groupId>
5050
<artifactId>maven-deploy-plugin</artifactId>
51-
<version>3.1.1</version>
51+
<version>3.1.2</version>
5252
<configuration>
5353
<skip>true</skip>
5454
</configuration>

‎examples/powertools-examples-batch/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@
109109
<plugin>
110110
<groupId>org.apache.maven.plugins</groupId>
111111
<artifactId>maven-shade-plugin</artifactId>
112-
<version>3.5.2</version>
112+
<version>3.6.0</version>
113113
<executions>
114114
<execution>
115115
<phase>package</phase>
@@ -136,7 +136,7 @@
136136
<plugin>
137137
<groupId>org.apache.maven.plugins</groupId>
138138
<artifactId>maven-deploy-plugin</artifactId>
139-
<version>3.1.1</version>
139+
<version>3.1.2</version>
140140
<configuration>
141141
<skip>true</skip>
142142
</configuration>

‎examples/powertools-examples-cloudformation/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@
117117
<plugin>
118118
<groupId>org.apache.maven.plugins</groupId>
119119
<artifactId>maven-shade-plugin</artifactId>
120-
<version>3.5.0</version>
120+
<version>3.6.0</version>
121121
<executions>
122122
<execution>
123123
<phase>package</phase>
@@ -144,7 +144,7 @@
144144
<plugin>
145145
<groupId>org.apache.maven.plugins</groupId>
146146
<artifactId>maven-deploy-plugin</artifactId>
147-
<version>3.1.1</version>
147+
<version>3.1.2</version>
148148
<configuration>
149149
<skip>true</skip>
150150
</configuration>

‎examples/powertools-examples-core-utilities/cdk/app/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104
<plugin>
105105
<groupId>org.apache.maven.plugins</groupId>
106106
<artifactId>maven-shade-plugin</artifactId>
107-
<version>3.5.0</version>
107+
<version>3.6.0</version>
108108
<executions>
109109
<execution>
110110
<phase>package</phase>
@@ -132,7 +132,7 @@
132132
<plugin>
133133
<groupId>org.apache.maven.plugins</groupId>
134134
<artifactId>maven-deploy-plugin</artifactId>
135-
<version>3.1.1</version>
135+
<version>3.1.2</version>
136136
<configuration>
137137
<skip>true</skip>
138138
</configuration>

‎examples/powertools-examples-core-utilities/cdk/infra/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<plugin>
1717
<groupId>org.apache.maven.plugins</groupId>
1818
<artifactId>maven-compiler-plugin</artifactId>
19-
<version>3.11.0</version>
19+
<version>3.13.0</version>
2020
<configuration>
2121
<source>11</source>
2222
<target>11</target>
@@ -25,7 +25,7 @@
2525
<plugin>
2626
<groupId>org.codehaus.mojo</groupId>
2727
<artifactId>exec-maven-plugin</artifactId>
28-
<version>3.2.0</version>
28+
<version>3.3.0</version>
2929
<configuration>
3030
<mainClass>cdk.CdkApp</mainClass>
3131
</configuration>
@@ -34,7 +34,7 @@
3434
<plugin>
3535
<groupId>org.apache.maven.plugins</groupId>
3636
<artifactId>maven-deploy-plugin</artifactId>
37-
<version>3.1.1</version>
37+
<version>3.1.2</version>
3838
<configuration>
3939
<skip>true</skip>
4040
</configuration>

‎examples/powertools-examples-core-utilities/sam/pom.xml

+10-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
<plugin>
9191
<groupId>org.apache.maven.plugins</groupId>
9292
<artifactId>maven-shade-plugin</artifactId>
93-
<version>3.5.0</version>
93+
<version>3.6.0</version>
9494
<executions>
9595
<execution>
9696
<phase>package</phase>
@@ -113,6 +113,15 @@
113113
</dependency>
114114
</dependencies>
115115
</plugin>
116+
<!-- Don't deploy the example -->
117+
<plugin>
118+
<groupId>org.apache.maven.plugins</groupId>
119+
<artifactId>maven-deploy-plugin</artifactId>
120+
<version>3.1.2</version>
121+
<configuration>
122+
<skip>true</skip>
123+
</configuration>
124+
</plugin>
116125
</plugins>
117126
</build>
118127
</project>

‎examples/powertools-examples-core-utilities/serverless/pom.xml

+10-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
<plugin>
9292
<groupId>org.apache.maven.plugins</groupId>
9393
<artifactId>maven-shade-plugin</artifactId>
94-
<version>3.5.0</version>
94+
<version>3.6.0</version>
9595
<executions>
9696
<execution>
9797
<phase>package</phase>
@@ -114,6 +114,15 @@
114114
</dependency>
115115
</dependencies>
116116
</plugin>
117+
<!-- Don't deploy the example -->
118+
<plugin>
119+
<groupId>org.apache.maven.plugins</groupId>
120+
<artifactId>maven-deploy-plugin</artifactId>
121+
<version>3.1.2</version>
122+
<configuration>
123+
<skip>true</skip>
124+
</configuration>
125+
</plugin>
117126
</plugins>
118127
</build>
119128
</project>

‎examples/powertools-examples-core-utilities/terraform/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
<plugin>
9292
<groupId>org.apache.maven.plugins</groupId>
9393
<artifactId>maven-shade-plugin</artifactId>
94-
<version>3.5.0</version>
94+
<version>3.6.0</version>
9595
<executions>
9696
<execution>
9797
<phase>package</phase>
@@ -118,7 +118,7 @@
118118
<plugin>
119119
<groupId>org.apache.maven.plugins</groupId>
120120
<artifactId>maven-deploy-plugin</artifactId>
121-
<version>3.1.1</version>
121+
<version>3.1.2</version>
122122
<configuration>
123123
<skip>true</skip>
124124
</configuration>

‎examples/powertools-examples-idempotency/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@
150150
<plugin>
151151
<groupId>org.apache.maven.plugins</groupId>
152152
<artifactId>maven-shade-plugin</artifactId>
153-
<version>3.5.0</version>
153+
<version>3.6.0</version>
154154
<executions>
155155
<execution>
156156
<phase>package</phase>
@@ -176,7 +176,7 @@
176176
<plugin>
177177
<groupId>org.apache.maven.plugins</groupId>
178178
<artifactId>maven-deploy-plugin</artifactId>
179-
<version>3.1.1</version>
179+
<version>3.1.2</version>
180180
<configuration>
181181
<skip>true</skip>
182182
</configuration>

‎examples/powertools-examples-parameters/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@
108108
<plugin>
109109
<groupId>org.apache.maven.plugins</groupId>
110110
<artifactId>maven-deploy-plugin</artifactId>
111-
<version>3.1.1</version>
111+
<version>3.1.2</version>
112112
<configuration>
113113
<skip>true</skip>
114114
</configuration>

‎examples/powertools-examples-serialization/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<plugin>
4242
<groupId>org.apache.maven.plugins</groupId>
4343
<artifactId>maven-deploy-plugin</artifactId>
44-
<version>3.1.1</version>
44+
<version>3.1.2</version>
4545
<configuration>
4646
<skip>true</skip>
4747
</configuration>

‎examples/powertools-examples-validation/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
<plugin>
107107
<groupId>org.apache.maven.plugins</groupId>
108108
<artifactId>maven-deploy-plugin</artifactId>
109-
<version>3.1.1</version>
109+
<version>3.1.2</version>
110110
<configuration>
111111
<skip>true</skip>
112112
</configuration>

‎mkdocs.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
site_name: Powertools for AWS Lambda (Java)
2-
site_description: Powertools for AWS Lambda (Java)
1+
site_name: Powertools for AWS Lambda (Java) Preview
2+
site_description: Powertools for AWS Lambda (Java) Preview
33
site_author: Amazon Web Services
44
site_url: https://docs.powertools.aws.dev/lambda-java/
55
nav:
@@ -85,7 +85,7 @@ extra_javascript:
8585

8686
extra:
8787
powertools:
88-
version: 2.0.0 # to update after each release (we do not want snapshot version here)
88+
version: 2.0.0-SNAPSHOT
8989

9090
repo_url: https://github.com/aws-powertools/powertools-lambda-java
9191
edit_uri: edit/main/docs

‎pom.xml

+32-3
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
<properties>
6767
<maven.compiler.source>1.8</maven.compiler.source>
6868
<maven.compiler.target>1.8</maven.compiler.target>
69-
<maven.deploy.plugin.version>3.1.1</maven.deploy.plugin.version>
69+
<maven.deploy.plugin.version>3.1.2</maven.deploy.plugin.version>
7070
<log4j.version>2.20.0</log4j.version>
7171
<log4j.version>2.23.1</log4j.version>
7272
<slf4j.version>2.0.7</slf4j.version>
@@ -78,11 +78,11 @@
7878
<lambda.core.version>1.2.3</lambda.core.version>
7979
<lambda.events.version>3.11.2</lambda.events.version>
8080
<lambda.serial.version>1.1.2</lambda.serial.version>
81-
<maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
81+
<maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
8282
<aspectj.version>1.9.7</aspectj.version>
8383
<aspectj-maven-plugin.version>1.14</aspectj-maven-plugin.version>
8484
<maven-surefire-plugin.version>3.1.2</maven-surefire-plugin.version>
85-
<jacoco-maven-plugin.version>0.8.10</jacoco-maven-plugin.version>
85+
<jacoco-maven-plugin.version>0.8.12</jacoco-maven-plugin.version>
8686
<nexus-staging-maven-plugin.version>1.6.13</nexus-staging-maven-plugin.version>
8787
<maven-javadoc-plugin.version>3.6.3</maven-javadoc-plugin.version>
8888
<maven-source-plugin.version>3.3.0</maven-source-plugin.version>
@@ -97,6 +97,13 @@
9797
<project.rootdir>${maven.multiModuleProjectDirectory}</project.rootdir>
9898
</properties>
9999

100+
<distributionManagement>
101+
<snapshotRepository>
102+
<id>ossrh</id>
103+
<url>https://aws.oss.sonatype.org/content/repositories/snapshots</url>
104+
</snapshotRepository>
105+
</distributionManagement>
106+
100107
<dependencyManagement>
101108
<dependencies>
102109
<dependency>
@@ -457,6 +464,28 @@
457464
<id>release</id>
458465
<build>
459466
<plugins>
467+
<plugin>
468+
<groupId>org.apache.maven.plugins</groupId>
469+
<artifactId>maven-enforcer-plugin</artifactId>
470+
<version>3.5.0</version>
471+
<executions>
472+
<execution>
473+
<id>enforce-snapshot-versions</id>
474+
<phase>validate</phase>
475+
<goals>
476+
<goal>enforce</goal>
477+
</goals>
478+
<configuration>
479+
<rules>
480+
<requireSnapshotVersion>
481+
<message>Release build should not have snapshot dependencies!</message>
482+
</requireSnapshotVersion>
483+
</rules>
484+
<fail>true</fail>
485+
</configuration>
486+
</execution>
487+
</executions>
488+
</plugin>
460489
<plugin>
461490
<groupId>org.apache.maven.plugins</groupId>
462491
<artifactId>maven-gpg-plugin</artifactId>

0 commit comments

Comments
 (0)