From 24311a3b8bbac38683c645ea83afb15807328f0a Mon Sep 17 00:00:00 2001
From: Johannes Geppert <jogep@apache.org>
Date: Wed, 23 Jan 2019 16:21:48 +0100
Subject: [PATCH 1/2] Use latest available Apache Struts2 GA release

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

diff --git a/aws-serverless-java-container-struts2/pom.xml b/aws-serverless-java-container-struts2/pom.xml
index 4419d3527..e0dce7e0d 100644
--- a/aws-serverless-java-container-struts2/pom.xml
+++ b/aws-serverless-java-container-struts2/pom.xml
@@ -15,7 +15,7 @@
     </parent>
 
     <properties>
-        <struts2.version>2.5.18</struts2.version>
+        <struts2.version>2.5.20</struts2.version>
         <jackson.version>2.9.8</jackson.version>
     </properties>
 
diff --git a/aws-serverless-struts2-archetype/src/main/resources/archetype-resources/pom.xml b/aws-serverless-struts2-archetype/src/main/resources/archetype-resources/pom.xml
index 813a10473..7fbc52931 100644
--- a/aws-serverless-struts2-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/aws-serverless-struts2-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>
-        <struts2.version>2.5.17</struts2.version>
+        <struts2.version>2.5.20</struts2.version>
         <jackson.version>2.9.8</jackson.version>
         <junit.version>4.12</junit.version>
         <log4j.version>2.8.2</log4j.version>
@@ -63,7 +63,7 @@
         <dependency>
             <groupId>com.jgeppert.struts2</groupId>
             <artifactId>struts2-aws-lambda-support-plugin</artifactId>
-            <version>1.0.0</version>
+            <version>1.1.0</version>
         </dependency>
 
         <!-- bean validation based on hibernate validators-->
diff --git a/samples/struts/pet-store/build.gradle b/samples/struts/pet-store/build.gradle
index 99e718ba7..829ca79bb 100644
--- a/samples/struts/pet-store/build.gradle
+++ b/samples/struts/pet-store/build.gradle
@@ -8,11 +8,11 @@ repositories {
 dependencies {
   compile (
           'com.amazonaws.serverless:aws-serverless-java-container-struts2:[1.0,)',
-          'org.apache.struts:struts2-convention-plugin:2.5.17',
-          'org.apache.struts:struts2-rest-plugin:2.5.17',
-          'org.apache.struts:struts2-bean-validation-plugin:2.5.17',
-          'org.apache.struts:struts2-junit-plugin:2.5.17',
-          'com.jgeppert.struts2:struts2-aws-lambda-support-plugin:1.0.0',
+          'org.apache.struts:struts2-convention-plugin:2.5.20',
+          'org.apache.struts:struts2-rest-plugin:2.5.20',
+          'org.apache.struts:struts2-bean-validation-plugin:2.5.20',
+          'org.apache.struts:struts2-junit-plugin:2.5.20',
+          'com.jgeppert.struts2:struts2-aws-lambda-support-plugin:1.1.0',
           'org.hibernate:hibernate-validator:4.3.2.Final',
           'com.fasterxml.jackson.core:jackson-databind:2.9.8',
           'org.apache.logging.log4j:log4j-core:2.8.2',
diff --git a/samples/struts/pet-store/pom.xml b/samples/struts/pet-store/pom.xml
index 582c2a6b2..761266596 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>
-        <struts2.version>2.5.17</struts2.version>
+        <struts2.version>2.5.20</struts2.version>
         <jackson.version>2.9.8</jackson.version>
         <junit.version>4.12</junit.version>
         <log4j.version>2.8.2</log4j.version>
@@ -74,7 +74,7 @@
         <dependency>
             <groupId>com.jgeppert.struts2</groupId>
             <artifactId>struts2-aws-lambda-support-plugin</artifactId>
-            <version>1.0.0</version>
+            <version>1.1.0</version>
         </dependency>
 
         <!-- bean validation based on hibernate validators-->

From 6ade6280af839babb12b2c289f308e10596f19dd Mon Sep 17 00:00:00 2001
From: Johannes Geppert <jogep@apache.org>
Date: Fri, 8 Feb 2019 15:35:02 +0100
Subject: [PATCH 2/2] Solve dependency issue with log4j2 and commons fileupload
 versions

https://github.com/awslabs/aws-serverless-java-container/pull/233
---
 aws-serverless-java-container-core/pom.xml                      | 2 +-
 aws-serverless-java-container-struts2/pom.xml                   | 2 +-
 .../src/main/resources/archetype-resources/pom.xml              | 2 +-
 samples/struts/pet-store/pom.xml                                | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/aws-serverless-java-container-core/pom.xml b/aws-serverless-java-container-core/pom.xml
index bff7e6745..02a535a35 100644
--- a/aws-serverless-java-container-core/pom.xml
+++ b/aws-serverless-java-container-core/pom.xml
@@ -62,7 +62,7 @@
         <dependency>
             <groupId>commons-fileupload</groupId>
             <artifactId>commons-fileupload</artifactId>
-            <version>1.3.3</version>
+            <version>1.4</version>
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpmime -->
diff --git a/aws-serverless-java-container-struts2/pom.xml b/aws-serverless-java-container-struts2/pom.xml
index e0dce7e0d..49942915c 100644
--- a/aws-serverless-java-container-struts2/pom.xml
+++ b/aws-serverless-java-container-struts2/pom.xml
@@ -70,7 +70,7 @@
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-to-slf4j</artifactId>
-            <version>2.10.0</version>
+            <version>2.11.1</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.slf4j</groupId>
diff --git a/aws-serverless-struts2-archetype/src/main/resources/archetype-resources/pom.xml b/aws-serverless-struts2-archetype/src/main/resources/archetype-resources/pom.xml
index 7fbc52931..a1ca2962f 100644
--- a/aws-serverless-struts2-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/aws-serverless-struts2-archetype/src/main/resources/archetype-resources/pom.xml
@@ -18,7 +18,7 @@
         <struts2.version>2.5.20</struts2.version>
         <jackson.version>2.9.8</jackson.version>
         <junit.version>4.12</junit.version>
-        <log4j.version>2.8.2</log4j.version>
+        <log4j.version>2.11.1</log4j.version>
     </properties>
 
     <dependencies>
diff --git a/samples/struts/pet-store/pom.xml b/samples/struts/pet-store/pom.xml
index 761266596..b104bd716 100644
--- a/samples/struts/pet-store/pom.xml
+++ b/samples/struts/pet-store/pom.xml
@@ -29,7 +29,7 @@
         <struts2.version>2.5.20</struts2.version>
         <jackson.version>2.9.8</jackson.version>
         <junit.version>4.12</junit.version>
-        <log4j.version>2.8.2</log4j.version>
+        <log4j.version>2.11.1</log4j.version>
     </properties>
 
     <dependencies>