Skip to content

Commit 857fd4c

Browse files
scottgerringscottgerring
committed
Fix up merge
1 parent 653e98a commit 857fd4c

6 files changed

Lines changed: 81 additions & 72 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
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.152</sdk.version>
17+
<sdk.version>2.20.162</sdk.version>
1818
<aspectj.version>1.9.20</aspectj.version>
1919

2020
</properties>

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

Lines changed: 75 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -68,72 +68,81 @@
6868
</dependencies>
6969

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
<dependency>
5454
<groupId>com.amazonaws</groupId>
5555
<artifactId>aws-lambda-java-events</artifactId>
56-
<version>3.11.2</version>
56+
<version>3.11.3</version>
5757
</dependency>
5858
<dependency>
5959
<groupId>org.apache.logging.log4j</groupId>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<dependency>
3333
<groupId>com.amazonaws</groupId>
3434
<artifactId>aws-lambda-java-events</artifactId>
35-
<version>3.11.2</version>
35+
<version>3.11.3</version>
3636
</dependency>
3737
<dependency>
3838
<groupId>org.aspectj</groupId>

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
<aws.xray.recorder.version>2.14.0</aws.xray.recorder.version>
7979
<payloadoffloading-common.version>2.1.3</payloadoffloading-common.version>
8080
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
81-
<lambda.core.version>1.2.2</lambda.core.version>
81+
<lambda.core.version>1.2.3</lambda.core.version>
8282
<lambda.events.version>3.11.2</lambda.events.version>
8383
<lambda.serial.version>1.1.2</lambda.serial.version>
8484
<maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>

‎powertools-e2e-tests/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
<properties>
3131
<maven.compiler.source>1.8</maven.compiler.source>
3232
<maven.compiler.target>1.8</maven.compiler.target>
33-
<constructs.version>10.2.69</constructs.version>
34-
<cdk.version>2.93.0</cdk.version>
33+
<constructs.version>10.2.70</constructs.version>
34+
<cdk.version>2.100.0</cdk.version>
3535
</properties>
3636

3737
<dependencies>

0 commit comments

Comments
 (0)