chore(deps): Update Spring dependencies (framework to 6.2.0, security…

… to 6.4.1, boot to 3.4.0, spring-cloud-function-serverless-web to 4.1.4)
aws · Nov 27, 2024 · 24908a1 · 24908a1
1 parent 506dbb1
commit 24908a1
Show file tree

Hide file tree

Showing 16 changed files with 23 additions and 21 deletions.
diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml
@@ -79,6 +79,8 @@ jobs:
         run: ./gha_build.sh springboot3 false false -Dspringboot.version=3.1.12 -Dspring.version=6.0.21 -Dspringsecurity.version=6.1.9 -Ddependency-check.skip=true
       - name: Build with Spring Boot 3.2.x
         run: ./gha_build.sh springboot3 false false -Dspringboot.version=3.2.7 -Dspring.version=6.1.10 -Dspringsecurity.version=6.2.5 -Ddependency-check.skip=true
+      - name: Build with Spring Boot 3.3.x
+        run: ./gha_build.sh springboot3 false false -Dspringboot.version=3.3.6 -Dspring.version=6.1.15 -Dspringsecurity.version=6.3.5 -Ddependency-check.skip=true
 
 # temporarily disabled as Struts is not released at the moment
 #  build_struts2:

diff --git a/aws-serverless-java-container-core/pom.xml b/aws-serverless-java-container-core/pom.xml
@@ -60,7 +60,7 @@
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-web</artifactId>
-            <version>6.3.4</version>
+            <version>6.4.1</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/aws-serverless-java-container-spring/pom.xml b/aws-serverless-java-container-spring/pom.xml
@@ -16,8 +16,8 @@
     </parent>
 
     <properties>
-        <spring.version>6.1.14</spring.version>
-        <spring-security.version>6.3.4</spring-security.version>
+        <spring.version>6.2.0</spring.version>
+        <spring-security.version>6.4.1</spring-security.version>
     </properties>
 
     <dependencies>

diff --git a/aws-serverless-java-container-springboot3/pom.xml b/aws-serverless-java-container-springboot3/pom.xml
@@ -15,17 +15,17 @@
     <version>2.1.0-SNAPSHOT</version>
 
     <properties>
-        <spring.version>6.1.14</spring.version>
-        <springboot.version>3.3.5</springboot.version>
-        <springsecurity.version>6.3.4</springsecurity.version>
+        <spring.version>6.2.0</spring.version>
+        <springboot.version>3.4.0</springboot.version>
+        <springsecurity.version>6.4.1</springsecurity.version>
     </properties>
 
     <dependencies>
         <!-- Core interfaces for the aws-serverless-java-container project -->
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-function-serverless-web</artifactId>
-            <version>4.1.3</version>
+            <version>4.1.4</version>
         </dependency>
         <dependency>
             <groupId>com.amazonaws.serverless</groupId>

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
@@ -7,8 +7,8 @@ repositories {
 
 dependencies {
   implementation (
-          'org.springframework:spring-webmvc:6.1.14',
-          'org.springframework:spring-context:6.1.14',
+          'org.springframework:spring-webmvc:6.2.0',
+          'org.springframework:spring-context:6.2.0',
           'com.amazonaws.serverless:aws-serverless-java-container-spring:[2.0-SNAPSHOT,)',
           'org.apache.logging.log4j:log4j-core:2.24.1',
           'org.apache.logging.log4j:log4j-api:2.24.1',

diff --git a/aws-serverless-spring-archetype/src/main/resources/archetype-resources/pom.xml b/aws-serverless-spring-archetype/src/main/resources/archetype-resources/pom.xml
@@ -16,7 +16,7 @@
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
-        <spring.version>6.1.14</spring.version>
+        <spring.version>6.2.0</spring.version>
         <junit.version>5.11.3</junit.version>
         <log4j.version>2.24.1</log4j.version>
     </properties>

diff --git a/aws-serverless-springboot3-archetype/src/main/resources/archetype-resources/build.gradle b/aws-serverless-springboot3-archetype/src/main/resources/archetype-resources/build.gradle
@@ -9,7 +9,7 @@ repositories {
 
 dependencies {
   implementation (
-          'org.springframework.boot:spring-boot-starter-web:3.3.5',
+          'org.springframework.boot:spring-boot-starter-web:3.4.0',
           'com.amazonaws.serverless:aws-serverless-java-container-springboot3:[2.0-SNAPSHOT,)',
   )
 

diff --git a/aws-serverless-springboot3-archetype/src/main/resources/archetype-resources/pom.xml b/aws-serverless-springboot3-archetype/src/main/resources/archetype-resources/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.3.5</version>
+        <version>3.4.0</version>
     </parent>
 
     <properties>

diff --git a/samples/spring/pet-store/build.gradle b/samples/spring/pet-store/build.gradle
@@ -7,8 +7,8 @@ repositories {
 
 dependencies {
   implementation (
-          'org.springframework:spring-webmvc:6.1.14',
-          'org.springframework:spring-context:6.1.14',
+          'org.springframework:spring-webmvc:6.2.0',
+          'org.springframework:spring-context:6.2.0',
           'com.amazonaws.serverless:aws-serverless-java-container-spring:[2.0-SNAPSHOT,)',
           'org.apache.logging.log4j:log4j-core:2.24.1',
           'org.apache.logging.log4j:log4j-api:2.24.1',

diff --git a/samples/spring/pet-store/pom.xml b/samples/spring/pet-store/pom.xml
@@ -24,7 +24,7 @@
     </licenses>
 
     <properties>
-        <spring.version>6.1.14</spring.version>
+        <spring.version>6.2.0</spring.version>
         <log4j.version>2.24.1</log4j.version>
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>

diff --git a/samples/springboot3/alt-pet-store/build.gradle b/samples/springboot3/alt-pet-store/build.gradle
@@ -9,7 +9,7 @@ repositories {
 
 dependencies {
   implementation (
-          implementation('org.springframework.boot:spring-boot-starter-web:3.3.5') {
+          implementation('org.springframework.boot:spring-boot-starter-web:3.4.0') {
             exclude group: 'org.springframework.boot', module: 'spring-boot-starter-tomcat'
           },
           'com.amazonaws.serverless:aws-serverless-java-container-springboot3:[2.0-SNAPSHOT,)',

diff --git a/samples/springboot3/alt-pet-store/pom.xml b/samples/springboot3/alt-pet-store/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.3.5</version>
+        <version>3.4.0</version>
     </parent>
 
     <licenses>

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.3.5</version>
+        <version>3.4.0</version>
     </parent>
 
     <licenses>

diff --git a/samples/springboot3/pet-store-native/pom.xml b/samples/springboot3/pet-store-native/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.3.5</version>
+		<version>3.4.0</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.amazonaws.serverless.sample</groupId>

diff --git a/samples/springboot3/pet-store/build.gradle b/samples/springboot3/pet-store/build.gradle
@@ -9,7 +9,7 @@ repositories {
 
 dependencies {
   implementation (
-          implementation('org.springframework.boot:spring-boot-starter-web:3.3.5') {
+          implementation('org.springframework.boot:spring-boot-starter-web:3.4.0') {
             exclude group: 'org.springframework.boot', module: 'spring-boot-starter-tomcat'
           },
           'com.amazonaws.serverless:aws-serverless-java-container-springboot3:[2.0-SNAPSHOT,)',

diff --git a/samples/springboot3/pet-store/pom.xml b/samples/springboot3/pet-store/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.3.5</version>
+        <version>3.4.0</version>
     </parent>
 
     <licenses>