Skip to content

Commit 4ea0394

Browse files
jeromevdljeromevdl
committed
use aspectj 1.9.21-SNAPSHOT
1 parent 80f61b2 commit 4ea0394

File tree

3 files changed

+97
-77
lines changed

3 files changed

+97
-77
lines changed

‎pom.xml

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@
7575
<maven.compiler.target>1.8</maven.compiler.target>
7676
<log4j.version>2.20.0</log4j.version>
7777
<jackson.version>2.15.3</jackson.version>
78-
<aspectj.version>1.9.7</aspectj.version>
7978
<aws.sdk.version>2.21.0</aws.sdk.version>
8079
<aws.xray.recorder.version>2.14.0</aws.xray.recorder.version>
8180
<payloadoffloading-common.version>2.1.3</payloadoffloading-common.version>
@@ -516,6 +515,35 @@
516515
</plugins>
517516
</build>
518517
</profile>
518+
519+
<!-- https://github.com/eclipse-aspectj/aspectj/blob/master/docs/dist/doc/JavaVersionCompatibility.md -->
520+
<profile>
521+
<id>aspectj197</id>
522+
<activation>
523+
<jdk>[1.8,16]</jdk>
524+
</activation>
525+
<properties>
526+
<aspectj.version>1.9.7</aspectj.version>
527+
</properties>
528+
</profile>
529+
<profile>
530+
<id>aspectj1920</id>
531+
<activation>
532+
<jdk>[17,20]</jdk>
533+
</activation>
534+
<properties>
535+
<aspectj.version>1.9.20.1</aspectj.version>
536+
</properties>
537+
</profile>
538+
<profile>
539+
<id>aspectj1921</id>
540+
<activation>
541+
<jdk>[21,)</jdk>
542+
</activation>
543+
<properties>
544+
<aspectj.version>1.9.21-SNAPSHOT</aspectj.version>
545+
</properties>
546+
</profile>
519547
<profile>
520548
<id>jdk16</id>
521549
<activation>

‎powertools-e2e-tests/handlers/logging/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@
1717
<groupId>software.amazon.lambda</groupId>
1818
<artifactId>powertools-logging</artifactId>
1919
</dependency>
20+
<dependency>
21+
<groupId>org.aspectj</groupId>
22+
<artifactId>aspectjrt</artifactId>
23+
</dependency>
2024
<dependency>
2125
<groupId>com.amazonaws</groupId>
2226
<artifactId>aws-lambda-java-events</artifactId>

‎powertools-e2e-tests/handlers/pom.xml

Lines changed: 64 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,11 @@
4242
<type>pom</type>
4343
<scope>import</scope>
4444
</dependency>
45-
45+
<dependency>
46+
<groupId>org.aspectj</groupId>
47+
<artifactId>aspectjrt</artifactId>
48+
<version>${aspectj.version}</version>
49+
</dependency>
4650
<dependency>
4751
<groupId>software.amazon.lambda</groupId>
4852
<artifactId>powertools-logging</artifactId>
@@ -143,97 +147,81 @@
143147
<useIncrementalCompilation>false</useIncrementalCompilation>
144148
</configuration>
145149
</plugin>
150+
<plugin>
151+
<groupId>dev.aspectj</groupId>
152+
<artifactId>aspectj-maven-plugin</artifactId>
153+
<version>${aspectj.plugin.version}</version>
154+
<configuration>
155+
<verbose>true</verbose>
156+
<source>${maven.compiler.source}</source>
157+
<target>${maven.compiler.target}</target>
158+
<complianceLevel>${maven.compiler.target}</complianceLevel>
159+
<Xlint>ignore</Xlint>
160+
<encoding>${project.build.sourceEncoding}</encoding>
161+
</configuration>
162+
<executions>
163+
<execution>
164+
<goals>
165+
<goal>compile</goal>
166+
<goal>test-compile</goal>
167+
</goals>
168+
</execution>
169+
</executions>
170+
<dependencies>
171+
<dependency>
172+
<groupId>org.aspectj</groupId>
173+
<artifactId>aspectjtools</artifactId>
174+
<version>${aspectj.version}</version>
175+
</dependency>
176+
</dependencies>
177+
</plugin>
146178
</plugins>
147179
</pluginManagement>
148180
</build>
149181

150182
<profiles>
183+
<!-- https://github.com/eclipse-aspectj/aspectj/blob/master/docs/dist/doc/JavaVersionCompatibility.md -->
151184
<profile>
152-
<id>jdk8</id>
185+
<id>jdk8to16</id>
153186
<activation>
154-
<jdk>(,11)</jdk> <!-- < 11 -->
187+
<jdk>[1.8,16]</jdk>
155188
</activation>
156189
<properties>
157190
<aspectj.version>1.9.7</aspectj.version>
158191
</properties>
159-
<dependencyManagement>
160-
<dependencies>
161-
<dependency>
162-
<groupId>org.aspectj</groupId>
163-
<artifactId>aspectjtools</artifactId>
164-
<version>${aspectj.version}</version>
165-
</dependency>
166-
</dependencies>
167-
</dependencyManagement>
168-
<build>
169-
<pluginManagement>
170-
<plugins>
171-
<plugin>
172-
<groupId>dev.aspectj</groupId>
173-
<artifactId>aspectj-maven-plugin</artifactId>
174-
<version>${aspectj.plugin.version}</version>
175-
<configuration>
176-
<source>${maven.compiler.source}</source>
177-
<target>${maven.compiler.target}</target>
178-
<complianceLevel>${maven.compiler.target}</complianceLevel>
179-
<Xlint>ignore</Xlint>
180-
<encoding>${project.build.sourceEncoding}</encoding>
181-
</configuration>
182-
<executions>
183-
<execution>
184-
<phase>process-sources</phase>
185-
<goals>
186-
<goal>compile</goal>
187-
<goal>test-compile</goal>
188-
</goals>
189-
</execution>
190-
</executions>
191-
<!-- Enforce aspectJ 1.9.7 -->
192-
<dependencies>
193-
<dependency>
194-
<groupId>org.aspectj</groupId>
195-
<artifactId>aspectjtools</artifactId>
196-
<version>${aspectj.version}</version>
197-
</dependency>
198-
</dependencies>
199-
</plugin>
200-
</plugins>
201-
</pluginManagement>
202-
</build>
203192
</profile>
204193
<profile>
205-
<id>jdk11plus</id>
194+
<id>jdk17to20</id>
206195
<activation>
207-
<jdk>[11,)</jdk> <!-- >= 11 -->
196+
<jdk>[17,20]</jdk>
208197
</activation>
209-
<build>
210-
<pluginManagement>
211-
<plugins>
212-
<plugin>
213-
<groupId>dev.aspectj</groupId>
214-
<artifactId>aspectj-maven-plugin</artifactId>
215-
<version>${aspectj.plugin.version}</version>
216-
<configuration>
217-
<source>${maven.compiler.source}</source>
218-
<target>${maven.compiler.target}</target>
219-
<complianceLevel>${maven.compiler.target}</complianceLevel>
220-
<Xlint>ignore</Xlint>
221-
<encoding>${project.build.sourceEncoding}</encoding>
222-
</configuration>
223-
<executions>
224-
<execution>
225-
<phase>process-sources</phase>
226-
<goals>
227-
<goal>compile</goal>
228-
<goal>test-compile</goal>
229-
</goals>
230-
</execution>
231-
</executions>
232-
</plugin>
233-
</plugins>
234-
</pluginManagement>
235-
</build>
198+
<properties>
199+
<aspectj.version>1.9.20.1</aspectj.version>
200+
</properties>
201+
</profile>
202+
<profile>
203+
<id>jdk21</id>
204+
<activation>
205+
<jdk>[21,)</jdk>
206+
</activation>
207+
<properties>
208+
<aspectj.version>1.9.21-SNAPSHOT</aspectj.version>
209+
</properties>
236210
</profile>
237211
</profiles>
238212

213+
<repositories>
214+
<repository>
215+
<id>ossrh-snapshots</id>
216+
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
217+
<releases>
218+
<enabled>false</enabled>
219+
</releases>
220+
<snapshots>
221+
<enabled>true</enabled>
222+
<updatePolicy>always</updatePolicy>
223+
</snapshots>
224+
</repository>
225+
</repositories>
226+
239227
</project>

0 commit comments

Comments
 (0)