Skip to content

Commit fe80321

Browse files
AdnaneKhanAdnaneKhan
authored
Merge branch 'main' into update/scopedown-token
2 parents fd8b8d0 + da75c63 commit fe80321

File tree

14 files changed

+50
-56
lines changed
  • aws-lambda-java-events-sdk-transformer
  • aws-lambda-java-events
  • aws-lambda-java-log4j2
  • aws-lambda-java-runtime-interface-client
  • aws-lambda-java-serialization
  • aws-lambda-java-tests
  • experimental/aws-lambda-java-profiler/examples/function/profiling-example
  • samples
    • custom-serialization
    • kinesis-firehose-event-handler

14 files changed

+50
-56
lines changed

‎aws-lambda-java-events-sdk-transformer/pom.xml‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -160,18 +160,16 @@
160160
</executions>
161161
</plugin>
162162
<plugin>
163-
<groupId>org.sonatype.plugins</groupId>
164-
<artifactId>nexus-staging-maven-plugin</artifactId>
165-
<version>1.6.3</version>
163+
<groupId>org.sonatype.central</groupId>
164+
<artifactId>central-publishing-maven-plugin</artifactId>
165+
<version>0.8.0</version>
166166
<extensions>true</extensions>
167167
<configuration>
168-
<serverId>sonatype-nexus-staging</serverId>
169-
<nexusUrl>https://aws.oss.sonatype.org/</nexusUrl>
170-
<autoReleaseAfterClose>false</autoReleaseAfterClose>
168+
<publishingServerId>central</publishingServerId>
171169
</configuration>
172170
</plugin>
173171
</plugins>
174172
</build>
175173
</profile>
176174
</profiles>
177-
</project>
175+
</project>

‎aws-lambda-java-events/pom.xml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0"
2-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
44
<modelVersion>4.0.0</modelVersion>
55

66
<groupId>com.amazonaws</groupId>
@@ -37,6 +37,8 @@
3737
<lombok.version>1.18.22</lombok.version>
3838
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3939
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
40+
<jackson.version>2.20.1</jackson.version>
41+
<json.unit>2.40.1</json.unit>
4042
</properties>
4143

4244
<distributionManagement>
@@ -62,13 +64,13 @@
6264
<dependency>
6365
<groupId>com.fasterxml.jackson.core</groupId>
6466
<artifactId>jackson-databind</artifactId>
65-
<version>2.14.2</version>
67+
<version>${jackson.version}</version>
6668
<scope>test</scope>
6769
</dependency>
6870
<dependency>
6971
<groupId>net.javacrumbs.json-unit</groupId>
7072
<artifactId>json-unit-assertj</artifactId>
71-
<version>2.36.1</version>
73+
<version>${json.unit}</version>
7274
<scope>test</scope>
7375
</dependency>
7476

@@ -152,28 +154,26 @@
152154
</executions>
153155
</plugin>
154156
<plugin>
155-
<groupId>org.sonatype.plugins</groupId>
156-
<artifactId>nexus-staging-maven-plugin</artifactId>
157-
<version>1.6.3</version>
157+
<groupId>org.sonatype.central</groupId>
158+
<artifactId>central-publishing-maven-plugin</artifactId>
159+
<version>0.8.0</version>
158160
<extensions>true</extensions>
159161
<configuration>
160-
<serverId>sonatype-nexus-staging</serverId>
161-
<nexusUrl>https://aws.oss.sonatype.org/</nexusUrl>
162-
<autoReleaseAfterClose>false</autoReleaseAfterClose>
162+
<publishingServerId>central</publishingServerId>
163163
</configuration>
164164
</plugin>
165165
<plugin>
166166
<groupId>org.apache.maven.plugins</groupId>
167167
<artifactId>maven-resources-plugin</artifactId>
168-
<version>3.2.0</version>
168+
<version>3.3.1</version>
169169
<configuration>
170170
<encoding>UTF-8</encoding>
171171
</configuration>
172172
</plugin>
173173
<plugin>
174174
<groupId>org.apache.maven.plugins</groupId>
175175
<artifactId>maven-compiler-plugin</artifactId>
176-
<version>3.8.1</version>
176+
<version>3.11.0</version>
177177
<configuration>
178178
<annotationProcessorPaths>
179179
<path>
@@ -189,4 +189,4 @@
189189
</build>
190190
</profile>
191191
</profiles>
192-
</project>
192+
</project>

‎aws-lambda-java-log4j2/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ If using maven shade plugin, set the plugin configuration as follows
3939
<plugin>
4040
<groupId>org.apache.maven.plugins</groupId>
4141
<artifactId>maven-shade-plugin</artifactId>
42-
<version>2.4.3</version>
42+
<version>3.6.1</version>
4343
<executions>
4444
<execution>
4545
<phase>package</phase>

‎aws-lambda-java-log4j2/pom.xml‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>com.amazonaws</groupId>
77
<artifactId>aws-lambda-java-log4j2</artifactId>
8-
<version>1.6.0</version>
8+
<version>1.6.1</version>
99
<packaging>jar</packaging>
1010

1111
<name>AWS Lambda Java Log4j 2.x Libraries</name>
@@ -34,7 +34,7 @@
3434
<properties>
3535
<maven.compiler.source>1.8</maven.compiler.source>
3636
<maven.compiler.target>1.8</maven.compiler.target>
37-
<log4j.version>2.17.1</log4j.version>
37+
<log4j.version>2.25.3</log4j.version>
3838
</properties>
3939

4040
<distributionManagement>
@@ -134,18 +134,16 @@
134134
</executions>
135135
</plugin>
136136
<plugin>
137-
<groupId>org.sonatype.plugins</groupId>
138-
<artifactId>nexus-staging-maven-plugin</artifactId>
139-
<version>1.6.3</version>
137+
<groupId>org.sonatype.central</groupId>
138+
<artifactId>central-publishing-maven-plugin</artifactId>
139+
<version>0.8.0</version>
140140
<extensions>true</extensions>
141141
<configuration>
142-
<serverId>sonatype-nexus-staging</serverId>
143-
<nexusUrl>https://aws.oss.sonatype.org/</nexusUrl>
144-
<autoReleaseAfterClose>false</autoReleaseAfterClose>
142+
<publishingServerId>central</publishingServerId>
145143
</configuration>
146144
</plugin>
147145
</plugins>
148146
</build>
149147
</profile>
150148
</profiles>
151-
</project>
149+
</project>

‎aws-lambda-java-runtime-interface-client/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<modelVersion>4.0.0</modelVersion>
55
<groupId>com.amazonaws</groupId>
66
<artifactId>aws-lambda-java-runtime-interface-client</artifactId>
7-
<version>2.8.7</version>
7+
<version>2.9.0</version>
88
<packaging>jar</packaging>
99

1010
<name>AWS Lambda Java Runtime Interface Client</name>
@@ -66,7 +66,7 @@
6666
<dependency>
6767
<groupId>com.amazonaws</groupId>
6868
<artifactId>aws-lambda-java-serialization</artifactId>
69-
<version>1.1.6</version>
69+
<version>1.2.0</version>
7070
</dependency>
7171
<dependency>
7272
<groupId>software.amazon.awssdk</groupId>

‎aws-lambda-java-serialization/pom.xml‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
2+
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

55
<groupId>com.amazonaws</groupId>
@@ -169,14 +169,12 @@
169169
</executions>
170170
</plugin>
171171
<plugin>
172-
<groupId>org.sonatype.plugins</groupId>
173-
<artifactId>nexus-staging-maven-plugin</artifactId>
174-
<version>1.6.3</version>
172+
<groupId>org.sonatype.central</groupId>
173+
<artifactId>central-publishing-maven-plugin</artifactId>
174+
<version>0.8.0</version>
175175
<extensions>true</extensions>
176176
<configuration>
177-
<serverId>sonatype-nexus-staging</serverId>
178-
<nexusUrl>https://aws.oss.sonatype.org/</nexusUrl>
179-
<autoReleaseAfterClose>false</autoReleaseAfterClose>
177+
<publishingServerId>central</publishingServerId>
180178
</configuration>
181179
</plugin>
182180
</plugins>

‎aws-lambda-java-tests/pom.xml‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
2+
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

55
<groupId>com.amazonaws</groupId>
@@ -220,14 +220,12 @@
220220
</executions>
221221
</plugin>
222222
<plugin>
223-
<groupId>org.sonatype.plugins</groupId>
224-
<artifactId>nexus-staging-maven-plugin</artifactId>
225-
<version>1.6.3</version>
223+
<groupId>org.sonatype.central</groupId>
224+
<artifactId>central-publishing-maven-plugin</artifactId>
225+
<version>0.8.0</version>
226226
<extensions>true</extensions>
227227
<configuration>
228-
<serverId>sonatype-nexus-staging</serverId>
229-
<nexusUrl>https://aws.oss.sonatype.org/</nexusUrl>
230-
<autoReleaseAfterClose>false</autoReleaseAfterClose>
228+
<publishingServerId>central</publishingServerId>
231229
</configuration>
232230
</plugin>
233231
</plugins>
@@ -240,7 +238,7 @@
240238
<plugin>
241239
<groupId>org.apache.maven.plugins</groupId>
242240
<artifactId>maven-compiler-plugin</artifactId>
243-
<version>3.8.1</version>
241+
<version>3.11.0</version>
244242
<configuration>
245243
<source>${maven.compiler.source}</source>
246244
<target>${maven.compiler.target}</target>
@@ -254,4 +252,4 @@
254252
</plugin>
255253
</plugins>
256254
</build>
257-
</project>
255+
</project>

‎experimental/aws-lambda-java-profiler/examples/function/profiling-example/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
<plugin>
4747
<groupId>org.apache.maven.plugins</groupId>
4848
<artifactId>maven-shade-plugin</artifactId>
49-
<version>3.2.4</version>
49+
<version>3.6.1</version>
5050
<configuration>
5151
</configuration>
5252
<executions>

‎samples/custom-serialization/fastJson/HelloWorldFunction/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<plugin>
3636
<groupId>org.apache.maven.plugins</groupId>
3737
<artifactId>maven-shade-plugin</artifactId>
38-
<version>3.2.4</version>
38+
<version>3.6.1</version>
3939
<configuration>
4040
</configuration>
4141
<executions>

‎samples/custom-serialization/gson/HelloWorldFunction/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<plugin>
3535
<groupId>org.apache.maven.plugins</groupId>
3636
<artifactId>maven-shade-plugin</artifactId>
37-
<version>3.2.4</version>
37+
<version>3.6.1</version>
3838
<configuration>
3939
</configuration>
4040
<executions>

0 commit comments

Comments
 (0)