Fix for issue #355 (#356)

Co-authored-by: Antonio Ribeiro <[email protected]>

Author: antjori

aws-serverless-struts2-archetype/src/main/resources/archetype-resources/build.gradle

@@ -6,22 +6,37 @@ repositories {
 }
 
 dependencies {
-  compile (
-          'com.amazonaws.serverless:aws-serverless-java-container-struts2:[1.0,)',
-          'org.apache.struts:struts2-convention-plugin:2.5.22',
-          'org.apache.struts:struts2-rest-plugin:2.5.22',
-          'org.apache.struts:struts2-bean-validation-plugin:2.5.22',
-          'org.apache.struts:struts2-junit-plugin:2.5.22',
-          'com.jgeppert.struts2:struts2-aws-lambda-support-plugin:1.0.0',
-          'org.hibernate:hibernate-validator:4.3.2.Final',
-          'com.fasterxml.jackson.core:jackson-databind:2.10.3',
-          'org.apache.logging.log4j:log4j-core:2.8.2',
-          'org.apache.logging.log4j:log4j-api:2.8.2',
-          'org.apache.logging.log4j:log4j-slf4j-impl:2.8.2',
-          'com.amazonaws:aws-lambda-java-log4j2:1.1.0',
-  )
 
-  testCompile("junit:junit:4.12")
+  compile ('com.amazonaws.serverless:aws-serverless-java-container-struts2:[1.0,)') {
+    exclude group: 'org.apache.struts', module: 'struts2-core'
+    exclude group: 'org.apache.logging.log4j', module: 'log4j-api'
+  }
+  compile ('org.apache.struts:struts2-convention-plugin:2.5.22') {
+    exclude group: 'org.apache.struts', module: 'struts2-core'
+  }
+  compile ('org.apache.struts:struts2-rest-plugin:2.5.22') {
+    exclude group: 'org.apache.struts', module: 'struts2-core'
+  }
+  compile ('org.apache.struts:struts2-bean-validation-plugin:2.5.22') {
+    exclude group: 'org.apache.struts', module: 'struts2-core'
+  }
+  compile ('com.jgeppert.struts2:struts2-aws-lambda-support-plugin:1.0.0') {
+    exclude group: 'org.apache.struts', module: 'struts2-core'
+  }
+  compile ('org.apache.struts:struts2-core:2.5.22') {
+    exclude group: 'org.apache.logging.log4j', module: 'log4j-api'
+  }
+  compile ('org.hibernate:hibernate-validator:4.3.2.Final')
+  compile ('com.fasterxml.jackson.core:jackson-databind:2.10.3')
+  compile ('org.apache.logging.log4j:log4j-core:2.8.2')
+  compile ('org.apache.logging.log4j:log4j-api:2.8.2')
+  compile ('org.apache.logging.log4j:log4j-slf4j-impl:2.8.2')
+  compile ('com.amazonaws:aws-lambda-java-log4j2:1.1.0')
+
+  testCompile('junit:junit:4.12')
+  testCompile('org.apache.struts:struts2-junit-plugin:2.5.22') {
+    exclude group: 'org.apache.struts', module: 'struts2-core'
+  }
 }
 
 task buildZip(type: Zip) {

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

@@ -18,7 +18,7 @@
         <struts2.version>2.5.22</struts2.version>
         <jackson.version>2.10.3</jackson.version>
         <junit.version>4.12</junit.version>
-        <log4j.version>2.11.1</log4j.version>
+        <log4j.version>2.8.2</log4j.version>
     </properties>
 
     <dependencies>

pom.xml

@@ -85,7 +85,7 @@
         <jacoco.minCoverage>0.7</jacoco.minCoverage>
         <dependencyCheck.version>5.3.2</dependencyCheck.version>
         <jackson.version>2.10.3</jackson.version>
-        <slf4j.version>1.8.0-beta4</slf4j.version>
+        <slf4j.version>1.7.30</slf4j.version>
     </properties>
 
     <dependencies>