Skip to content

Commit f6d0239

Browse files
jeromevdljeromevdl
committed
remove aspectj-rt from the library
1 parent 50e7b56 commit f6d0239

File tree

25 files changed

+185
-547
lines changed

25 files changed

+185
-547
lines changed

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

Lines changed: 14 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<maven.compiler.target>1.8</maven.compiler.target>
1717
<maven.deploy.skip>true</maven.deploy.skip>
1818
<sdk.version>2.20.128</sdk.version>
19+
<aspectj.version>1.9.20</aspectj.version>
1920
</properties>
2021

2122
<dependencies>
@@ -64,6 +65,11 @@
6465
<artifactId>kinesis</artifactId>
6566
<version>${sdk.version}</version>
6667
</dependency>
68+
<dependency>
69+
<groupId>org.aspectj</groupId>
70+
<artifactId>aspectjrt</artifactId>
71+
<version>${aspectj.version}</version>
72+
</dependency>
6773
</dependencies>
6874

6975
<build>
@@ -94,6 +100,13 @@
94100
</goals>
95101
</execution>
96102
</executions>
103+
<dependencies>
104+
<dependency>
105+
<groupId>org.aspectj</groupId>
106+
<artifactId>aspectjtools</artifactId>
107+
<version>${aspectj.version}</version>
108+
</dependency>
109+
</dependencies>
97110
</plugin>
98111
<plugin>
99112
<groupId>org.apache.maven.plugins</groupId>
@@ -132,6 +145,7 @@
132145
- If you are running on Java 1.8, you should apply the aspectJ version here to the project, and remove
133146
the profile.
134147
-->
148+
135149
<profile>
136150
<id>jdk8</id>
137151
<activation>
@@ -140,57 +154,6 @@
140154
<properties>
141155
<aspectj.version>1.9.7</aspectj.version>
142156
</properties>
143-
<dependencyManagement>
144-
<dependencies>
145-
<dependency>
146-
<groupId>org.aspectj</groupId>
147-
<artifactId>aspectjtools</artifactId>
148-
<version>${aspectj.version}</version>
149-
</dependency>
150-
</dependencies>
151-
</dependencyManagement>
152-
<build>
153-
<pluginManagement>
154-
<plugins>
155-
<plugin>
156-
<groupId>dev.aspectj</groupId>
157-
<artifactId>aspectj-maven-plugin</artifactId>
158-
<version>${aspectj.plugin.version}</version>
159-
<configuration>
160-
<source>${maven.compiler.source}</source>
161-
<target>${maven.compiler.target}</target>
162-
<complianceLevel>${maven.compiler.target}</complianceLevel>
163-
<aspectLibraries>
164-
<aspectLibrary>
165-
<groupId>software.amazon.lambda</groupId>
166-
<artifactId>powertools-tracing</artifactId>
167-
</aspectLibrary>
168-
<aspectLibrary>
169-
<groupId>software.amazon.lambda</groupId>
170-
<artifactId>powertools-logging</artifactId>
171-
</aspectLibrary>
172-
</aspectLibraries>
173-
</configuration>
174-
<executions>
175-
<execution>
176-
<goals>
177-
<goal>compile</goal>
178-
<goal>test-compile</goal>
179-
</goals>
180-
</execution>
181-
</executions>
182-
<!-- Enforce aspectJ 1.9.7 -->
183-
<dependencies>
184-
<dependency>
185-
<groupId>org.aspectj</groupId>
186-
<artifactId>aspectjtools</artifactId>
187-
<version>${aspectj.version}</version>
188-
</dependency>
189-
</dependencies>
190-
</plugin>
191-
</plugins>
192-
</pluginManagement>
193-
</build>
194157
</profile>
195158
</profiles>
196159
</project>

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

Lines changed: 14 additions & 51 deletions
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>
@@ -17,6 +17,7 @@
1717
<lambda.core.version>1.2.3</lambda.core.version>
1818
<lambda.events.version>3.11.2</lambda.events.version>
1919
<aws.sdk.version>2.20.130</aws.sdk.version>
20+
<aspectj.version>1.9.20</aspectj.version>
2021
</properties>
2122
<dependencyManagement>
2223
<dependencies>
@@ -61,6 +62,11 @@
6162
<artifactId>log4j-api</artifactId>
6263
<version>${log4j.version}</version>
6364
</dependency>
65+
<dependency>
66+
<groupId>org.aspectj</groupId>
67+
<artifactId>aspectjrt</artifactId>
68+
<version>${aspectj.version}</version>
69+
</dependency>
6470
<dependency>
6571
<groupId>software.amazon.awssdk</groupId>
6672
<artifactId>s3</artifactId>
@@ -90,9 +96,6 @@
9096
<artifactId>log4j-jcl</artifactId>
9197
<version>${log4j.version}</version>
9298
</dependency>
93-
94-
95-
9699
</dependencies>
97100

98101
<build>
@@ -119,6 +122,13 @@
119122
</goals>
120123
</execution>
121124
</executions>
125+
<dependencies>
126+
<dependency>
127+
<groupId>org.aspectj</groupId>
128+
<artifactId>aspectjtools</artifactId>
129+
<version>${aspectj.version}</version>
130+
</dependency>
131+
</dependencies>
122132
</plugin>
123133
<plugin>
124134
<groupId>org.apache.maven.plugins</groupId>
@@ -165,53 +175,6 @@
165175
<properties>
166176
<aspectj.version>1.9.7</aspectj.version>
167177
</properties>
168-
<dependencyManagement>
169-
<dependencies>
170-
<dependency>
171-
<groupId>org.aspectj</groupId>
172-
<artifactId>aspectjtools</artifactId>
173-
<version>${aspectj.version}</version>
174-
</dependency>
175-
</dependencies>
176-
</dependencyManagement>
177-
<build>
178-
<pluginManagement>
179-
<plugins>
180-
<plugin>
181-
<groupId>dev.aspectj</groupId>
182-
<artifactId>aspectj-maven-plugin</artifactId>
183-
<version>${aspectj.plugin.version}</version>
184-
<configuration>
185-
<source>${maven.compiler.source}</source>
186-
<target>${maven.compiler.target}</target>
187-
<complianceLevel>${maven.compiler.target}</complianceLevel>
188-
<aspectLibraries>
189-
<aspectLibrary>
190-
<groupId>software.amazon.lambda</groupId>
191-
<artifactId>powertools-logging</artifactId>
192-
</aspectLibrary>
193-
</aspectLibraries>
194-
</configuration>
195-
<executions>
196-
<execution>
197-
<goals>
198-
<goal>compile</goal>
199-
<goal>test-compile</goal>
200-
</goals>
201-
</execution>
202-
</executions>
203-
<!-- Enforce aspectJ 1.9.7 -->
204-
<dependencies>
205-
<dependency>
206-
<groupId>org.aspectj</groupId>
207-
<artifactId>aspectjtools</artifactId>
208-
<version>${aspectj.version}</version>
209-
</dependency>
210-
</dependencies>
211-
</plugin>
212-
</plugins>
213-
</pluginManagement>
214-
</build>
215178
</profile>
216179
</profiles>
217180
</project>

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

Lines changed: 15 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,18 @@
33
<modelVersion>4.0.0</modelVersion>
44

55
<groupId>software.amazon.lambda.examples</groupId>
6-
<version>1.16.1</version>
6+
<version>1.17.0</version>
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>
1414
<maven.compiler.source>1.8</maven.compiler.source>
1515
<maven.compiler.target>1.8</maven.compiler.target>
1616
<maven.deploy.skip>true</maven.deploy.skip>
17+
<aspectj.version>1.9.20</aspectj.version>
1718
</properties>
1819

1920
<dependencies>
@@ -52,6 +53,11 @@
5253
<artifactId>log4j-api</artifactId>
5354
<version>${log4j.version}</version>
5455
</dependency>
56+
<dependency>
57+
<groupId>org.aspectj</groupId>
58+
<artifactId>aspectjrt</artifactId>
59+
<version>${aspectj.version}</version>
60+
</dependency>
5561

5662
<dependency>
5763
<groupId>junit</groupId>
@@ -94,6 +100,13 @@
94100
</goals>
95101
</execution>
96102
</executions>
103+
<dependencies>
104+
<dependency>
105+
<groupId>org.aspectj</groupId>
106+
<artifactId>aspectjtools</artifactId>
107+
<version>${aspectj.version}</version>
108+
</dependency>
109+
</dependencies>
97110
</plugin>
98111
<plugin>
99112
<groupId>org.apache.maven.plugins</groupId>
@@ -140,61 +153,6 @@
140153
<properties>
141154
<aspectj.version>1.9.7</aspectj.version>
142155
</properties>
143-
<dependencyManagement>
144-
<dependencies>
145-
<dependency>
146-
<groupId>org.aspectj</groupId>
147-
<artifactId>aspectjtools</artifactId>
148-
<version>${aspectj.version}</version>
149-
</dependency>
150-
</dependencies>
151-
</dependencyManagement>
152-
<build>
153-
<pluginManagement>
154-
<plugins>
155-
<plugin>
156-
<groupId>dev.aspectj</groupId>
157-
<artifactId>aspectj-maven-plugin</artifactId>
158-
<version>${aspectj.plugin.version}</version>
159-
<configuration>
160-
<source>${maven.compiler.source}</source>
161-
<target>${maven.compiler.target}</target>
162-
<complianceLevel>${maven.compiler.target}</complianceLevel>
163-
<aspectLibraries>
164-
<aspectLibrary>
165-
<groupId>software.amazon.lambda</groupId>
166-
<artifactId>powertools-tracing</artifactId>
167-
</aspectLibrary>
168-
<aspectLibrary>
169-
<groupId>software.amazon.lambda</groupId>
170-
<artifactId>powertools-logging</artifactId>
171-
</aspectLibrary>
172-
<aspectLibrary>
173-
<groupId>software.amazon.lambda</groupId>
174-
<artifactId>powertools-metrics</artifactId>
175-
</aspectLibrary>
176-
</aspectLibraries>
177-
</configuration>
178-
<executions>
179-
<execution>
180-
<goals>
181-
<goal>compile</goal>
182-
<goal>test-compile</goal>
183-
</goals>
184-
</execution>
185-
</executions>
186-
<!-- Enforce aspectJ 1.9.7 -->
187-
<dependencies>
188-
<dependency>
189-
<groupId>org.aspectj</groupId>
190-
<artifactId>aspectjtools</artifactId>
191-
<version>${aspectj.version}</version>
192-
</dependency>
193-
</dependencies>
194-
</plugin>
195-
</plugins>
196-
</pluginManagement>
197-
</build>
198156
</profile>
199157
</profiles>
200158
</project>

0 commit comments

Comments
 (0)