Skip to content

Commit 1af7649

Browse files
scottgerringscottgerring
committed
Tests
1 parent d7f66a9 commit 1af7649

File tree

2 files changed

+24
-76
lines changed
  • examples/powertools-examples-core-utilities

2 files changed

+24
-76
lines changed

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

+3-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
<modelVersion>4.0.0</modelVersion>
44

55
<groupId>software.amazon.lambda.examples</groupId>
6-
<version>2.0.0-SNAPSHOT</version>
6+
<!-- TODO TODO TODO this should build from SNAPSHOT, but it doesn't, because the snapshots
7+
don't appear in the docker environment CDK builds it in in our CDK tests. How to procede? V2 blocker -->
8+
<version>1.17.0</version>
79
<artifactId>powertools-examples-core-utilities-cdk</artifactId>
810
<packaging>jar</packaging>
911
<name>Powertools for AWS Lambda (Java) library Examples - Core</name>

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

+21-75
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
33
<modelVersion>4.0.0</modelVersion>
44

5+
<name>Powertools for AWS Lambda (Java) library Examples - Core Utilities (logging, tracing, metrics) with SAM</name>
56
<groupId>software.amazon.lambda.examples</groupId>
67
<version>2.0.0-SNAPSHOT</version>
7-
<artifactId>powertools-examples-core-serverless</artifactId>
8+
<artifactId>powertools-examples-core-utilities-serverless</artifactId>
89
<packaging>jar</packaging>
910

10-
<name>Powertools for AWS Lambda (Java) library Examples - Core</name>
11-
1211
<properties>
1312
<log4j.version>2.20.0</log4j.version>
1413
<maven.compiler.source>1.8</maven.compiler.source>
1514
<maven.compiler.target>1.8</maven.compiler.target>
15+
<aspectj.version>1.9.20</aspectj.version>
1616
</properties>
1717

1818
<dependencies>
@@ -34,12 +34,12 @@
3434
<dependency>
3535
<groupId>com.amazonaws</groupId>
3636
<artifactId>aws-lambda-java-core</artifactId>
37-
<version>1.2.2</version>
37+
<version>1.2.3</version>
3838
</dependency>
3939
<dependency>
4040
<groupId>com.amazonaws</groupId>
4141
<artifactId>aws-lambda-java-events</artifactId>
42-
<version>3.11.2</version>
42+
<version>3.11.3</version>
4343
</dependency>
4444
<dependency>
4545
<groupId>org.apache.logging.log4j</groupId>
@@ -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>
@@ -61,7 +66,6 @@
6166
</dependencies>
6267

6368
<build>
64-
<finalName>helloworld-lambda</finalName>
6569
<plugins>
6670
<plugin>
6771
<groupId>dev.aspectj</groupId>
@@ -93,6 +97,13 @@
9397
</goals>
9498
</execution>
9599
</executions>
100+
<dependencies>
101+
<dependency>
102+
<groupId>org.aspectj</groupId>
103+
<artifactId>aspectjtools</artifactId>
104+
<version>${aspectj.version}</version>
105+
</dependency>
106+
</dependencies>
96107
</plugin>
97108
<plugin>
98109
<groupId>org.apache.maven.plugins</groupId>
@@ -106,29 +117,19 @@
106117
</goals>
107118
<configuration>
108119
<transformers>
109-
<transformer
110-
implementation="com.github.edwgiz.maven_shade_plugin.log4j2_cache_transformer.PluginsCacheFileTransformer">
111-
</transformer>
120+
<transformer implementation="org.apache.logging.log4j.maven.plugins.shade.transformer.Log4j2PluginCacheFileTransformer"/>
112121
</transformers>
113122
</configuration>
114123
</execution>
115124
</executions>
116125
<dependencies>
117126
<dependency>
118-
<groupId>com.github.edwgiz</groupId>
119-
<artifactId>maven-shade-plugin.log4j2-cachefile-transformer</artifactId>
120-
<version>2.15</version>
127+
<groupId>org.apache.logging.log4j</groupId>
128+
<artifactId>log4j-transform-maven-shade-plugin-extensions</artifactId>
129+
<version>0.1.0</version>
121130
</dependency>
122131
</dependencies>
123132
</plugin>
124-
<!-- Don't deploy the example -->
125-
<plugin>
126-
<groupId>org.apache.maven.plugins</groupId>
127-
<artifactId>maven-deploy-plugin</artifactId>
128-
<configuration>
129-
<skip>true</skip>
130-
</configuration>
131-
</plugin>
132133
</plugins>
133134
</build>
134135
<profiles>
@@ -149,61 +150,6 @@
149150
<properties>
150151
<aspectj.version>1.9.7</aspectj.version>
151152
</properties>
152-
<dependencyManagement>
153-
<dependencies>
154-
<dependency>
155-
<groupId>org.aspectj</groupId>
156-
<artifactId>aspectjtools</artifactId>
157-
<version>${aspectj.version}</version>
158-
</dependency>
159-
</dependencies>
160-
</dependencyManagement>
161-
<build>
162-
<pluginManagement>
163-
<plugins>
164-
<plugin>
165-
<groupId>dev.aspectj</groupId>
166-
<artifactId>aspectj-maven-plugin</artifactId>
167-
<version>${aspectj.plugin.version}</version>
168-
<configuration>
169-
<source>${maven.compiler.source}</source>
170-
<target>${maven.compiler.target}</target>
171-
<complianceLevel>${maven.compiler.target}</complianceLevel>
172-
<aspectLibraries>
173-
<aspectLibrary>
174-
<groupId>software.amazon.lambda</groupId>
175-
<artifactId>powertools-tracing</artifactId>
176-
</aspectLibrary>
177-
<aspectLibrary>
178-
<groupId>software.amazon.lambda</groupId>
179-
<artifactId>powertools-logging</artifactId>
180-
</aspectLibrary>
181-
<aspectLibrary>
182-
<groupId>software.amazon.lambda</groupId>
183-
<artifactId>powertools-metrics</artifactId>
184-
</aspectLibrary>
185-
</aspectLibraries>
186-
</configuration>
187-
<executions>
188-
<execution>
189-
<goals>
190-
<goal>compile</goal>
191-
<goal>test-compile</goal>
192-
</goals>
193-
</execution>
194-
</executions>
195-
<!-- Enforce aspectJ 1.9.7 -->
196-
<dependencies>
197-
<dependency>
198-
<groupId>org.aspectj</groupId>
199-
<artifactId>aspectjtools</artifactId>
200-
<version>${aspectj.version}</version>
201-
</dependency>
202-
</dependencies>
203-
</plugin>
204-
</plugins>
205-
</pluginManagement>
206-
</build>
207153
</profile>
208154
</profiles>
209155
</project>

0 commit comments

Comments
 (0)