From eae6ce8fa9b2d4f94cd6e1a5293ad721e8f7b45a Mon Sep 17 00:00:00 2001
From: Dennis Kieselhorst <mail@dekies.de>
Date: Mon, 5 Feb 2024 07:00:58 +0100
Subject: [PATCH] chore(deps): update Struts to 7.0.0-M2 for testing

---
 aws-serverless-java-container-struts/pom.xml         | 12 +-----------
 .../main/resources/archetype-resources/build.gradle  | 10 +++++-----
 .../src/main/resources/archetype-resources/pom.xml   |  2 +-
 samples/struts/pet-store/build.gradle                |  8 ++++----
 samples/struts/pet-store/pom.xml                     |  2 +-
 5 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/aws-serverless-java-container-struts/pom.xml b/aws-serverless-java-container-struts/pom.xml
index beed495f9..d04470e6d 100644
--- 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-M1</struts.version>
+        <struts.version>7.0.0-M2</struts.version>
     </properties>
 
     <dependencies>
@@ -38,16 +38,6 @@
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-core</artifactId>
             <version>${struts.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.commons</groupId>
-                    <artifactId>commons-fileupload2-jakarta</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>commons-io</groupId>
-                    <artifactId>commons-io</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.struts</groupId>
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
index 803913771..499ede045 100644
--- 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-M1') {
+  implementation ('org.apache.struts:struts2-convention-plugin:7.0.0-M2') {
     exclude group: 'org.apache.struts', module: 'struts2-core'
   }
-  implementation ('org.apache.struts:struts2-rest-plugin:7.0.0-M1') {
+  implementation ('org.apache.struts:struts2-rest-plugin:7.0.0-M2') {
     exclude group: 'org.apache.struts', module: 'struts2-core'
   }
-  implementation ('org.apache.struts:struts2-bean-validation-plugin:7.0.0-M1') {
+  implementation ('org.apache.struts:struts2-bean-validation-plugin:7.0.0-M2') {
     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:7.0.0-M1') {
+  implementation ('org.apache.struts:struts2-core:7.0.0-M2') {
     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.2.1")
   testImplementation(platform("org.junit:junit-bom:5.10.2"))
   testImplementation("org.junit.jupiter:junit-jupiter")
-  testImplementation('org.apache.struts:struts2-junit-plugin:7.0.0-M1') {
+  testImplementation('org.apache.struts:struts2-junit-plugin:7.0.0-M2') {
     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
index 91b764f03..64fe17396 100644
--- 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-M1</struts.version>
+        <struts.version>7.0.0-M2</struts.version>
         <jackson.version>2.16.1</jackson.version>
         <junit.version>5.10.2</junit.version>
         <log4j.version>2.22.1</log4j.version>
diff --git a/samples/struts/pet-store/build.gradle b/samples/struts/pet-store/build.gradle
index 11296662f..cca8f65e7 100644
--- 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-M1',
-          'org.apache.struts:struts2-rest-plugin:7.0.0-M1',
-          'org.apache.struts:struts2-bean-validation-plugin:7.0.0-M1',
-          'org.apache.struts:struts2-junit-plugin:7.0.0-M1',
+          'org.apache.struts:struts2-convention-plugin:7.0.0-M2',
+          'org.apache.struts:struts2-rest-plugin:7.0.0-M2',
+          'org.apache.struts:struts2-bean-validation-plugin:7.0.0-M2',
+          'org.apache.struts:struts2-junit-plugin:7.0.0-M2',
           'com.jgeppert.struts2:struts2-aws-lambda-support-plugin:1.4.2',
           '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
index c9fc14f92..b23a44802 100644
--- 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-M1</struts.version>
+        <struts.version>7.0.0-M2</struts.version>
         <jackson.version>2.16.1</jackson.version>
         <junit.version>4.13.2</junit.version>
         <log4j.version>2.22.1</log4j.version>