Skip to content

chore: Swap implementation of aspectj-maven-plugin to support Java 17 #1172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 5, 2023
Merged

chore: Swap implementation of aspectj-maven-plugin to support Java 17 #1172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
205445f
chore: swap implementation of `aspectj-maven-plugin` to support Java …
mriccia Jun 1, 2023
d0d3921
chore: add `aspectjrt` to docs for java17+ compatibility
mriccia Jun 2, 2023
2cea33d
chore: add comment for gradle import (only required for Java17+)
mriccia Jun 2, 2023
622f98a
chore: add comment for gradle import (only required for Java17+)
mriccia Jun 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ And configure the aspectj-maven-plugin to compile-time weave (CTW) the aws-lambd
<plugins>
...
<plugin>
<groupId>org.codehaus.mojo</groupId>
<groupId>dev.aspectj</groupId>
<artifactId>aspectj-maven-plugin</artifactId>
<version>1.14.0</version>
<version>1.13.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
Expand Down
6 changes: 4 additions & 2 deletions docs/index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,9 @@ For more information about the project and available options refer to this [repo
<plugins>
...
<plugin>
<groupId>org.codehaus.mojo</groupId>
<groupId>dev.aspectj</groupId>
<artifactId>aspectj-maven-plugin</artifactId>
<version>1.14.0</version>
<version>1.13.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
Expand Down Expand Up @@ -122,6 +122,8 @@ For more information about the project and available options refer to this [repo
aspect 'software.amazon.lambda:powertools-logging:{{ powertools.version }}'
aspect 'software.amazon.lambda:powertools-tracing:{{ powertools.version }}'
aspect 'software.amazon.lambda:powertools-metrics:{{ powertools.version }}'
// This dependency is needed for Java17+, please uncomment it if you are using Java17+
// implementation 'org.aspectj:aspectjrt:1.9.19'
}

sourceCompatibility = 11
Expand Down
6 changes: 4 additions & 2 deletions docs/utilities/batch.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ To install this utility, add the following dependency to your project.
<plugins>
...
<plugin>
<groupId>org.codehaus.mojo</groupId>
<groupId>dev.aspectj</groupId>
<artifactId>aspectj-maven-plugin</artifactId>
<version>1.14.0</version>
<version>1.13.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
Expand Down Expand Up @@ -83,6 +83,8 @@ To install this utility, add the following dependency to your project.
dependencies {
...
aspect 'software.amazon.lambda:powertools-sqs:{{ powertools.version }}'
// This dependency is needed for Java17+, please uncomment it if you are using Java17+
// implementation 'org.aspectj:aspectjrt:1.9.19'
}
```

Expand Down
4 changes: 2 additions & 2 deletions docs/utilities/idempotency.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ times with the same parameters**. This makes idempotent operations safe to retry
<plugins>
...
<plugin>
<groupId>org.codehaus.mojo</groupId>
<groupId>dev.aspectj</groupId>
<artifactId>aspectj-maven-plugin</artifactId>
<version>1.14.0</version>
<version>1.13.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
Expand Down
7 changes: 5 additions & 2 deletions docs/utilities/parameters.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ To install this utility, add the following dependency to your project.
dependencies {
...
aspect 'software.amazon.lambda:powertools-parameters:{{ powertools.version }}'
// This dependency is needed for Java17+, please uncomment it if you are using Java17+
// implementation 'org.aspectj:aspectjrt:1.9.19'
}
```

Expand Down Expand Up @@ -441,9 +443,9 @@ If you want to use the ```@Param``` annotation in your project add configuration
<plugins>
...
<plugin>
<groupId>org.codehaus.mojo</groupId>
<groupId>dev.aspectj</groupId>
<artifactId>aspectj-maven-plugin</artifactId>
<version>1.14.0</version>
<version>1.13.1</version>
<configuration>
...
<aspectLibraries>
Expand Down Expand Up @@ -482,5 +484,6 @@ If you want to use the ```@Param``` annotation in your project add configuration
dependencies {
...
aspect 'software.amazon.lambda:powertools-parameters:{{ powertools.version }}'
implementation 'org.aspectj:aspectjrt:1.9.19'
}
```
6 changes: 4 additions & 2 deletions docs/utilities/sqs_large_message_handling.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@ To install this utility, add the following dependency to your project.
<plugins>
...
<plugin>
<groupId>org.codehaus.mojo</groupId>
<groupId>dev.aspectj</groupId>
<artifactId>aspectj-maven-plugin</artifactId>
<version>1.14.0</version>
<version>1.13.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
Expand Down Expand Up @@ -91,6 +91,8 @@ To install this utility, add the following dependency to your project.
dependencies {
...
aspect 'software.amazon.lambda:powertools-sqs:{{ powertools.version }}'
// This dependency is needed for Java17+, please uncomment it if you are using Java17+
// implementation 'org.aspectj:aspectjrt:1.9.19'
}
```

Expand Down
6 changes: 4 additions & 2 deletions docs/utilities/validation.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ To install this utility, add the following dependency to your project.
<plugins>
...
<plugin>
<groupId>org.codehaus.mojo</groupId>
<groupId>dev.aspectj</groupId>
<artifactId>aspectj-maven-plugin</artifactId>
<version>1.14.0</version>
<version>1.13.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
Expand Down Expand Up @@ -72,6 +72,8 @@ To install this utility, add the following dependency to your project.

dependencies {
aspect 'software.amazon.lambda:powertools-validation:{{ powertools.version }}'
// This dependency is needed for Java17+, please uncomment it if you are using Java17+
// implementation 'org.aspectj:aspectjrt:1.9.19'
}
```

Expand Down
4 changes: 2 additions & 2 deletions examples/powertools-examples-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<groupId>dev.aspectj</groupId>
<artifactId>aspectj-maven-plugin</artifactId>
<version>1.14.0</version>
<version>1.13.1</version>
<configuration>
<source>${maven.compiler.source}</source>
<target>${maven.compiler.target}</target>
Expand Down
4 changes: 2 additions & 2 deletions examples/powertools-examples-idempotency/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,9 @@
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<groupId>dev.aspectj</groupId>
<artifactId>aspectj-maven-plugin</artifactId>
<version>1.14.0</version>
<version>1.13.1</version>
<configuration>
<source>${maven.compiler.source}</source>
<target>${maven.compiler.target}</target>
Expand Down
4 changes: 2 additions & 2 deletions examples/powertools-examples-parameters/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@
<version>3.1.0</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<groupId>dev.aspectj</groupId>
<artifactId>aspectj-maven-plugin</artifactId>
<version>1.14.0</version>
<version>1.13.1</version>
<configuration>
<source>${maven.compiler.source}</source>
<target>${maven.compiler.target}</target>
Expand Down
4 changes: 2 additions & 2 deletions examples/powertools-examples-sqs/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<groupId>dev.aspectj</groupId>
<artifactId>aspectj-maven-plugin</artifactId>
<version>1.14.0</version>
<version>1.13.1</version>
<configuration>
<source>${maven.compiler.source}</source>
<target>${maven.compiler.target}</target>
Expand Down
4 changes: 2 additions & 2 deletions examples/powertools-examples-validation/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@
<version>3.1.0</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<groupId>dev.aspectj</groupId>
<artifactId>aspectj-maven-plugin</artifactId>
<version>1.14.0</version>
<version>1.13.1</version>
<configuration>
<source>${maven.compiler.source}</source>
<target>${maven.compiler.target}</target>
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
<lambda.events.version>3.11.1</lambda.events.version>
<lambda.serial.version>1.1.2</lambda.serial.version>
<maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
<aspectj-maven-plugin.version>1.14.0</aspectj-maven-plugin.version>
<aspectj-maven-plugin.version>1.13.1</aspectj-maven-plugin.version>
<maven-surefire-plugin.version>3.1.0</maven-surefire-plugin.version>
<jacoco-maven-plugin.version>0.8.8</jacoco-maven-plugin.version>
<nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
Expand Down Expand Up @@ -307,7 +307,7 @@
<version>${maven-compiler-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<groupId>dev.aspectj</groupId>
<artifactId>aspectj-maven-plugin</artifactId>
<version>${aspectj-maven-plugin.version}</version>
</plugin>
Expand Down Expand Up @@ -354,7 +354,7 @@
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<groupId>dev.aspectj</groupId>
<artifactId>aspectj-maven-plugin</artifactId>
<version>${aspectj-maven-plugin.version}</version>
<configuration>
Expand Down
2 changes: 1 addition & 1 deletion powertools-e2e-tests/handlers/idempotency/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<groupId>dev.aspectj</groupId>
<artifactId>aspectj-maven-plugin</artifactId>
<configuration>
<source>${maven.compiler.source}</source>
Expand Down
2 changes: 1 addition & 1 deletion powertools-e2e-tests/handlers/logging/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<groupId>dev.aspectj</groupId>
<artifactId>aspectj-maven-plugin</artifactId>
<configuration>
<source>${maven.compiler.source}</source>
Expand Down
2 changes: 1 addition & 1 deletion powertools-e2e-tests/handlers/metrics/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<groupId>dev.aspectj</groupId>
<artifactId>aspectj-maven-plugin</artifactId>
<configuration>
<source>${maven.compiler.source}</source>
Expand Down
4 changes: 2 additions & 2 deletions powertools-e2e-tests/handlers/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<lambda.java.core>1.2.2</lambda.java.core>
<lambda.java.events>3.11.0</lambda.java.events>
<maven.shade.version>3.2.4</maven.shade.version>
<aspectj.version>1.14.0</aspectj.version>
<aspectj.version>1.13.1</aspectj.version>
<maven.compiler.version>3.10.1</maven.compiler.version>
</properties>

Expand Down Expand Up @@ -99,7 +99,7 @@
</dependencies>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<groupId>dev.aspectj</groupId>
<artifactId>aspectj-maven-plugin</artifactId>
<version>${aspectj.version}</version>
</plugin>
Expand Down
2 changes: 1 addition & 1 deletion powertools-e2e-tests/handlers/tracing/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<groupId>dev.aspectj</groupId>
<artifactId>aspectj-maven-plugin</artifactId>
<configuration>
<source>${maven.compiler.source}</source>
Expand Down
2 changes: 1 addition & 1 deletion powertools-serialization/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<groupId>dev.aspectj</groupId>
<artifactId>aspectj-maven-plugin</artifactId>
<version>${aspectj-maven-plugin.version}</version>
<configuration>
Expand Down
4 changes: 2 additions & 2 deletions powertools-test-suite/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,9 +115,9 @@
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<groupId>dev.aspectj</groupId>
<artifactId>aspectj-maven-plugin</artifactId>
<version>1.14.0</version>
<version>1.13.1</version>
<configuration>
<source>${maven.compiler.source}</source>
<target>${maven.compiler.target}</target>
Expand Down