Skip to content

Commit 4caabf9

Browse files
jeromevdljeromevdl
committed
remove aspectj-rt from the library
1 parent b5135c9 commit 4caabf9

File tree

25 files changed

+388
-791
lines changed

25 files changed

+388
-791
lines changed

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

+13-51
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,11 @@
6363
<artifactId>kinesis</artifactId>
6464
<version>${sdk.version}</version>
6565
</dependency>
66+
<dependency>
67+
<groupId>org.aspectj</groupId>
68+
<artifactId>aspectjrt</artifactId>
69+
<version>${aspectj.version}</version>
70+
</dependency>
6671
</dependencies>
6772

6873
<build>
@@ -93,6 +98,13 @@
9398
</goals>
9499
</execution>
95100
</executions>
101+
<dependencies>
102+
<dependency>
103+
<groupId>org.aspectj</groupId>
104+
<artifactId>aspectjtools</artifactId>
105+
<version>${aspectj.version}</version>
106+
</dependency>
107+
</dependencies>
96108
</plugin>
97109
<plugin>
98110
<groupId>org.apache.maven.plugins</groupId>
@@ -139,6 +151,7 @@
139151
- If you are running on Java 1.8, you should apply the aspectJ version here to the project, and remove
140152
the profile.
141153
-->
154+
142155
<profile>
143156
<id>jdk8</id>
144157
<activation>
@@ -147,57 +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-
</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>
201163
</profile>
202164
</profiles>
203165
</project>

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

+13-51
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<artifactId>powertools-examples-cloudformation</artifactId>
88
<packaging>jar</packaging>
99

10-
<name>AWS Lambda Powertools for Java library Examples - CloudFormation</name>
10+
<name>Powertools for AWS Lambda (Java) library Examples - CloudFormation</name>
1111

1212
<properties>
1313
<log4j.version>2.20.0</log4j.version>
@@ -60,6 +60,11 @@
6060
<artifactId>log4j-api</artifactId>
6161
<version>${log4j.version}</version>
6262
</dependency>
63+
<dependency>
64+
<groupId>org.aspectj</groupId>
65+
<artifactId>aspectjrt</artifactId>
66+
<version>${aspectj.version}</version>
67+
</dependency>
6368
<dependency>
6469
<groupId>software.amazon.awssdk</groupId>
6570
<artifactId>s3</artifactId>
@@ -89,9 +94,6 @@
8994
<artifactId>log4j-jcl</artifactId>
9095
<version>${log4j.version}</version>
9196
</dependency>
92-
93-
94-
9597
</dependencies>
9698

9799
<build>
@@ -118,6 +120,13 @@
118120
</goals>
119121
</execution>
120122
</executions>
123+
<dependencies>
124+
<dependency>
125+
<groupId>org.aspectj</groupId>
126+
<artifactId>aspectjtools</artifactId>
127+
<version>${aspectj.version}</version>
128+
</dependency>
129+
</dependencies>
121130
</plugin>
122131
<plugin>
123132
<groupId>org.apache.maven.plugins</groupId>
@@ -172,53 +181,6 @@
172181
<properties>
173182
<aspectj.version>1.9.7</aspectj.version>
174183
</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>
222184
</profile>
223185
</profiles>
224186
</project>

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

+13-56
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<artifactId>powertools-examples-core-utilities-cdk</artifactId>
88
<packaging>jar</packaging>
99

10-
<name>Powertools for AWS Lambda (Java) library Examples - Core</name>
10+
<name>Powertools for AWS Lambda (Java) library Examples - Core Utilities (logging, tracing, metrics) with CDK</name>
1111

1212
<properties>
1313
<log4j.version>2.20.0</log4j.version>
@@ -51,6 +51,11 @@
5151
<artifactId>log4j-api</artifactId>
5252
<version>${log4j.version}</version>
5353
</dependency>
54+
<dependency>
55+
<groupId>org.aspectj</groupId>
56+
<artifactId>aspectjrt</artifactId>
57+
<version>${aspectj.version}</version>
58+
</dependency>
5459

5560
<dependency>
5661
<groupId>junit</groupId>
@@ -93,6 +98,13 @@
9398
</goals>
9499
</execution>
95100
</executions>
101+
<dependencies>
102+
<dependency>
103+
<groupId>org.aspectj</groupId>
104+
<artifactId>aspectjtools</artifactId>
105+
<version>${aspectj.version}</version>
106+
</dependency>
107+
</dependencies>
96108
</plugin>
97109
<plugin>
98110
<groupId>org.apache.maven.plugins</groupId>
@@ -147,61 +159,6 @@
147159
<properties>
148160
<aspectj.version>1.9.7</aspectj.version>
149161
</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>
205162
</profile>
206163
</profiles>
207164
</project>

0 commit comments

Comments
 (0)