Skip to content

Commit 317c5a7

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 02d4e68 commit 317c5a7

File tree

4 files changed

+75
-83
lines changed
  • examples
    • powertools-examples-batch
    • powertools-examples-core-utilities/sam
  • powertools-common
  • powertools-large-messages

4 files changed

+75
-83
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<log4j.version>2.20.0</log4j.version>
1515
<maven.compiler.source>1.8</maven.compiler.source>
1616
<maven.compiler.target>1.8</maven.compiler.target>
17-
<sdk.version>2.20.143</sdk.version>
17+
<sdk.version>2.20.152</sdk.version>
1818
<aspectj.version>1.9.20</aspectj.version>
1919
</properties>
2020

@@ -152,7 +152,6 @@
152152
- If you are running on Java 1.8, you should apply the aspectJ version here to the project, and remove
153153
the profile.
154154
-->
155-
156155
<profile>
157156
<id>jdk8</id>
158157
<activation>

‎examples/powertools-examples-core-utilities/sam/pom.xml‎

Lines changed: 74 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -72,79 +72,80 @@
7272
</dependencies>
7373

7474
<build>
75-
<plugins>
76-
<plugin>
77-
<groupId>dev.aspectj</groupId>
78-
<artifactId>aspectj-maven-plugin</artifactId>
79-
<version>1.13.1</version>
80-
<configuration>
81-
<source>${maven.compiler.source}</source>
82-
<target>${maven.compiler.target}</target>
83-
<complianceLevel>${maven.compiler.target}</complianceLevel>
84-
<aspectLibraries>
85-
<aspectLibrary>
86-
<groupId>software.amazon.lambda</groupId>
87-
<artifactId>powertools-tracing</artifactId>
88-
</aspectLibrary>
89-
<aspectLibrary>
90-
<groupId>software.amazon.lambda</groupId>
91-
<artifactId>powertools-logging</artifactId>
92-
</aspectLibrary>
93-
<aspectLibrary>
94-
<groupId>software.amazon.lambda</groupId>
95-
<artifactId>powertools-metrics</artifactId>
96-
</aspectLibrary>
97-
</aspectLibraries>
98-
</configuration>
99-
<executions>
100-
<execution>
101-
<goals>
102-
<goal>compile</goal>
103-
</goals>
104-
</execution>
105-
</executions>
106-
<dependencies>
107-
<dependency>
108-
<groupId>org.aspectj</groupId>
109-
<artifactId>aspectjtools</artifactId>
110-
<version>${aspectj.version}</version>
111-
</dependency>
112-
</dependencies>
113-
</plugin>
114-
<!-- Don't deploy the example -->
115-
<plugin>
116-
<groupId>org.apache.maven.plugins</groupId>
117-
<artifactId>maven-deploy-plugin</artifactId>
118-
<configuration>
119-
<skip>true</skip>
120-
</configuration>
121-
</plugin>
122-
<plugin>
123-
<groupId>org.apache.maven.plugins</groupId>
124-
<artifactId>maven-shade-plugin</artifactId>
125-
<version>3.5.0</version>
126-
<executions>
127-
<execution>
128-
<phase>package</phase>
129-
<goals>
130-
<goal>shade</goal>
131-
</goals>
132-
<configuration>
133-
<transformers>
134-
<transformer implementation="org.apache.logging.log4j.maven.plugins.shade.transformer.Log4j2PluginCacheFileTransformer"/>
135-
</transformers>
136-
</configuration>
137-
</execution>
138-
</executions>
139-
<dependencies>
140-
<dependency>
141-
<groupId>org.apache.logging.log4j</groupId>
142-
<artifactId>log4j-transform-maven-shade-plugin-extensions</artifactId>
143-
<version>0.1.0</version>
144-
</dependency>
145-
</dependencies>
146-
</plugin>
147-
</plugins>
75+
<plugins>
76+
<plugin>
77+
<groupId>dev.aspectj</groupId>
78+
<artifactId>aspectj-maven-plugin</artifactId>
79+
<version>1.13.1</version>
80+
<configuration>
81+
<source>${maven.compiler.source}</source>
82+
<target>${maven.compiler.target}</target>
83+
<complianceLevel>${maven.compiler.target}</complianceLevel>
84+
<aspectLibraries>
85+
<aspectLibrary>
86+
<groupId>software.amazon.lambda</groupId>
87+
<artifactId>powertools-tracing</artifactId>
88+
</aspectLibrary>
89+
<aspectLibrary>
90+
<groupId>software.amazon.lambda</groupId>
91+
<artifactId>powertools-logging</artifactId>
92+
</aspectLibrary>
93+
<aspectLibrary>
94+
<groupId>software.amazon.lambda</groupId>
95+
<artifactId>powertools-metrics</artifactId>
96+
</aspectLibrary>
97+
</aspectLibraries>
98+
</configuration>
99+
<executions>
100+
<execution>
101+
<goals>
102+
<goal>compile</goal>
103+
</goals>
104+
</execution>
105+
</executions>
106+
<dependencies>
107+
<dependency>
108+
<groupId>org.aspectj</groupId>
109+
<artifactId>aspectjtools</artifactId>
110+
<version>${aspectj.version}</version>
111+
</dependency>
112+
</dependencies>
113+
</plugin>
114+
<plugin>
115+
<groupId>org.apache.maven.plugins</groupId>
116+
<artifactId>maven-shade-plugin</artifactId>
117+
<version>3.5.0</version>
118+
<executions>
119+
<execution>
120+
<phase>package</phase>
121+
<goals>
122+
<goal>shade</goal>
123+
</goals>
124+
<configuration>
125+
<transformers>
126+
<transformer
127+
implementation="org.apache.logging.log4j.maven.plugins.shade.transformer.Log4j2PluginCacheFileTransformer"/>
128+
</transformers>
129+
</configuration>
130+
</execution>
131+
</executions>
132+
<dependencies>
133+
<dependency>
134+
<groupId>org.apache.logging.log4j</groupId>
135+
<artifactId>log4j-transform-maven-shade-plugin-extensions</artifactId>
136+
<version>0.1.0</version>
137+
</dependency>
138+
</dependencies>
139+
</plugin>
140+
<!-- Don't deploy the examples -->
141+
<plugin>
142+
<groupId>org.apache.maven.plugins</groupId>
143+
<artifactId>maven-deploy-plugin</artifactId>
144+
<configuration>
145+
<skip>true</skip>
146+
</configuration>
147+
</plugin>
148+
</plugins>
148149
</build>
149150
<profiles>
150151
<!-- Use a profile to enforce AspectJ version 1.9.7 if we are Java 1.8 otherwise we'll get class

‎powertools-common/pom.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,6 @@
5858
<groupId>com.amazonaws</groupId>
5959
<artifactId>aws-lambda-java-core</artifactId>
6060
</dependency>
61-
<dependency>
62-
<groupId>org.aspectj</groupId>
63-
<artifactId>aspectjrt</artifactId>
64-
</dependency>
6561
<dependency>
6662
<groupId>org.apache.logging.log4j</groupId>
6763
<artifactId>log4j-slf4j2-impl</artifactId>

‎powertools-large-messages/pom.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,6 @@
5858
<groupId>software.amazon.lambda</groupId>
5959
<artifactId>powertools-common</artifactId>
6060
</dependency>
61-
<dependency>
62-
<groupId>org.aspectj</groupId>
63-
<artifactId>aspectjrt</artifactId>
64-
</dependency>
6561
<dependency>
6662
<groupId>com.amazonaws</groupId>
6763
<artifactId>aws-lambda-java-events</artifactId>

0 commit comments

Comments
 (0)