Merge branch 'aws:main' into main

leekib · web-flow · commit df1b787fbbeb · 2024-09-23T01:24:30.000+09:00
diff --git a/aws-serverless-java-container-spring/pom.xml b/aws-serverless-java-container-spring/pom.xml
@@ -16,7 +16,7 @@
     </parent>
 
     <properties>
-        <spring.version>6.1.12</spring.version>
+        <spring.version>6.1.13</spring.version>
         <spring-security.version>6.3.3</spring-security.version>
     </properties>
 
diff --git a/aws-serverless-java-container-springboot3/pom.xml b/aws-serverless-java-container-springboot3/pom.xml
@@ -15,8 +15,8 @@
     <version>2.1.0-SNAPSHOT</version>
 
     <properties>
-        <spring.version>6.1.12</spring.version>
-        <springboot.version>3.3.3</springboot.version>
+        <spring.version>6.1.13</spring.version>
+        <springboot.version>3.3.4</springboot.version>
         <springsecurity.version>6.3.3</springsecurity.version>
     </properties>
 
diff --git a/aws-serverless-java-container-struts/pom.xml b/aws-serverless-java-container-struts/pom.xml
@@ -15,7 +15,7 @@
     </parent>
 
     <properties>
-        <struts.version>7.0.0-M8</struts.version>
+        <struts.version>7.0.0-M9</struts.version>
     </properties>
 
     <dependencies>
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.12',
-          'org.springframework:spring-context:6.1.12',
+          'org.springframework:spring-webmvc:6.1.13',
+          'org.springframework:spring-context:6.1.13',
           'com.amazonaws.serverless:aws-serverless-java-container-spring:[2.0-SNAPSHOT,)',
           'org.apache.logging.log4j:log4j-core:2.24.0',
           'org.apache.logging.log4j:log4j-api:2.24.0',
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.12</spring.version>
+        <spring.version>6.1.13</spring.version>
         <junit.version>5.11.0</junit.version>
         <log4j.version>2.24.0</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.3',
+          'org.springframework.boot:spring-boot-starter-web:3.3.4',
           '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.3</version>
+        <version>3.3.4</version>
     </parent>
 
     <properties>
diff --git a/aws-serverless-struts-archetype/src/main/resources/archetype-resources/build.gradle b/aws-serverless-struts-archetype/src/main/resources/archetype-resources/build.gradle
@@ -18,19 +18,19 @@ dependencies {
     exclude group: 'org.apache.logging.log4j', module: 'log4j-api'
     exclude group: 'org.apache.logging.log4j', module: 'log4j-to-slf4j'
   }
-  implementation ('org.apache.struts:struts2-convention-plugin:7.0.0-M8') {
+  implementation ('org.apache.struts:struts2-convention-plugin:7.0.0-M9') {
     exclude group: 'org.apache.struts', module: 'struts2-core'
   }
-  implementation ('org.apache.struts:struts2-rest-plugin:7.0.0-M8') {
+  implementation ('org.apache.struts:struts2-rest-plugin:7.0.0-M9') {
     exclude group: 'org.apache.struts', module: 'struts2-core'
   }
-  implementation ('org.apache.struts:struts2-bean-validation-plugin:7.0.0-M8') {
+  implementation ('org.apache.struts:struts2-bean-validation-plugin:7.0.0-M9') {
     exclude group: 'org.apache.struts', module: 'struts2-core'
   }
   implementation ('com.jgeppert.struts2:struts2-aws-lambda-support-plugin:1.4.3') {
     exclude group: 'org.apache.struts', module: 'struts2-core'
   }
-  implementation ('org.apache.struts:struts2-core:7.0.0-M8') {
+  implementation ('org.apache.struts:struts2-core:7.0.0-M9') {
     exclude group: 'org.apache.logging.log4j', module: 'log4j-api'
   }
   implementation ('org.hibernate.validator:hibernate-validator:6.1.7.Final')
@@ -45,7 +45,7 @@ dependencies {
   testImplementation("org.apache.httpcomponents.client5:httpclient5:5.3.1")
   testImplementation(platform("org.junit:junit-bom:5.11.0"))
   testImplementation("org.junit.jupiter:junit-jupiter")
-  testImplementation('org.apache.struts:struts2-junit-plugin:7.0.0-M8') {
+  testImplementation('org.apache.struts:struts2-junit-plugin:7.0.0-M9') {
     exclude group: 'org.apache.struts', module: 'struts2-core'
   }
 }
diff --git a/aws-serverless-struts-archetype/src/main/resources/archetype-resources/pom.xml b/aws-serverless-struts-archetype/src/main/resources/archetype-resources/pom.xml
@@ -15,7 +15,7 @@
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
-        <struts.version>7.0.0-M8</struts.version>
+        <struts.version>7.0.0-M9</struts.version>
         <jackson.version>2.17.2</jackson.version>
         <junit.version>5.11.0</junit.version>
         <log4j.version>2.24.0</log4j.version>
diff --git a/pom.xml b/pom.xml
@@ -206,7 +206,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>3.3.1</version>
+                    <version>3.5.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
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.12',
-          'org.springframework:spring-context:6.1.12',
+          'org.springframework:spring-webmvc:6.1.13',
+          'org.springframework:spring-context:6.1.13',
           'com.amazonaws.serverless:aws-serverless-java-container-spring:[2.0-SNAPSHOT,)',
           'org.apache.logging.log4j:log4j-core:2.24.0',
           'org.apache.logging.log4j:log4j-api:2.24.0',
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.12</spring.version>
+        <spring.version>6.1.13</spring.version>
         <log4j.version>2.24.0</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.3') {
+          implementation('org.springframework.boot:spring-boot-starter-web:3.3.4') {
             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.3</version>
+        <version>3.3.4</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.3</version>
+        <version>3.3.4</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.3</version>
+		<version>3.3.4</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.3') {
+          implementation('org.springframework.boot:spring-boot-starter-web:3.3.4') {
             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.3</version>
+        <version>3.3.4</version>
     </parent>
 
     <licenses>
diff --git a/samples/struts/pet-store/build.gradle b/samples/struts/pet-store/build.gradle
@@ -14,10 +14,10 @@ configurations {
 dependencies {
   implementation (
           'com.amazonaws.serverless:aws-serverless-java-container-struts:[2.0-SNAPSHOT,)',
-          'org.apache.struts:struts2-convention-plugin:7.0.0-M8',
-          'org.apache.struts:struts2-rest-plugin:7.0.0-M8',
-          'org.apache.struts:struts2-bean-validation-plugin:7.0.0-M8',
-          'org.apache.struts:struts2-junit-plugin:7.0.0-M8',
+          'org.apache.struts:struts2-convention-plugin:7.0.0-M9',
+          'org.apache.struts:struts2-rest-plugin:7.0.0-M9',
+          'org.apache.struts:struts2-bean-validation-plugin:7.0.0-M9',
+          'org.apache.struts:struts2-junit-plugin:7.0.0-M9',
           'com.jgeppert.struts2:struts2-aws-lambda-support-plugin:1.4.3',
           'org.hibernate.validator:hibernate-validator:6.1.7.Final',
           'org.glassfish:jakarta.el:5.0.0-M1',
diff --git a/samples/struts/pet-store/pom.xml b/samples/struts/pet-store/pom.xml
@@ -26,7 +26,7 @@
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
-        <struts.version>7.0.0-M8</struts.version>
+        <struts.version>7.0.0-M9</struts.version>
         <jackson.version>2.17.2</jackson.version>
         <junit.version>4.13.2</junit.version>
         <log4j.version>2.24.0</log4j.version>

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ repositories {`
`9`	`9`
`10`	`10`	`dependencies {`
`11`	`11`	`implementation (`
`12`		`- 'org.springframework.boot:spring-boot-starter-web:3.3.3',`
	`12`	`+ 'org.springframework.boot:spring-boot-starter-web:3.3.4',`
`13`	`13`	`'com.amazonaws.serverless:aws-serverless-java-container-springboot3:[2.0-SNAPSHOT,)',`
`14`	`14`	`)`
`15`	`15`
Original file line number	Diff line number	Diff line change
`@@ -18,19 +18,19 @@ dependencies {`
`18`	`18`	`exclude group: 'org.apache.logging.log4j', module: 'log4j-api'`
`19`	`19`	`exclude group: 'org.apache.logging.log4j', module: 'log4j-to-slf4j'`
`20`	`20`	`}`
`21`		`- implementation ('org.apache.struts:struts2-convention-plugin:7.0.0-M8') {`
	`21`	`+ implementation ('org.apache.struts:struts2-convention-plugin:7.0.0-M9') {`
`22`	`22`	`exclude group: 'org.apache.struts', module: 'struts2-core'`
`23`	`23`	`}`
`24`		`- implementation ('org.apache.struts:struts2-rest-plugin:7.0.0-M8') {`
	`24`	`+ implementation ('org.apache.struts:struts2-rest-plugin:7.0.0-M9') {`
`25`	`25`	`exclude group: 'org.apache.struts', module: 'struts2-core'`
`26`	`26`	`}`
`27`		`- implementation ('org.apache.struts:struts2-bean-validation-plugin:7.0.0-M8') {`
	`27`	`+ implementation ('org.apache.struts:struts2-bean-validation-plugin:7.0.0-M9') {`
`28`	`28`	`exclude group: 'org.apache.struts', module: 'struts2-core'`
`29`	`29`	`}`
`30`	`30`	`implementation ('com.jgeppert.struts2:struts2-aws-lambda-support-plugin:1.4.3') {`
`31`	`31`	`exclude group: 'org.apache.struts', module: 'struts2-core'`
`32`	`32`	`}`
`33`		`- implementation ('org.apache.struts:struts2-core:7.0.0-M8') {`
	`33`	`+ implementation ('org.apache.struts:struts2-core:7.0.0-M9') {`
`34`	`34`	`exclude group: 'org.apache.logging.log4j', module: 'log4j-api'`
`35`	`35`	`}`
`36`	`36`	`implementation ('org.hibernate.validator:hibernate-validator:6.1.7.Final')`
`@@ -45,7 +45,7 @@ dependencies {`
`45`	`45`	`testImplementation("org.apache.httpcomponents.client5:httpclient5:5.3.1")`
`46`	`46`	`testImplementation(platform("org.junit:junit-bom:5.11.0"))`
`47`	`47`	`testImplementation("org.junit.jupiter:junit-jupiter")`
`48`		`- testImplementation('org.apache.struts:struts2-junit-plugin:7.0.0-M8') {`
	`48`	`+ testImplementation('org.apache.struts:struts2-junit-plugin:7.0.0-M9') {`
`49`	`49`	`exclude group: 'org.apache.struts', module: 'struts2-core'`
`50`	`50`	`}`
`51`	`51`	`}`