This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch WW-5283-update
in repository https://gitbox.apache.org/repos/asf/struts-archetypes.git
commit c25cb386ff56ecd17d34214f39cb55e76a2d60e8
Author: Lukasz Lenart <lukaszlen...@apache.org>
AuthorDate: Tue Feb 14 08:16:50 2023 +0100
WW-5283 Upgrade Struts archetypes to use the latest Struts version
---
pom.xml | 29 +++++-------
struts2-archetype-angularjs/pom.xml | 7 +--
.../src/main/resources/archetype-resources/pom.xml | 23 ++++------
.../src/main/webapp/WEB-INF/web.xml | 6 ++-
struts2-archetype-blank/pom.xml | 7 +--
.../src/main/resources/archetype-resources/pom.xml | 23 ++++------
.../src/main/webapp/WEB-INF/web.xml | 9 ++--
struts2-archetype-convention/pom.xml | 7 +--
.../src/main/resources/archetype-resources/pom.xml | 24 ++++------
.../src/main/webapp/WEB-INF/web.xml | 7 +--
struts2-archetype-dbportlet/pom.xml | 8 ++--
.../src/main/resources/archetype-resources/pom.xml | 21 +++------
.../src/main/webapp/WEB-INF/web.xml | 8 ++--
struts2-archetype-plugin/pom.xml | 7 +--
.../src/main/resources/archetype-resources/pom.xml | 20 +++-----
struts2-archetype-portlet/pom.xml | 7 +--
.../src/main/resources/archetype-resources/pom.xml | 18 ++------
.../src/main/webapp/WEB-INF/web.xml | 8 ++--
struts2-archetype-starter/pom.xml | 8 ++--
.../src/main/resources/archetype-resources/pom.xml | 28 +++++-------
.../src/main/webapp/WEB-INF/web.xml | 53 +++++++++++-----------
21 files changed, 139 insertions(+), 189 deletions(-)
diff --git a/pom.xml b/pom.xml
index f204b5f..a2735d6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,8 @@
* under the License.
*/
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
https://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.struts</groupId>
@@ -28,7 +29,7 @@
</parent>
<artifactId>struts-archetypes</artifactId>
- <version>2.5.23-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Struts 2 Maven Archetypes</name>
<description>Collection of Apache Struts Maven Archetypes</description>
@@ -47,7 +48,7 @@
<ciManagement>
<system>Jenkins</system>
- <url>https://builds.apache.org/hudson/view/S-Z/view/Struts</url>
+ <url>https://builds.apache.org/job/Struts/</url>
<notifiers>
<notifier>
<type>mail</type>
@@ -61,15 +62,15 @@
<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
- <comments />
+ <comments/>
</license>
</licenses>
<organization>
<name>Apache Software Foundation</name>
- <url>http://www.apache.org</url>
+ <url>https://www.apache.org</url>
</organization>
<modules>
@@ -84,20 +85,14 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <supported.struts2.version>2.5.22</supported.struts2.version>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
+
+ <supported.struts2.version>6.1.1</supported.struts2.version>
+ <supported.log4j.version>2.19.0</supported.log4j.version>
</properties>
<build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.8</source>
- <target>1.8</target>
- </configuration>
- </plugin>
- </plugins>
<pluginManagement>
<plugins>
<plugin>
diff --git a/struts2-archetype-angularjs/pom.xml
b/struts2-archetype-angularjs/pom.xml
index 3ba00b3..cbeb171 100644
--- a/struts2-archetype-angularjs/pom.xml
+++ b/struts2-archetype-angularjs/pom.xml
@@ -1,15 +1,16 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
https://maven.apache.org/maven-v4_0_0.xsd";>
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts-archetypes</artifactId>
- <version>2.5.23-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-archetype-angularjs</artifactId>
<packaging>maven-archetype</packaging>
<name>Struts 2 Archetypes - Angular JS</name>
- <description>Struts 2's HTML5 AngularJS App Archetype</description>
+ <description>Struts 2 HTML5 AngularJS App Archetype</description>
<properties>
<maven.test.skip>true</maven.test.skip>
diff --git
a/struts2-archetype-angularjs/src/main/resources/archetype-resources/pom.xml
b/struts2-archetype-angularjs/src/main/resources/archetype-resources/pom.xml
index b650608..2867dfe 100644
--- a/struts2-archetype-angularjs/src/main/resources/archetype-resources/pom.xml
+++ b/struts2-archetype-angularjs/src/main/resources/archetype-resources/pom.xml
@@ -9,9 +9,12 @@
<name>\${artifactId}</name>
<properties>
- <struts2.version>${supported.struts2.version}</struts2.version>
- <log4j2.version>2.12.1</log4j2.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
+
+ <struts2.version>${supported.struts2.version}</struts2.version>
+ <log4j2.version>${supported.log4j.version}</log4j2.version>
</properties>
<dependencies>
@@ -82,9 +85,9 @@
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
+ <groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
- <version>2.0</version>
+ <version>2.1</version>
<scope>provided</scope>
</dependency>
@@ -92,16 +95,6 @@
<build>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.6.2</version>
- <configuration>
- <encoding>UTF-8</encoding>
- <source>1.8</source>
- <target>1.8</target>
- </configuration>
- </plugin>
<plugin>
<groupId>com.cj.jshintmojo</groupId>
<artifactId>jshint-maven-plugin</artifactId>
@@ -173,7 +166,7 @@
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
- <version>9.4.22.v20191022</version>
+ <version>9.4.46.v20220331</version>
<configuration>
<stopKey>CTRL+C</stopKey>
<stopPort>8999</stopPort>
diff --git
a/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
b/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
index 8d08c0b..c8618d6 100644
---
a/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
+++
b/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
@@ -1,7 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<web-app id="struts_angularjs" version="2.5"
xmlns="http://java.sun.com/xml/ns/javaee";
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd";>
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
+ http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd";
+ version="3.1">
<display-name>Struts Blank AngularJS App</display-name>
<filter>
diff --git a/struts2-archetype-blank/pom.xml b/struts2-archetype-blank/pom.xml
index aaad329..3db3867 100644
--- a/struts2-archetype-blank/pom.xml
+++ b/struts2-archetype-blank/pom.xml
@@ -1,16 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
https://maven.apache.org/maven-v4_0_0.xsd";>
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts-archetypes</artifactId>
- <version>2.5.23-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-archetype-blank</artifactId>
<packaging>maven-archetype</packaging>
<name>Struts 2 Archetypes - Blank</name>
- <description>Struts 2's Blank App Archetype</description>
+ <description>Struts 2 Blank App Archetype</description>
<properties>
<maven.test.skip>true</maven.test.skip>
diff --git
a/struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml
b/struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml
index 79211ad..7e9e74d 100644
--- a/struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml
+++ b/struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml
@@ -9,9 +9,12 @@
<name>\${artifactId}</name>
<properties>
- <struts2.version>${supported.struts2.version}</struts2.version>
- <log4j2.version>2.12.1</log4j2.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
+
+ <struts2.version>${supported.struts2.version}</struts2.version>
+ <log4j2.version>${supported.log4j.version}</log4j2.version>
</properties>
<dependencies>
@@ -62,9 +65,9 @@
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
+ <groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
- <version>2.0</version>
+ <version>2.1</version>
<scope>provided</scope>
</dependency>
@@ -72,20 +75,10 @@
<build>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.6.2</version>
- <configuration>
- <encoding>UTF-8</encoding>
- <source>1.8</source>
- <target>1.8</target>
- </configuration>
- </plugin>
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
- <version>9.4.22.v20191022</version>
+ <version>9.4.46.v20220331</version>
<configuration>
<stopKey>CTRL+C</stopKey>
<stopPort>8999</stopPort>
diff --git
a/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
b/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
index 8858656..385dde6 100644
---
a/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
+++
b/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
@@ -1,10 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<web-app id="struts_blank" version="2.4"
- xmlns="http://java.sun.com/xml/ns/j2ee";
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";>
- <display-name>Struts Blank</display-name>
-
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
+ http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd";
+ version="3.1">
<filter>
<filter-name>struts2</filter-name>
<filter-class>
diff --git a/struts2-archetype-convention/pom.xml
b/struts2-archetype-convention/pom.xml
index 64b3910..b93e355 100644
--- a/struts2-archetype-convention/pom.xml
+++ b/struts2-archetype-convention/pom.xml
@@ -1,15 +1,16 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts-archetypes</artifactId>
- <version>2.5.23-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-archetype-convention</artifactId>
<packaging>maven-archetype</packaging>
<name>Struts 2 Archetypes - Blank Convention</name>
- <description>Struts 2's Blank Convention based App Archetype</description>
+ <description>Struts 2 Blank Convention based App Archetype</description>
<properties>
<maven.test.skip>true</maven.test.skip>
diff --git
a/struts2-archetype-convention/src/main/resources/archetype-resources/pom.xml
b/struts2-archetype-convention/src/main/resources/archetype-resources/pom.xml
index fb462af..e0c09db 100644
---
a/struts2-archetype-convention/src/main/resources/archetype-resources/pom.xml
+++
b/struts2-archetype-convention/src/main/resources/archetype-resources/pom.xml
@@ -9,9 +9,12 @@
<name>\${artifactId}</name>
<properties>
- <struts2.version>${supported.struts2.version}</struts2.version>
- <log4j2.version>2.12.1</log4j2.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
+
+ <struts2.version>${supported.struts2.version}</struts2.version>
+ <log4j2.version>${supported.log4j.version}</log4j2.version>
</properties>
<dependencies>
@@ -76,31 +79,20 @@
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
+ <groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
- <version>2.0</version>
+ <version>2.1</version>
<scope>provided</scope>
</dependency>
-
</dependencies>
<build>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.6.2</version>
- <configuration>
- <encoding>UTF-8</encoding>
- <source>1.8</source>
- <target>1.8</target>
- </configuration>
- </plugin>
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
- <version>9.4.22.v20191022</version>
+ <version>9.4.46.v20220331</version>
<configuration>
<stopKey>CTRL+C</stopKey>
<stopPort>8999</stopPort>
diff --git
a/struts2-archetype-convention/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
b/struts2-archetype-convention/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
index 1eaebba..bf2c099 100644
---
a/struts2-archetype-convention/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
+++
b/struts2-archetype-convention/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<web-app id="struts_blank" version="2.4"
- xmlns="http://java.sun.com/xml/ns/j2ee";
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";>
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
+ http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd";
+ version="3.1">
<display-name>Struts Blank Convention</display-name>
<listener>
diff --git a/struts2-archetype-dbportlet/pom.xml
b/struts2-archetype-dbportlet/pom.xml
index c33f8cf..804d570 100644
--- a/struts2-archetype-dbportlet/pom.xml
+++ b/struts2-archetype-dbportlet/pom.xml
@@ -1,15 +1,17 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts-archetypes</artifactId>
- <version>2.5.23-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-archetype-dbportlet</artifactId>
<packaging>maven-archetype</packaging>
<name>Struts 2 Archetypes - Database Portlet</name>
- <description> Struts 2's Database Portlet Archetype, which can be deployed
as a webapp or JSR168 portlet</description>
+ <description>Struts 2 Database Portlet Archetype, which can be deployed as
a webapp or JSR168 portlet
+ </description>
<properties>
<maven.test.skip>true</maven.test.skip>
diff --git
a/struts2-archetype-dbportlet/src/main/resources/archetype-resources/pom.xml
b/struts2-archetype-dbportlet/src/main/resources/archetype-resources/pom.xml
index 89f265a..c204cf4 100644
--- a/struts2-archetype-dbportlet/src/main/resources/archetype-resources/pom.xml
+++ b/struts2-archetype-dbportlet/src/main/resources/archetype-resources/pom.xml
@@ -10,12 +10,14 @@
<name>\${artifactId}</name>
<properties>
- <struts2.version>${supported.struts2.version}</struts2.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
+
+ <struts2.version>${supported.struts2.version}</struts2.version>
<spring.version>4.3.26.RELEASE</spring.version>
<portlet.api.version>2.0</portlet.api.version>
<!-- plugins -->
- <plugin.compiler.version>3.6.1</plugin.compiler.version>
<plugin.war.version>2.3</plugin.war.version>
<plugin.pluto.version>2.0.3</plugin.pluto.version>
</properties>
@@ -84,9 +86,9 @@
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
+ <groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
- <version>2.0</version>
+ <version>2.1</version>
<scope>provided</scope>
</dependency>
@@ -101,17 +103,6 @@
<build>
<finalName>\${artifactId}</finalName>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.6.2</version>
- <configuration>
- <source>1.8</source>
- <target>1.8</target>
- </configuration>
- </plugin>
- </plugins>
</build>
<profiles>
diff --git
a/struts2-archetype-dbportlet/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
b/struts2-archetype-dbportlet/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
index 1725bee..7ae1e3d 100644
---
a/struts2-archetype-dbportlet/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
+++
b/struts2-archetype-dbportlet/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
@@ -1,7 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application
2.3//EN"
- "http://java.sun.com/dtd/web-app_2_3.dtd";>
-<web-app id="\${artifactId}">
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
+ http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd";
+ version="3.1">
<display-name>Struts2 DB Portlet</display-name>
<context-param>
diff --git a/struts2-archetype-plugin/pom.xml b/struts2-archetype-plugin/pom.xml
index e73af7f..952dc0d 100644
--- a/struts2-archetype-plugin/pom.xml
+++ b/struts2-archetype-plugin/pom.xml
@@ -1,15 +1,16 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
https://maven.apache.org/maven-v4_0_0.xsd";>
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts-archetypes</artifactId>
- <version>2.5.23-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-archetype-plugin</artifactId>
<packaging>maven-archetype</packaging>
<name>Struts 2 Archetypes - Plugin</name>
- <description>Struts 2's Basic Plugin Archetype</description>
+ <description>Struts 2 Basic Plugin Archetype</description>
<properties>
<maven.test.skip>true</maven.test.skip>
diff --git
a/struts2-archetype-plugin/src/main/resources/archetype-resources/pom.xml
b/struts2-archetype-plugin/src/main/resources/archetype-resources/pom.xml
index bc97023..7731e63 100644
--- a/struts2-archetype-plugin/src/main/resources/archetype-resources/pom.xml
+++ b/struts2-archetype-plugin/src/main/resources/archetype-resources/pom.xml
@@ -10,8 +10,11 @@
<name>\${artifactId}</name>
<properties>
- <struts2.version>${supported.struts2.version}</struts2.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
+
+ <struts2.version>${supported.struts2.version}</struts2.version>
</properties>
<dependencies>
@@ -24,8 +27,8 @@
<dependency>
<groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>3.1.0</version>
<scope>provided</scope>
</dependency>
@@ -40,17 +43,6 @@
<build>
<defaultGoal>install</defaultGoal>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.6.2</version>
- <configuration>
- <source>1.8</source>
- <target>1.8</target>
- </configuration>
- </plugin>
- </plugins>
</build>
</project>
diff --git a/struts2-archetype-portlet/pom.xml
b/struts2-archetype-portlet/pom.xml
index 8da8a94..1ce332f 100644
--- a/struts2-archetype-portlet/pom.xml
+++ b/struts2-archetype-portlet/pom.xml
@@ -1,15 +1,16 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
https://maven.apache.org/maven-v4_0_0.xsd";>
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts-archetypes</artifactId>
- <version>2.5.23-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-archetype-portlet</artifactId>
<packaging>maven-archetype</packaging>
<name>Struts 2 Archetypes - Portlet</name>
- <description>Struts 2's Portlet Archetype, which can be deployed as JSR286
portlet</description>
+ <description>Struts 2 Portlet Archetype, which can be deployed as JSR286
portlet</description>
<properties>
<maven.test.skip>true</maven.test.skip>
diff --git
a/struts2-archetype-portlet/src/main/resources/archetype-resources/pom.xml
b/struts2-archetype-portlet/src/main/resources/archetype-resources/pom.xml
index a66e3b6..be45480 100644
--- a/struts2-archetype-portlet/src/main/resources/archetype-resources/pom.xml
+++ b/struts2-archetype-portlet/src/main/resources/archetype-resources/pom.xml
@@ -11,10 +11,12 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
+
<struts2.version>${supported.struts2.version}</struts2.version>
<portlet.api.version>2.0</portlet.api.version>
<!-- plugins -->
- <plugin.compiler.version>3.6.2</plugin.compiler.version>
<plugin.war.version>2.3</plugin.war.version>
<plugin.pluto.version>2.0.3</plugin.pluto.version>
</properties>
@@ -43,20 +45,6 @@
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>\${plugin.compiler.version}</version>
- <configuration>
- <source>1.8</source>
- <target>1.8</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
<profiles>
<profile>
<id>pluto-embedded</id>
diff --git
a/struts2-archetype-portlet/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
b/struts2-archetype-portlet/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
index 4dec584..2eaf250 100644
---
a/struts2-archetype-portlet/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
+++
b/struts2-archetype-portlet/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
@@ -1,7 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application
2.3//EN"
- "http://java.sun.com/dtd/web-app_2_3.dtd";>
-<web-app id="\${artifactId}">
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
+ http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd";
+ version="3.1">
<display-name>Struts2 Portlet</display-name>
<filter>
diff --git a/struts2-archetype-starter/pom.xml
b/struts2-archetype-starter/pom.xml
index af57c75..078fabf 100644
--- a/struts2-archetype-starter/pom.xml
+++ b/struts2-archetype-starter/pom.xml
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
https://maven.apache.org/maven-v4_0_0.xsd";>
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts-archetypes</artifactId>
- <version>2.5.23-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-archetype-starter</artifactId>
<packaging>maven-archetype</packaging>
<name>Struts 2 Archetypes - Starter</name>
- <description>Struts 2's Starter App Archetype</description>
+ <description>Struts 2 Starter App Archetype</description>
<properties>
<maven.test.skip>true</maven.test.skip>
diff --git
a/struts2-archetype-starter/src/main/resources/archetype-resources/pom.xml
b/struts2-archetype-starter/src/main/resources/archetype-resources/pom.xml
index 5072fbd..d7cfa0e 100644
--- a/struts2-archetype-starter/src/main/resources/archetype-resources/pom.xml
+++ b/struts2-archetype-starter/src/main/resources/archetype-resources/pom.xml
@@ -11,9 +11,12 @@
<description>Struts 2 Starter</description>
<properties>
- <struts2.version>${supported.struts2.version}</struts2.version>
- <log4j2.version>2.12.1</log4j2.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
+
+ <struts2.version>${supported.struts2.version}</struts2.version>
+ <log4j2.version>${supported.log4j.version}</log4j2.version>
</properties>
<dependencies>
@@ -61,22 +64,22 @@
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
+ <groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
- <version>2.0</version>
+ <version>2.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
- <version>1.3.3</version>
+ <version>1.4</version>
</dependency>
<dependency>
- <groupId>uk.ltd.getahead</groupId>
+ <groupId>org.directwebremoting</groupId>
<artifactId>dwr</artifactId>
- <version>1.1-beta-3</version>
+ <version>3.0.2-RELEASE</version>
</dependency>
<!-- Tests -->
@@ -92,19 +95,10 @@
<build>
<finalName>${artifactId}</finalName>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.6.2</version>
- <configuration>
- <source>1.8</source>
- <target>1.8</target>
- </configuration>
- </plugin>
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
- <version>9.4.22.v20191022</version>
+ <version>9.4.46.v20220331</version>
<configuration>
<stopKey>CTRL+C</stopKey>
<stopPort>8999</stopPort>
diff --git
a/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
b/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
index 58c84c6..f9273ce 100644
---
a/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
+++
b/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
@@ -1,19 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
+ http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd";
+ version="3.1">
+ <display-name>Struts 2 - Maven Archetype - Starter</display-name>
-<web-app id="starter" version="2.4"
- xmlns="http://java.sun.com/xml/ns/j2ee";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";>
-
- <display-name>Struts 2 - Maven Archetype - Starter</display-name>
-
- <context-param>
- <param-name>contextConfigLocation</param-name>
- <param-value>classpath*:applicationContext*.xml</param-value>
- </context-param>
-
- <!-- Filters -->
- <filter>
+ <context-param>
+ <param-name>contextConfigLocation</param-name>
+ <param-value>classpath*:applicationContext*.xml</param-value>
+ </context-param>
+
+ <!-- Filters -->
+ <filter>
<filter-name>struts2-prepare</filter-name>
<filter-class>org.apache.struts2.dispatcher.filter.StrutsPrepareFilter</filter-class>
</filter>
@@ -25,8 +24,8 @@
<filter-name>struts2-execute</filter-name>
<filter-class>org.apache.struts2.dispatcher.filter.StrutsExecuteFilter</filter-class>
</filter>
-
- <filter-mapping>
+
+ <filter-mapping>
<filter-name>struts2-prepare</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
@@ -38,13 +37,13 @@
<filter-name>struts2-execute</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
-
- <!-- Listeners -->
- <listener>
+
+ <!-- Listeners -->
+ <listener>
<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
</listener>
-
-
+
+
<!-- Servlets -->
<servlet>
<servlet-name>dwr</servlet-name>
@@ -55,17 +54,17 @@
</init-param>
</servlet>
<servlet>
- <servlet-name>jspSupportServlet</servlet-name>
-
<servlet-class>org.apache.struts2.views.JspSupportServlet</servlet-class>
- <load-on-startup>5</load-on-startup>
+ <servlet-name>jspSupportServlet</servlet-name>
+
<servlet-class>org.apache.struts2.views.JspSupportServlet</servlet-class>
+ <load-on-startup>5</load-on-startup>
</servlet>
-
+
<servlet-mapping>
<servlet-name>dwr</servlet-name>
<url-pattern>/dwr/*</url-pattern>
</servlet-mapping>
-
-
+
+
<!-- Welcome file lists -->
<welcome-file-list>
<welcome-file>index.jsp</welcome-file>
