Skip to content

Commit eae6ce8

Browse files
committed
chore(deps): update Struts to 7.0.0-M2 for testing
1 parent 96e8253 commit eae6ce8

File tree

5 files changed

+12
-22
lines changed

5 files changed

+12
-22
lines changed

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

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

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

2121
<dependencies>
@@ -38,16 +38,6 @@
3838
<groupId>org.apache.struts</groupId>
3939
<artifactId>struts2-core</artifactId>
4040
<version>${struts.version}</version>
41-
<exclusions>
42-
<exclusion>
43-
<groupId>org.apache.commons</groupId>
44-
<artifactId>commons-fileupload2-jakarta</artifactId>
45-
</exclusion>
46-
<exclusion>
47-
<groupId>commons-io</groupId>
48-
<artifactId>commons-io</artifactId>
49-
</exclusion>
50-
</exclusions>
5141
</dependency>
5242
<dependency>
5343
<groupId>org.apache.struts</groupId>

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:7.0.0-M1') {
21+
implementation ('org.apache.struts:struts2-convention-plugin:7.0.0-M2') {
2222
exclude group: 'org.apache.struts', module: 'struts2-core'
2323
}
24-
implementation ('org.apache.struts:struts2-rest-plugin:7.0.0-M1') {
24+
implementation ('org.apache.struts:struts2-rest-plugin:7.0.0-M2') {
2525
exclude group: 'org.apache.struts', module: 'struts2-core'
2626
}
27-
implementation ('org.apache.struts:struts2-bean-validation-plugin:7.0.0-M1') {
27+
implementation ('org.apache.struts:struts2-bean-validation-plugin:7.0.0-M2') {
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:7.0.0-M1') {
33+
implementation ('org.apache.struts:struts2-core:7.0.0-M2') {
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.2"))
4747
testImplementation("org.junit.jupiter:junit-jupiter")
48-
testImplementation('org.apache.struts:struts2-junit-plugin:7.0.0-M1') {
48+
testImplementation('org.apache.struts:struts2-junit-plugin:7.0.0-M2') {
4949
exclude group: 'org.apache.struts', module: 'struts2-core'
5050
}
5151
}

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

Lines changed: 1 addition & 1 deletion
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>7.0.0-M1</struts.version>
18+
<struts.version>7.0.0-M2</struts.version>
1919
<jackson.version>2.16.1</jackson.version>
2020
<junit.version>5.10.2</junit.version>
2121
<log4j.version>2.22.1</log4j.version>

samples/struts/pet-store/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ configurations {
1414
dependencies {
1515
implementation (
1616
'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',
17+
'org.apache.struts:struts2-convention-plugin:7.0.0-M2',
18+
'org.apache.struts:struts2-rest-plugin:7.0.0-M2',
19+
'org.apache.struts:struts2-bean-validation-plugin:7.0.0-M2',
20+
'org.apache.struts:struts2-junit-plugin:7.0.0-M2',
2121
'com.jgeppert.struts2:struts2-aws-lambda-support-plugin:1.4.2',
2222
'org.hibernate.validator:hibernate-validator:6.1.7.Final',
2323
'org.glassfish:jakarta.el:5.0.0-M1',

samples/struts/pet-store/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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>7.0.0-M1</struts.version>
29+
<struts.version>7.0.0-M2</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>

0 commit comments

Comments
 (0)