[struts-archetypes] branch WW-5283-update created (now c25cb38)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch WW-5283-update in repository https://gitbox.apache.org/repos/asf/struts-archetypes.git at c25cb38 WW-5283 Upgrade Struts archetypes to use the latest Struts version This branch includes the following new commits: new c25cb38 WW-5283 Upgrade Struts archetypes to use the latest Struts version The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[struts-archetypes] 01/01: WW-5283 Upgrade Struts archetypes to use the latest Struts version
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
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.
*/
-->
-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";>
+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";>
4.0.0
org.apache.struts
@@ -28,7 +29,7 @@
struts-archetypes
-2.5.23-SNAPSHOT
+6.0.0-SNAPSHOT
pom
Struts 2 Maven Archetypes
Collection of Apache Struts Maven Archetypes
@@ -47,7 +48,7 @@
Jenkins
-https://builds.apache.org/hudson/view/S-Z/view/Struts
+https://builds.apache.org/job/Struts/
mail
@@ -61,15 +62,15 @@
The Apache Software License, Version 2.0
-http://www.apache.org/licenses/LICENSE-2.0.txt
+https://www.apache.org/licenses/LICENSE-2.0.txt
repo
-
+
Apache Software Foundation
-http://www.apache.org
+https://www.apache.org
@@ -84,20 +85,14 @@
UTF-8
-2.5.22
+1.8
+1.8
+
+6.1.1
+2.19.0
-
-
-org.apache.maven.plugins
-maven-compiler-plugin
-
-1.8
-1.8
-
-
-
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 @@
-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";>
+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";>
org.apache.struts
struts-archetypes
-2.5.23-SNAPSHOT
+6.0.0-SNAPSHOT
4.0.0
struts2-archetype-angularjs
maven-archetype
Struts 2 Archetypes - Angular JS
-Struts 2's HTML5 AngularJS App Archetype
+Struts 2 HTML5 AngularJS App Archetype
true
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 @@
\${artifactId}
-${supported.struts2.version}
-2.12.1
UTF-8
+1.8
+1.8
+
+
[struts-archetypes] branch WW-5283-update updated: Uses proper tools in Jenkins pipeline
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
The following commit(s) were added to refs/heads/WW-5283-update by this push:
new b121bcd Uses proper tools in Jenkins pipeline
b121bcd is described below
commit b121bcd325e809b4a757cc8b4f99244b9c27636e
Author: Lukasz Lenart
AuthorDate: Tue Feb 14 08:18:50 2023 +0100
Uses proper tools in Jenkins pipeline
---
Jenkinsfile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index dca224b..6a51156 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -30,8 +30,8 @@ pipeline {
label 'ubuntu'
}
tools {
-jdk 'JDK 1.8 (latest)'
-maven 'Maven (latest)'
+jdk 'jdk_1.8_latest'
+maven 'maven_3_latest'
}
environment {
MAVEN_OPTS = "-Xmx1024m"
[struts-archetypes] branch WW-5283-update updated: WW-5283 Extracts Jetty version into property
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
The following commit(s) were added to refs/heads/WW-5283-update by this push:
new 06e19c0 WW-5283 Extracts Jetty version into property
06e19c0 is described below
commit 06e19c0e31c1303a8cd1afdbae2d1def48b5feef
Author: Lukasz Lenart
AuthorDate: Tue Feb 14 08:22:21 2023 +0100
WW-5283 Extracts Jetty version into property
---
pom.xml| 1 +
.../src/main/resources/archetype-resources/pom.xml | 3 ++-
struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml | 3 ++-
.../src/main/resources/archetype-resources/pom.xml | 3 ++-
.../src/main/resources/archetype-resources/pom.xml | 2 +-
5 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index a2735d6..c54d3a6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -90,6 +90,7 @@
6.1.1
2.19.0
+9.4.46.v20220331
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 2867dfe..6c89ad2 100644
--- a/struts2-archetype-angularjs/src/main/resources/archetype-resources/pom.xml
+++ b/struts2-archetype-angularjs/src/main/resources/archetype-resources/pom.xml
@@ -166,13 +166,14 @@
org.eclipse.jetty
jetty-maven-plugin
-9.4.46.v20220331
+${supported.jetty.version}
CTRL+C
8999
10
\${basedir}/src/main/webapp/
+/\${artifactId}
\${basedir}/src/main/webapp/WEB-INF/web.xml
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 7e9e74d..4f8ca8a 100644
--- a/struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml
+++ b/struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml
@@ -78,13 +78,14 @@
org.eclipse.jetty
jetty-maven-plugin
-9.4.46.v20220331
+${supported.jetty.version}
CTRL+C
8999
10
\${basedir}/src/main/webapp/
+/\${artifactId}
\${basedir}/src/main/webapp/WEB-INF/web.xml
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 e0c09db..347d3ed 100644
---
a/struts2-archetype-convention/src/main/resources/archetype-resources/pom.xml
+++
b/struts2-archetype-convention/src/main/resources/archetype-resources/pom.xml
@@ -92,13 +92,14 @@
org.eclipse.jetty
jetty-maven-plugin
-9.4.46.v20220331
+${supported.jetty.version}
CTRL+C
8999
10
\${basedir}/src/main/webapp/
+/\${artifactId}
\${basedir}/src/main/webapp/WEB-INF/web.xml
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 d7cfa0e..e317993 100644
--- a/struts2-archetype-starter/src/main/resources/archetype-resources/pom.xml
+++ b/struts2-archetype-starter/src/main/resources/archetype-resources/pom.xml
@@ -98,7 +98,7 @@
org.eclipse.jetty
jetty-maven-plugin
-9.4.46.v20220331
+${supported.jetty.version}
CTRL+C
8999
