Skip to content

Commit 3bbeed7

Browse files
dekideki
committed
chore(deps): update Struts to 7.0.0-M1 for testing
1 parent fd96f7f commit 3bbeed7

File tree

5 files changed

+72
-42
lines changed

5 files changed

+72
-42
lines changed

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

Lines changed: 31 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
</parent>
1616

1717
<properties>
18-
<struts.version>6.3.0.2</struts.version>
18+
<struts.version>7.0.0-M1</struts.version>
1919
</properties>
2020

2121
<dependencies>
@@ -25,12 +25,24 @@
2525
<artifactId>aws-serverless-java-container-core</artifactId>
2626
<version>2.0.0-SNAPSHOT</version>
2727
</dependency>
28+
<dependency>
29+
<groupId>com.amazonaws.serverless</groupId>
30+
<artifactId>aws-serverless-java-container-core</artifactId>
31+
<version>2.0.0-SNAPSHOT</version>
32+
<classifier>tests</classifier>
33+
<type>test-jar</type>
34+
<scope>test</scope>
35+
</dependency>
2836

2937
<dependency>
3038
<groupId>org.apache.struts</groupId>
3139
<artifactId>struts2-core</artifactId>
3240
<version>${struts.version}</version>
3341
<exclusions>
42+
<exclusion>
43+
<groupId>org.apache.commons</groupId>
44+
<artifactId>commons-fileupload2-jakarta</artifactId>
45+
</exclusion>
3446
<exclusion>
3547
<groupId>commons-io</groupId>
3648
<artifactId>commons-io</artifactId>
@@ -71,38 +83,33 @@
7183
</dependency>
7284

7385
<dependency>
74-
<groupId>javax.el</groupId>
75-
<artifactId>javax.el-api</artifactId>
76-
<version>3.0.0</version>
86+
<groupId>jakarta.el</groupId>
87+
<artifactId>jakarta.el-api</artifactId>
88+
<version>5.0.1</version>
7789
<scope>test</scope>
7890
</dependency>
7991

8092
<dependency>
81-
<groupId>javax.servlet</groupId>
82-
<artifactId>jsp-api</artifactId>
83-
<version>2.0</version>
93+
<groupId>jakarta.servlet.jsp</groupId>
94+
<artifactId>jakarta.servlet.jsp-api</artifactId>
95+
<version>3.1.0</version>
8496
<scope>test</scope>
8597
</dependency>
8698

8799
<dependency>
88100
<groupId>org.glassfish</groupId>
89-
<artifactId>javax.el</artifactId>
90-
<version>3.0.0</version>
101+
<artifactId>jakarta.el</artifactId>
102+
<version>5.0.0-M1</version>
91103
<scope>test</scope>
92104
</dependency>
93105
</dependencies>
94106

95107
<dependencyManagement>
96108
<dependencies>
97-
<dependency><!-- [CVE-2022-42889] transitive dep via Struts -->
109+
<dependency>
98110
<groupId>org.apache.commons</groupId>
99111
<artifactId>commons-text</artifactId>
100-
<version>1.10.0</version>
101-
</dependency>
102-
<dependency><!-- [CVE-2021-37533] transitive dep via Struts -->
103-
<groupId>commons-net</groupId>
104-
<artifactId>commons-net</artifactId>
105-
<version>3.9.0</version>
112+
<version>1.11.0</version>
106113
</dependency>
107114
</dependencies>
108115
</dependencyManagement>
@@ -198,4 +205,12 @@
198205
</plugin>
199206
</plugins>
200207
</build>
208+
209+
<repositories>
210+
<repository>
211+
<id>apache-pre-release</id>
212+
<url>https://repository.apache.org/content/repositories/staging/</url>
213+
<layout>default</layout>
214+
</repository>
215+
</repositories>
201216
</project>

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,19 @@ dependencies {
1818
exclude group: 'org.apache.logging.log4j', module: 'log4j-api'
1919
exclude group: 'org.apache.logging.log4j', module: 'log4j-to-slf4j'
2020
}
21-
implementation ('org.apache.struts:struts2-convention-plugin:6.1.3.1') {
21+
implementation ('org.apache.struts:struts2-convention-plugin:7.0.0-M1') {
2222
exclude group: 'org.apache.struts', module: 'struts2-core'
2323
}
24-
implementation ('org.apache.struts:struts2-rest-plugin:6.1.3.1') {
24+
implementation ('org.apache.struts:struts2-rest-plugin:7.0.0-M1') {
2525
exclude group: 'org.apache.struts', module: 'struts2-core'
2626
}
27-
implementation ('org.apache.struts:struts2-bean-validation-plugin:6.1.3.1') {
27+
implementation ('org.apache.struts:struts2-bean-validation-plugin:7.0.0-M1') {
2828
exclude group: 'org.apache.struts', module: 'struts2-core'
2929
}
3030
implementation ('com.jgeppert.struts2:struts2-aws-lambda-support-plugin:1.4.2') {
3131
exclude group: 'org.apache.struts', module: 'struts2-core'
3232
}
33-
implementation ('org.apache.struts:struts2-core:6.1.3.1') {
33+
implementation ('org.apache.struts:struts2-core:7.0.0-M1') {
3434
exclude group: 'org.apache.logging.log4j', module: 'log4j-api'
3535
}
3636
implementation ('org.hibernate.validator:hibernate-validator:6.1.7.Final')
@@ -45,7 +45,7 @@ dependencies {
4545
testImplementation("org.apache.httpcomponents.client5:httpclient5:5.2.1")
4646
testImplementation(platform("org.junit:junit-bom:5.10.1"))
4747
testImplementation("org.junit.jupiter:junit-jupiter")
48-
testImplementation('org.apache.struts:struts2-junit-plugin:6.1.3.1') {
48+
testImplementation('org.apache.struts:struts2-junit-plugin:7.0.0-M1') {
4949
exclude group: 'org.apache.struts', module: 'struts2-core'
5050
}
5151
}

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

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<properties>
1616
<maven.compiler.source>1.8</maven.compiler.source>
1717
<maven.compiler.target>1.8</maven.compiler.target>
18-
<struts.version>6.1.3.1</struts.version>
18+
<struts.version>7.0.0-M1</struts.version>
1919
<jackson.version>2.16.1</jackson.version>
2020
<junit.version>5.10.1</junit.version>
2121
<log4j.version>2.22.1</log4j.version>
@@ -121,15 +121,15 @@
121121
</dependency>
122122

123123
<dependency>
124-
<groupId>javax.el</groupId>
125-
<artifactId>javax.el-api</artifactId>
126-
<version>3.0.0</version>
124+
<groupId>jakarta.el</groupId>
125+
<artifactId>jakarta.el-api</artifactId>
126+
<version>5.0.1</version>
127127
<scope>test</scope>
128128
</dependency>
129129
<dependency>
130130
<groupId>org.glassfish</groupId>
131-
<artifactId>javax.el</artifactId>
132-
<version>3.0.0</version>
131+
<artifactId>jakarta.el</artifactId>
132+
<version>5.0.0-M1</version>
133133
<scope>test</scope>
134134
</dependency>
135135

@@ -175,4 +175,12 @@
175175
</plugin>
176176
</plugins>
177177
</build>
178+
179+
<repositories>
180+
<repository>
181+
<id>apache-pre-release</id>
182+
<url>https://repository.apache.org/content/repositories/staging/</url>
183+
<layout>default</layout>
184+
</repository>
185+
</repositories>
178186
</project>

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ configurations {
1313

1414
dependencies {
1515
implementation (
16-
'com.amazonaws.serverless:aws-serverless-java-container-struts:[1.9,)',
17-
'org.apache.struts:struts2-convention-plugin:6.1.3.1',
18-
'org.apache.struts:struts2-rest-plugin:6.1.3.1',
19-
'org.apache.struts:struts2-bean-validation-plugin:6.1.3.1',
20-
'org.apache.struts:struts2-junit-plugin:6.1.3.1',
16+
'com.amazonaws.serverless:aws-serverless-java-container-struts:[2.0-SNAPSHOT,)',
17+
'org.apache.struts:struts2-convention-plugin:7.0.0-M1',
18+
'org.apache.struts:struts2-rest-plugin:7.0.0-M1',
19+
'org.apache.struts:struts2-bean-validation-plugin:7.0.0-M1',
20+
'org.apache.struts:struts2-junit-plugin:7.0.0-M1',
2121
'com.jgeppert.struts2:struts2-aws-lambda-support-plugin:1.4.2',
2222
'org.hibernate.validator:hibernate-validator:6.1.7.Final',
23-
'org.glassfish:javax.el:3.0.0',
24-
'javax.el:javax.el-api:3.0.0',
23+
'org.glassfish:jakarta.el:5.0.0-M1',
24+
'jakarta.el:jakarta.el-api:5.0.1',
2525
'com.fasterxml.jackson.core:jackson-databind:2.16.1',
2626
'com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.16.1',
2727
'org.apache.logging.log4j:log4j-core:2.22.1',

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

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>com.amazonaws.serverless.sample</groupId>
88
<artifactId>serverless-struts-example</artifactId>
9-
<version>1.0-SNAPSHOT</version>
9+
<version>2.0-SNAPSHOT</version>
1010
<name>Struts example for the aws-serverless-java-container library</name>
1111
<description>Simple pet store written with the Apache Struts framework</description>
1212
<url>https://aws.amazon.com/lambda/</url>
@@ -26,7 +26,7 @@
2626
<properties>
2727
<maven.compiler.source>1.8</maven.compiler.source>
2828
<maven.compiler.target>1.8</maven.compiler.target>
29-
<struts.version>6.1.3.1</struts.version>
29+
<struts.version>7.0.0-M1</struts.version>
3030
<jackson.version>2.16.1</jackson.version>
3131
<junit.version>4.13.2</junit.version>
3232
<log4j.version>2.22.1</log4j.version>
@@ -36,7 +36,7 @@
3636
<dependency>
3737
<groupId>com.amazonaws.serverless</groupId>
3838
<artifactId>aws-serverless-java-container-struts</artifactId>
39-
<version>[1.9,)</version>
39+
<version>[2.0.0-SNAPSHOT,)</version>
4040
</dependency>
4141

4242
<dependency>
@@ -79,13 +79,13 @@
7979
</dependency>
8080
<dependency>
8181
<groupId>org.glassfish</groupId>
82-
<artifactId>javax.el</artifactId>
83-
<version>3.0.0</version>
82+
<artifactId>jakarta.el</artifactId>
83+
<version>5.0.0-M1</version>
8484
</dependency>
8585
<dependency>
86-
<groupId>javax.el</groupId>
87-
<artifactId>javax.el-api</artifactId>
88-
<version>3.0.0</version>
86+
<groupId>jakarta.el</groupId>
87+
<artifactId>jakarta.el-api</artifactId>
88+
<version>5.0.1</version>
8989
</dependency>
9090

9191
<dependency>
@@ -167,4 +167,11 @@
167167
</plugins>
168168
</build>
169169

170+
<repositories>
171+
<repository>
172+
<id>apache-pre-release</id>
173+
<url>https://repository.apache.org/content/repositories/staging/</url>
174+
<layout>default</layout>
175+
</repository>
176+
</repositories>
170177
</project>

0 commit comments

Comments
 (0)