chore(deps): Update Struts dependency to 6.1.1

Author: deki

aws-serverless-java-container-struts/pom.xml

@@ -15,7 +15,7 @@
     </parent>
 
     <properties>
-        <struts.version>6.0.3</struts.version>
+        <struts.version>6.1.1</struts.version>
     </properties>
 
     <dependencies>
@@ -74,7 +74,7 @@
         <dependency>
             <groupId>javax.el</groupId>
             <artifactId>javax.el-api</artifactId>
-            <version>2.2.5</version>
+            <version>3.0.0</version>
             <scope>test</scope>
         </dependency>
 
@@ -86,9 +86,9 @@
         </dependency>
 
         <dependency>
-            <groupId>org.glassfish.web</groupId>
+            <groupId>org.glassfish</groupId>
             <artifactId>javax.el</artifactId>
-            <version>2.2.6</version>
+            <version>3.0.0</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -105,6 +105,11 @@
                 <artifactId>commons-text</artifactId>
                 <version>1.10.0</version>
             </dependency>
+            <dependency><!-- [CVE-2021-37533] transitive dep via Struts -->
+                <groupId>commons-net</groupId>
+                <artifactId>commons-net</artifactId>
+                <version>3.9.0</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

aws-serverless-java-container-struts/src/test/java/com/amazonaws/serverless/proxy/struts/StrutsAwsProxyTest.java

@@ -24,7 +24,7 @@
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.commons.codec.binary.Base64;
-import org.apache.struts2.StrutsRestTestCase;
+import org.apache.struts2.junit.StrutsRestTestCase;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 

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:6.0.3') {
+  implementation ('org.apache.struts:struts2-convention-plugin:6.1.1') {
     exclude group: 'org.apache.struts', module: 'struts2-core'
   }
-  implementation ('org.apache.struts:struts2-rest-plugin:6.0.3') {
+  implementation ('org.apache.struts:struts2-rest-plugin:6.1.1') {
     exclude group: 'org.apache.struts', module: 'struts2-core'
   }
-  implementation ('org.apache.struts:struts2-bean-validation-plugin:6.0.3') {
+  implementation ('org.apache.struts:struts2-bean-validation-plugin:6.1.1') {
     exclude group: 'org.apache.struts', module: 'struts2-core'
   }
   implementation ('com.jgeppert.struts2:struts2-aws-lambda-support-plugin:1.4.2') {
     exclude group: 'org.apache.struts', module: 'struts2-core'
   }
-  implementation ('org.apache.struts:struts2-core:6.0.3') {
+  implementation ('org.apache.struts:struts2-core:6.1.1') {
     exclude group: 'org.apache.logging.log4j', module: 'log4j-api'
   }
   implementation ('org.hibernate.validator:hibernate-validator:6.1.7.Final')
@@ -42,7 +42,7 @@ dependencies {
   implementation ('com.amazonaws:aws-lambda-java-log4j2:1.5.1')
 
   testImplementation('junit:junit:4.13.2')
-  testImplementation('org.apache.struts:struts2-junit-plugin:6.0.3') {
+  testImplementation('org.apache.struts:struts2-junit-plugin:6.1.1') {
     exclude group: 'org.apache.struts', module: 'struts2-core'
   }
 }

aws-serverless-struts-archetype/src/main/resources/archetype-resources/pom.xml

@@ -15,19 +15,12 @@
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
-        <struts.version>6.0.3</struts.version>
+        <struts.version>6.1.1</struts.version>
         <jackson.version>2.14.0</jackson.version>
         <junit.version>4.13.2</junit.version>
         <log4j.version>2.19.0</log4j.version>
     </properties>
 
-    <repositories>
-        <repository>
-            <id>struts-staging</id>
-            <url>https://repository.apache.org/content/repositories/staging/</url>
-        </repository>
-    </repositories>
-
     <dependencies>
         <dependency>
             <groupId>com.amazonaws.serverless</groupId>
@@ -122,13 +115,13 @@
         <dependency>
             <groupId>javax.el</groupId>
             <artifactId>javax.el-api</artifactId>
-            <version>2.2.5</version>
+            <version>3.0.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.glassfish.web</groupId>
+            <groupId>org.glassfish</groupId>
             <artifactId>javax.el</artifactId>
-            <version>2.2.6</version>
+            <version>3.0.0</version>
             <scope>test</scope>
         </dependency>
 

samples/struts/pet-store/build.gradle

@@ -14,10 +14,10 @@ configurations {
 dependencies {
   implementation (
           'com.amazonaws.serverless:aws-serverless-java-container-struts:[1.9,)',
-          'org.apache.struts:struts2-convention-plugin:6.0.3',
-          'org.apache.struts:struts2-rest-plugin:6.0.3',
-          'org.apache.struts:struts2-bean-validation-plugin:6.0.3',
-          'org.apache.struts:struts2-junit-plugin:6.0.3',
+          'org.apache.struts:struts2-convention-plugin:6.1.1',
+          'org.apache.struts:struts2-rest-plugin:6.1.1',
+          'org.apache.struts:struts2-bean-validation-plugin:6.1.1',
+          'org.apache.struts:struts2-junit-plugin:6.1.1',
           'com.jgeppert.struts2:struts2-aws-lambda-support-plugin:1.4.2',
           'org.hibernate.validator:hibernate-validator:6.1.7.Final',
           'org.glassfish:javax.el:3.0.0',

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>6.0.3</struts.version>
+        <struts.version>6.1.1</struts.version>
         <jackson.version>2.14.0</jackson.version>
         <junit.version>4.13.2</junit.version>
         <log4j.version>2.19.0</log4j.version>