Skip to content

Commit d48e377

Browse files
dekideki
authored
Merge pull request #417 from awslabs/dev
Upgrade to latest available Struts GA version 2.5.26
2 parents bd8b907 + a70de22 commit d48e377

File tree

10 files changed

+52
-61
lines changed

10 files changed

+52
-61
lines changed

‎aws-serverless-java-container-struts2/pom.xml

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
</parent>
1616

1717
<properties>
18-
<struts2.version>2.5.22</struts2.version>
18+
<struts2.version>2.5.26</struts2.version>
1919
</properties>
2020

2121
<dependencies>
@@ -66,18 +66,6 @@
6666
<version>${jackson.version}</version>
6767
</dependency>
6868

69-
<dependency>
70-
<groupId>org.apache.logging.log4j</groupId>
71-
<artifactId>log4j-to-slf4j</artifactId>
72-
<version>2.11.1</version>
73-
<exclusions>
74-
<exclusion>
75-
<groupId>org.slf4j</groupId>
76-
<artifactId>slf4j-api</artifactId>
77-
</exclusion>
78-
</exclusions>
79-
</dependency>
80-
8169
<dependency>
8270
<groupId>javax.el</groupId>
8371
<artifactId>javax.el-api</artifactId>

‎aws-serverless-java-container-struts2/src/main/java/com/amazonaws/serverless/proxy/struts2/Struts2LambdaHandler.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616
import com.amazonaws.serverless.proxy.model.AwsProxyResponse;
1717
import com.amazonaws.services.lambda.runtime.Context;
1818
import com.amazonaws.services.lambda.runtime.RequestStreamHandler;
19-
import org.slf4j.Logger;
20-
import org.slf4j.LoggerFactory;
2119

2220
import java.io.IOException;
2321
import java.io.InputStream;
@@ -32,8 +30,6 @@
3230
*/
3331
public class Struts2LambdaHandler implements RequestStreamHandler {
3432

35-
private static final Logger log = LoggerFactory.getLogger(Struts2LambdaHandler.class);
36-
3733
private final Struts2LambdaContainerHandler<AwsProxyRequest, AwsProxyResponse> handler = Struts2LambdaContainerHandler
3834
.getAwsProxyHandler();
3935

‎aws-serverless-spring-archetype/src/main/resources/archetype-resources/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ dependencies {
1010
'org.springframework:spring-webmvc:5.2.16.RELEASE',
1111
'org.springframework:spring-context:5.2.16.RELEASE',
1212
'com.amazonaws.serverless:aws-serverless-java-container-spring:[1.0,)',
13-
'org.apache.logging.log4j:log4j-core:2.8.2',
14-
'org.apache.logging.log4j:log4j-api:2.8.2',
15-
'org.apache.logging.log4j:log4j-slf4j-impl:2.8.2',
13+
'org.apache.logging.log4j:log4j-core:2.14.1',
14+
'org.apache.logging.log4j:log4j-api:2.14.1',
15+
'org.apache.logging.log4j:log4j-slf4j-impl:2.14.1',
1616
'com.fasterxml.jackson.core:jackson-databind:2.12.0',
1717
'com.amazonaws:aws-lambda-java-log4j2:1.1.0',
1818
)

‎aws-serverless-spring-archetype/src/main/resources/archetype-resources/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<maven.compiler.target>1.8</maven.compiler.target>
1919
<spring.version>5.2.16.RELEASE</spring.version>
2020
<junit.version>4.12</junit.version>
21-
<log4j.version>2.8.2</log4j.version>
21+
<log4j.version>2.14.1</log4j.version>
2222
</properties>
2323

2424
<dependencies>
@@ -74,7 +74,7 @@
7474
<dependency>
7575
<groupId>com.amazonaws</groupId>
7676
<artifactId>aws-lambda-java-log4j2</artifactId>
77-
<version>1.1.0</version>
77+
<version>1.2.0</version>
7878
</dependency>
7979

8080
<dependency>

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

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,36 +5,43 @@ repositories {
55
mavenCentral()
66
}
77

8+
configurations {
9+
implementation {
10+
exclude group: 'org.apache.logging.log4j', module: 'log4j-to-slf4j'
11+
}
12+
}
13+
814
dependencies {
915

1016
implementation ('com.amazonaws.serverless:aws-serverless-java-container-struts2:[1.0,)') {
1117
exclude group: 'org.apache.struts', module: 'struts2-core'
1218
exclude group: 'org.apache.logging.log4j', module: 'log4j-api'
19+
exclude group: 'org.apache.logging.log4j', module: 'log4j-to-slf4j'
1320
}
14-
implementation ('org.apache.struts:struts2-convention-plugin:2.5.22') {
21+
implementation ('org.apache.struts:struts2-convention-plugin:2.5.26') {
1522
exclude group: 'org.apache.struts', module: 'struts2-core'
1623
}
17-
implementation ('org.apache.struts:struts2-rest-plugin:2.5.22') {
24+
implementation ('org.apache.struts:struts2-rest-plugin:2.5.26') {
1825
exclude group: 'org.apache.struts', module: 'struts2-core'
1926
}
20-
implementation ('org.apache.struts:struts2-bean-validation-plugin:2.5.22') {
27+
implementation ('org.apache.struts:struts2-bean-validation-plugin:2.5.26') {
2128
exclude group: 'org.apache.struts', module: 'struts2-core'
2229
}
23-
implementation ('com.jgeppert.struts2:struts2-aws-lambda-support-plugin:1.0.0') {
30+
implementation ('com.jgeppert.struts2:struts2-aws-lambda-support-plugin:1.3.0') {
2431
exclude group: 'org.apache.struts', module: 'struts2-core'
2532
}
26-
implementation ('org.apache.struts:struts2-core:2.5.22') {
33+
implementation ('org.apache.struts:struts2-core:2.5.26') {
2734
exclude group: 'org.apache.logging.log4j', module: 'log4j-api'
2835
}
29-
implementation ('org.hibernate:hibernate-validator:4.3.2.Final')
36+
implementation ('org.hibernate:hibernate-validator:5.3.6.Final')
3037
implementation ('com.fasterxml.jackson.core:jackson-databind:2.12.0')
31-
implementation ('org.apache.logging.log4j:log4j-core:2.8.2')
32-
implementation ('org.apache.logging.log4j:log4j-api:2.8.2')
33-
implementation ('org.apache.logging.log4j:log4j-slf4j-impl:2.8.2')
34-
implementation ('com.amazonaws:aws-lambda-java-log4j2:1.1.0')
38+
implementation ('org.apache.logging.log4j:log4j-core:2.14.1')
39+
implementation ('org.apache.logging.log4j:log4j-api:2.14.1')
40+
implementation ('org.apache.logging.log4j:log4j-slf4j-impl:2.14.1')
41+
implementation ('com.amazonaws:aws-lambda-java-log4j2:1.2.0')
3542

3643
testImplementation('junit:junit:4.12')
37-
testImplementation('org.apache.struts:struts2-junit-plugin:2.5.22') {
44+
testImplementation('org.apache.struts:struts2-junit-plugin:2.5.26') {
3845
exclude group: 'org.apache.struts', module: 'struts2-core'
3946
}
4047
}

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
<properties>
1616
<maven.compiler.source>1.8</maven.compiler.source>
1717
<maven.compiler.target>1.8</maven.compiler.target>
18-
<struts2.version>2.5.22</struts2.version>
18+
<struts2.version>2.5.26</struts2.version>
1919
<jackson.version>2.12.0</jackson.version>
20-
<junit.version>4.12</junit.version>
21-
<log4j.version>2.8.2</log4j.version>
20+
<junit.version>4.13.1</junit.version>
21+
<log4j.version>2.14.1</log4j.version>
2222
</properties>
2323

2424
<dependencies>
@@ -31,7 +31,7 @@
3131
<dependency>
3232
<groupId>com.amazonaws</groupId>
3333
<artifactId>aws-lambda-java-core</artifactId>
34-
<version>1.2.0</version>
34+
<version>1.2.1</version>
3535
</dependency>
3636

3737
<dependency>
@@ -63,14 +63,14 @@
6363
<dependency>
6464
<groupId>com.jgeppert.struts2</groupId>
6565
<artifactId>struts2-aws-lambda-support-plugin</artifactId>
66-
<version>1.1.0</version>
66+
<version>1.3.0</version>
6767
</dependency>
6868

6969
<!-- bean validation based on hibernate validators-->
7070
<dependency>
7171
<groupId>org.hibernate</groupId>
7272
<artifactId>hibernate-validator</artifactId>
73-
<version>4.3.2.Final</version>
73+
<version>5.3.6.Final</version>
7474
</dependency>
7575

7676
<dependency>
@@ -110,7 +110,7 @@
110110
<dependency>
111111
<groupId>com.amazonaws</groupId>
112112
<artifactId>aws-lambda-java-log4j2</artifactId>
113-
<version>1.1.0</version>
113+
<version>1.2.0</version>
114114
</dependency>
115115

116116
<dependency>

‎samples/spring/pet-store/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ dependencies {
1010
'org.springframework:spring-webmvc:5.2.9.RELEASE',
1111
'org.springframework:spring-context:5.2.9.RELEASE',
1212
'com.amazonaws.serverless:aws-serverless-java-container-spring:[1.0,)',
13-
'org.apache.logging.log4j:log4j-core:2.8.2',
14-
'org.apache.logging.log4j:log4j-api:2.8.2',
15-
'org.apache.logging.log4j:log4j-slf4j-impl:2.8.2',
13+
'org.apache.logging.log4j:log4j-core:2.14.1',
14+
'org.apache.logging.log4j:log4j-api:2.14.1',
15+
'org.apache.logging.log4j:log4j-slf4j-impl:2.14.1',
1616
'com.fasterxml.jackson.core:jackson-databind:2.12.0',
17-
'com.amazonaws:aws-lambda-java-log4j2:1.1.0',
17+
'com.amazonaws:aws-lambda-java-log4j2:1.2.0',
1818
)
1919
}
2020

‎samples/spring/pet-store/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<maven.compiler.target>1.8</maven.compiler.target>
2929
<spring.version>5.2.16.RELEASE</spring.version>
3030
<junit.version>4.13.1</junit.version>
31-
<log4j.version>2.13.3</log4j.version>
31+
<log4j.version>2.14.1</log4j.version>
3232
</properties>
3333

3434
<dependencies>
@@ -90,7 +90,7 @@
9090
<dependency>
9191
<groupId>com.amazonaws</groupId>
9292
<artifactId>aws-lambda-java-log4j2</artifactId>
93-
<version>1.1.0</version>
93+
<version>1.2.0</version>
9494
</dependency>
9595

9696
<dependency>

‎samples/struts2/pet-store/build.gradle

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,17 @@ repositories {
88
dependencies {
99
implementation (
1010
'com.amazonaws.serverless:aws-serverless-java-container-struts2:[1.0,)',
11-
'org.apache.struts:struts2-convention-plugin:2.5.22',
12-
'org.apache.struts:struts2-rest-plugin:2.5.22',
13-
'org.apache.struts:struts2-bean-validation-plugin:2.5.22',
14-
'org.apache.struts:struts2-junit-plugin:2.5.22',
15-
'com.jgeppert.struts2:struts2-aws-lambda-support-plugin:1.1.0',
16-
'org.hibernate:hibernate-validator:4.3.2.Final',
11+
'org.apache.struts:struts2-convention-plugin:2.5.26',
12+
'org.apache.struts:struts2-rest-plugin:2.5.26',
13+
'org.apache.struts:struts2-bean-validation-plugin:2.5.26',
14+
'org.apache.struts:struts2-junit-plugin:2.5.26',
15+
'com.jgeppert.struts2:struts2-aws-lambda-support-plugin:1.2.0',
16+
'org.hibernate:hibernate-validator:5.3.6.Final',
1717
'com.fasterxml.jackson.core:jackson-databind:2.12.0',
18-
'org.apache.logging.log4j:log4j-core:2.8.2',
19-
'org.apache.logging.log4j:log4j-api:2.8.2',
20-
'org.apache.logging.log4j:log4j-slf4j-impl:2.8.2',
21-
'com.amazonaws:aws-lambda-java-log4j2:1.1.0',
18+
'org.apache.logging.log4j:log4j-core:2.14.1',
19+
'org.apache.logging.log4j:log4j-api:2.14.1',
20+
'org.apache.logging.log4j:log4j-slf4j-impl:2.14.1',
21+
'com.amazonaws:aws-lambda-java-log4j2:1.2.0',
2222
)
2323
}
2424

‎samples/struts2/pet-store/pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@
2626
<properties>
2727
<maven.compiler.source>1.8</maven.compiler.source>
2828
<maven.compiler.target>1.8</maven.compiler.target>
29-
<struts2.version>2.5.22</struts2.version>
29+
<struts2.version>2.5.26</struts2.version>
3030
<jackson.version>2.12.0</jackson.version>
3131
<junit.version>4.13.1</junit.version>
32-
<log4j.version>2.13.3</log4j.version>
32+
<log4j.version>2.14.1</log4j.version>
3333
</properties>
3434

3535
<dependencies>
@@ -42,7 +42,7 @@
4242
<dependency>
4343
<groupId>com.amazonaws</groupId>
4444
<artifactId>aws-lambda-java-core</artifactId>
45-
<version>1.2.0</version>
45+
<version>1.2.1</version>
4646
</dependency>
4747

4848
<dependency>
@@ -74,7 +74,7 @@
7474
<dependency>
7575
<groupId>com.jgeppert.struts2</groupId>
7676
<artifactId>struts2-aws-lambda-support-plugin</artifactId>
77-
<version>1.1.0</version>
77+
<version>1.3.0</version>
7878
</dependency>
7979

8080
<!-- bean validation based on hibernate validators-->
@@ -121,7 +121,7 @@
121121
<dependency>
122122
<groupId>com.amazonaws</groupId>
123123
<artifactId>aws-lambda-java-log4j2</artifactId>
124-
<version>1.1.0</version>
124+
<version>1.2.0</version>
125125
</dependency>
126126

127127
<dependency>

0 commit comments

Comments
 (0)