Merge branch 'main' into main

vicheey · web-flow · commit 829b484ed8fc · 2025-06-18T09:48:21.000-07:00
diff --git a/aws-serverless-java-container-spring/pom.xml b/aws-serverless-java-container-spring/pom.xml
@@ -17,7 +17,7 @@
 
     <properties>
         <spring.version>6.2.8</spring.version>
-        <spring-security.version>6.4.5</spring-security.version>
+        <spring-security.version>6.5.1</spring-security.version>
     </properties>
 
     <dependencies>
diff --git a/aws-serverless-jersey-archetype/pom.xml b/aws-serverless-jersey-archetype/pom.xml
@@ -48,7 +48,7 @@
             <extension>
                 <groupId>org.apache.maven.archetype</groupId>
                 <artifactId>archetype-packaging</artifactId>
-                <version>3.3.1</version>
+                <version>3.4.0</version>
             </extension>
         </extensions>
 
@@ -65,7 +65,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-archetype-plugin</artifactId>
-                    <version>3.3.1</version>
+                    <version>3.4.0</version>
                     <executions>
                         <execution>
                             <goals>
diff --git a/aws-serverless-jersey-archetype/src/main/resources/archetype-resources/build.gradle b/aws-serverless-jersey-archetype/src/main/resources/archetype-resources/build.gradle
@@ -23,7 +23,7 @@ dependencies {
 
   testImplementation("com.amazonaws.serverless:aws-serverless-java-container-core:[2.0-SNAPSHOT,):tests")
   testImplementation("org.apache.httpcomponents.client5:httpclient5:5.5")
-  testImplementation(platform("org.junit:junit-bom:5.12.1"))
+  testImplementation(platform("org.junit:junit-bom:5.13.1"))
   testImplementation("org.junit.jupiter:junit-jupiter")
   testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
diff --git a/aws-serverless-spring-archetype/pom.xml b/aws-serverless-spring-archetype/pom.xml
@@ -48,7 +48,7 @@
             <extension>
                 <groupId>org.apache.maven.archetype</groupId>
                 <artifactId>archetype-packaging</artifactId>
-                <version>3.3.1</version>
+                <version>3.4.0</version>
             </extension>
         </extensions>
 
@@ -66,7 +66,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-archetype-plugin</artifactId>
-                    <version>3.3.1</version>
+                    <version>3.4.0</version>
                     <executions>
                         <execution>
                             <goals>
diff --git a/aws-serverless-spring-archetype/src/main/resources/archetype-resources/build.gradle b/aws-serverless-spring-archetype/src/main/resources/archetype-resources/build.gradle
@@ -19,7 +19,7 @@ dependencies {
 
   testImplementation("com.amazonaws.serverless:aws-serverless-java-container-core:[2.0-SNAPSHOT,):tests")
   testImplementation("org.apache.httpcomponents.client5:httpclient5:5.5")
-  testImplementation(platform("org.junit:junit-bom:5.12.2"))
+  testImplementation(platform("org.junit:junit-bom:5.13.1"))
   testImplementation("org.junit.jupiter:junit-jupiter")
   testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
diff --git a/aws-serverless-springboot3-archetype/pom.xml b/aws-serverless-springboot3-archetype/pom.xml
@@ -48,7 +48,7 @@
             <extension>
                 <groupId>org.apache.maven.archetype</groupId>
                 <artifactId>archetype-packaging</artifactId>
-                <version>3.3.1</version>
+                <version>3.4.0</version>
             </extension>
         </extensions>
 
@@ -65,7 +65,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-archetype-plugin</artifactId>
-                    <version>3.3.1</version>
+                    <version>3.4.0</version>
                     <executions>
                         <execution>
                             <goals>
diff --git a/samples/springboot3/graphql-pet-store/pom.xml b/samples/springboot3/graphql-pet-store/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.4.5</version>
+        <version>3.5.0</version>
     </parent>
 
     <licenses>

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ dependencies {`
`23`	`23`
`24`	`24`	`testImplementation("com.amazonaws.serverless:aws-serverless-java-container-core:[2.0-SNAPSHOT,):tests")`
`25`	`25`	`testImplementation("org.apache.httpcomponents.client5:httpclient5:5.5")`
`26`		`- testImplementation(platform("org.junit:junit-bom:5.12.1"))`
	`26`	`+ testImplementation(platform("org.junit:junit-bom:5.13.1"))`
`27`	`27`	`testImplementation("org.junit.jupiter:junit-jupiter")`
`28`	`28`	`testRuntimeOnly("org.junit.platform:junit-platform-launcher")`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ dependencies {`
`19`	`19`
`20`	`20`	`testImplementation("com.amazonaws.serverless:aws-serverless-java-container-core:[2.0-SNAPSHOT,):tests")`
`21`	`21`	`testImplementation("org.apache.httpcomponents.client5:httpclient5:5.5")`
`22`		`- testImplementation(platform("org.junit:junit-bom:5.12.2"))`
	`22`	`+ testImplementation(platform("org.junit:junit-bom:5.13.1"))`
`23`	`23`	`testImplementation("org.junit.jupiter:junit-jupiter")`
`24`	`24`	`testRuntimeOnly("org.junit.platform:junit-platform-launcher")`
`25`	`25`	`}`