Skip to content

Commit 286a6c2

Browse files
jeromevdljeromevdl
committed
chore: remove aspectj-rt from the library (#1408)
* remove aspectj-rt from the library * set aspectj.version 1.9.20
1 parent dcbef42 commit 286a6c2

File tree

25 files changed

+368
-755
lines changed

25 files changed

+368
-755
lines changed

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

Lines changed: 14 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<maven.compiler.source>1.8</maven.compiler.source>
1616
<maven.compiler.target>1.8</maven.compiler.target>
1717
<sdk.version>2.20.152</sdk.version>
18+
<aspectj.version>1.9.20</aspectj.version>
1819
</properties>
1920

2021
<dependencies>
@@ -63,6 +64,11 @@
6364
<artifactId>kinesis</artifactId>
6465
<version>${sdk.version}</version>
6566
</dependency>
67+
<dependency>
68+
<groupId>org.aspectj</groupId>
69+
<artifactId>aspectjrt</artifactId>
70+
<version>${aspectj.version}</version>
71+
</dependency>
6672
</dependencies>
6773

6874
<build>
@@ -93,6 +99,13 @@
9399
</goals>
94100
</execution>
95101
</executions>
102+
<dependencies>
103+
<dependency>
104+
<groupId>org.aspectj</groupId>
105+
<artifactId>aspectjtools</artifactId>
106+
<version>${aspectj.version}</version>
107+
</dependency>
108+
</dependencies>
96109
</plugin>
97110
<plugin>
98111
<groupId>org.apache.maven.plugins</groupId>
@@ -139,6 +152,7 @@
139152
- If you are running on Java 1.8, you should apply the aspectJ version here to the project, and remove
140153
the profile.
141154
-->
155+
142156
<profile>
143157
<id>jdk8</id>
144158
<activation>
@@ -147,57 +161,6 @@
147161
<properties>
148162
<aspectj.version>1.9.7</aspectj.version>
149163
</properties>
150-
<dependencyManagement>
151-
<dependencies>
152-
<dependency>
153-
<groupId>org.aspectj</groupId>
154-
<artifactId>aspectjtools</artifactId>
155-
<version>${aspectj.version}</version>
156-
</dependency>
157-
</dependencies>
158-
</dependencyManagement>
159-
<build>
160-
<pluginManagement>
161-
<plugins>
162-
<plugin>
163-
<groupId>dev.aspectj</groupId>
164-
<artifactId>aspectj-maven-plugin</artifactId>
165-
<version>${aspectj.plugin.version}</version>
166-
<configuration>
167-
<source>${maven.compiler.source}</source>
168-
<target>${maven.compiler.target}</target>
169-
<complianceLevel>${maven.compiler.target}</complianceLevel>
170-
<aspectLibraries>
171-
<aspectLibrary>
172-
<groupId>software.amazon.lambda</groupId>
173-
<artifactId>powertools-tracing</artifactId>
174-
</aspectLibrary>
175-
<aspectLibrary>
176-
<groupId>software.amazon.lambda</groupId>
177-
<artifactId>powertools-logging</artifactId>
178-
</aspectLibrary>
179-
</aspectLibraries>
180-
</configuration>
181-
<executions>
182-
<execution>
183-
<goals>
184-
<goal>compile</goal>
185-
<goal>test-compile</goal>
186-
</goals>
187-
</execution>
188-
</executions>
189-
<!-- Enforce aspectJ 1.9.7 -->
190-
<dependencies>
191-
<dependency>
192-
<groupId>org.aspectj</groupId>
193-
<artifactId>aspectjtools</artifactId>
194-
<version>${aspectj.version}</version>
195-
</dependency>
196-
</dependencies>
197-
</plugin>
198-
</plugins>
199-
</pluginManagement>
200-
</build>
201164
</profile>
202165
</profiles>
203166
</project>

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

Lines changed: 13 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<lambda.core.version>1.2.3</lambda.core.version>
1717
<lambda.events.version>3.11.3</lambda.events.version>
1818
<aws.sdk.version>2.20.162</aws.sdk.version>
19+
<aspectj.version>1.9.20</aspectj.version>
1920
</properties>
2021
<dependencyManagement>
2122
<dependencies>
@@ -60,6 +61,11 @@
6061
<artifactId>log4j-api</artifactId>
6162
<version>${log4j.version}</version>
6263
</dependency>
64+
<dependency>
65+
<groupId>org.aspectj</groupId>
66+
<artifactId>aspectjrt</artifactId>
67+
<version>${aspectj.version}</version>
68+
</dependency>
6369
<dependency>
6470
<groupId>software.amazon.awssdk</groupId>
6571
<artifactId>s3</artifactId>
@@ -89,9 +95,6 @@
8995
<artifactId>log4j-jcl</artifactId>
9096
<version>${log4j.version}</version>
9197
</dependency>
92-
93-
94-
9598
</dependencies>
9699

97100
<build>
@@ -118,6 +121,13 @@
118121
</goals>
119122
</execution>
120123
</executions>
124+
<dependencies>
125+
<dependency>
126+
<groupId>org.aspectj</groupId>
127+
<artifactId>aspectjtools</artifactId>
128+
<version>${aspectj.version}</version>
129+
</dependency>
130+
</dependencies>
121131
</plugin>
122132
<plugin>
123133
<groupId>org.apache.maven.plugins</groupId>
@@ -172,53 +182,6 @@
172182
<properties>
173183
<aspectj.version>1.9.7</aspectj.version>
174184
</properties>
175-
<dependencyManagement>
176-
<dependencies>
177-
<dependency>
178-
<groupId>org.aspectj</groupId>
179-
<artifactId>aspectjtools</artifactId>
180-
<version>${aspectj.version}</version>
181-
</dependency>
182-
</dependencies>
183-
</dependencyManagement>
184-
<build>
185-
<pluginManagement>
186-
<plugins>
187-
<plugin>
188-
<groupId>dev.aspectj</groupId>
189-
<artifactId>aspectj-maven-plugin</artifactId>
190-
<version>${aspectj.plugin.version}</version>
191-
<configuration>
192-
<source>${maven.compiler.source}</source>
193-
<target>${maven.compiler.target}</target>
194-
<complianceLevel>${maven.compiler.target}</complianceLevel>
195-
<aspectLibraries>
196-
<aspectLibrary>
197-
<groupId>software.amazon.lambda</groupId>
198-
<artifactId>powertools-logging</artifactId>
199-
</aspectLibrary>
200-
</aspectLibraries>
201-
</configuration>
202-
<executions>
203-
<execution>
204-
<goals>
205-
<goal>compile</goal>
206-
<goal>test-compile</goal>
207-
</goals>
208-
</execution>
209-
</executions>
210-
<!-- Enforce aspectJ 1.9.7 -->
211-
<dependencies>
212-
<dependency>
213-
<groupId>org.aspectj</groupId>
214-
<artifactId>aspectjtools</artifactId>
215-
<version>${aspectj.version}</version>
216-
</dependency>
217-
</dependencies>
218-
</plugin>
219-
</plugins>
220-
</pluginManagement>
221-
</build>
222185
</profile>
223186
</profiles>
224187
</project>

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

Lines changed: 47 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<log4j.version>2.20.0</log4j.version>
1414
<maven.compiler.source>1.8</maven.compiler.source>
1515
<maven.compiler.target>1.8</maven.compiler.target>
16+
<aspectj.version>1.9.20</aspectj.version>
1617
</properties>
1718

1819
<dependencies>
@@ -51,6 +52,11 @@
5152
<artifactId>log4j-api</artifactId>
5253
<version>${log4j.version}</version>
5354
</dependency>
55+
<dependency>
56+
<groupId>org.aspectj</groupId>
57+
<artifactId>aspectjrt</artifactId>
58+
<version>${aspectj.version}</version>
59+
</dependency>
5460

5561
<dependency>
5662
<groupId>junit</groupId>
@@ -64,35 +70,42 @@
6470
<finalName>helloworld-lambda</finalName>
6571
<plugins>
6672
<plugin>
67-
<groupId>dev.aspectj</groupId>
68-
<artifactId>aspectj-maven-plugin</artifactId>
69-
<version>1.13.1</version>
70-
<configuration>
71-
<source>${maven.compiler.source}</source>
72-
<target>${maven.compiler.target}</target>
73-
<complianceLevel>${maven.compiler.target}</complianceLevel>
74-
<aspectLibraries>
75-
<aspectLibrary>
76-
<groupId>software.amazon.lambda</groupId>
77-
<artifactId>powertools-tracing</artifactId>
78-
</aspectLibrary>
79-
<aspectLibrary>
80-
<groupId>software.amazon.lambda</groupId>
81-
<artifactId>powertools-logging</artifactId>
82-
</aspectLibrary>
83-
<aspectLibrary>
84-
<groupId>software.amazon.lambda</groupId>
85-
<artifactId>powertools-metrics</artifactId>
86-
</aspectLibrary>
87-
</aspectLibraries>
88-
</configuration>
89-
<executions>
90-
<execution>
91-
<goals>
92-
<goal>compile</goal>
93-
</goals>
94-
</execution>
95-
</executions>
73+
<groupId>dev.aspectj</groupId>
74+
<artifactId>aspectj-maven-plugin</artifactId>
75+
<version>1.13.1</version>
76+
<configuration>
77+
<source>${maven.compiler.source}</source>
78+
<target>${maven.compiler.target}</target>
79+
<complianceLevel>${maven.compiler.target}</complianceLevel>
80+
<aspectLibraries>
81+
<aspectLibrary>
82+
<groupId>software.amazon.lambda</groupId>
83+
<artifactId>powertools-tracing</artifactId>
84+
</aspectLibrary>
85+
<aspectLibrary>
86+
<groupId>software.amazon.lambda</groupId>
87+
<artifactId>powertools-logging</artifactId>
88+
</aspectLibrary>
89+
<aspectLibrary>
90+
<groupId>software.amazon.lambda</groupId>
91+
<artifactId>powertools-metrics</artifactId>
92+
</aspectLibrary>
93+
</aspectLibraries>
94+
</configuration>
95+
<executions>
96+
<execution>
97+
<goals>
98+
<goal>compile</goal>
99+
</goals>
100+
</execution>
101+
</executions>
102+
<dependencies>
103+
<dependency>
104+
<groupId>org.aspectj</groupId>
105+
<artifactId>aspectjtools</artifactId>
106+
<version>${aspectj.version}</version>
107+
</dependency>
108+
</dependencies>
96109
</plugin>
97110
<plugin>
98111
<groupId>org.apache.maven.plugins</groupId>
@@ -121,11 +134,11 @@
121134
</plugin>
122135
<!-- Don't deploy the example -->
123136
<plugin>
124-
<groupId>org.apache.maven.plugins</groupId>
125-
<artifactId>maven-deploy-plugin</artifactId>
126-
<configuration>
127-
<skip>true</skip>
128-
</configuration>
137+
<groupId>org.apache.maven.plugins</groupId>
138+
<artifactId>maven-deploy-plugin</artifactId>
139+
<configuration>
140+
<skip>true</skip>
141+
</configuration>
129142
</plugin>
130143
</plugins>
131144
</build>
@@ -147,61 +160,6 @@
147160
<properties>
148161
<aspectj.version>1.9.7</aspectj.version>
149162
</properties>
150-
<dependencyManagement>
151-
<dependencies>
152-
<dependency>
153-
<groupId>org.aspectj</groupId>
154-
<artifactId>aspectjtools</artifactId>
155-
<version>${aspectj.version}</version>
156-
</dependency>
157-
</dependencies>
158-
</dependencyManagement>
159-
<build>
160-
<pluginManagement>
161-
<plugins>
162-
<plugin>
163-
<groupId>dev.aspectj</groupId>
164-
<artifactId>aspectj-maven-plugin</artifactId>
165-
<version>${aspectj.plugin.version}</version>
166-
<configuration>
167-
<source>${maven.compiler.source}</source>
168-
<target>${maven.compiler.target}</target>
169-
<complianceLevel>${maven.compiler.target}</complianceLevel>
170-
<aspectLibraries>
171-
<aspectLibrary>
172-
<groupId>software.amazon.lambda</groupId>
173-
<artifactId>powertools-tracing</artifactId>
174-
</aspectLibrary>
175-
<aspectLibrary>
176-
<groupId>software.amazon.lambda</groupId>
177-
<artifactId>powertools-logging</artifactId>
178-
</aspectLibrary>
179-
<aspectLibrary>
180-
<groupId>software.amazon.lambda</groupId>
181-
<artifactId>powertools-metrics</artifactId>
182-
</aspectLibrary>
183-
</aspectLibraries>
184-
</configuration>
185-
<executions>
186-
<execution>
187-
<goals>
188-
<goal>compile</goal>
189-
<goal>test-compile</goal>
190-
</goals>
191-
</execution>
192-
</executions>
193-
<!-- Enforce aspectJ 1.9.7 -->
194-
<dependencies>
195-
<dependency>
196-
<groupId>org.aspectj</groupId>
197-
<artifactId>aspectjtools</artifactId>
198-
<version>${aspectj.version}</version>
199-
</dependency>
200-
</dependencies>
201-
</plugin>
202-
</plugins>
203-
</pluginManagement>
204-
</build>
205163
</profile>
206164
</profiles>
207165
</project>

0 commit comments

Comments
 (0)