This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch feature/prepares-for-7
in repository https://gitbox.apache.org/repos/asf/struts.git
commit dc13abaf820d4c93133ffa9d9e5c6568a12097e2
Author: Lukasz Lenart <lukaszlen...@apache.org>
AuthorDate: Sun Nov 12 11:15:56 2023 +0100
WW-5335 Prepares for Java 17 & Struts 7.x
---
.github/workflows/codeql.yml | 10 ++-
.github/workflows/maven.yml | 3 +-
.github/workflows/scorecards-analysis.yaml | 4 +-
.github/workflows/sonar.yml | 1 +
Jenkinsfile | 113 ++++++++++-------------------
apps/pom.xml | 2 +-
apps/rest-showcase/pom.xml | 4 +-
apps/showcase/pom.xml | 2 +-
assembly/pom.xml | 2 +-
bom/pom.xml | 4 +-
bundles/admin/pom.xml | 2 +-
bundles/demo/pom.xml | 2 +-
bundles/pom.xml | 2 +-
core/pom.xml | 2 +-
plugins/async/pom.xml | 2 +-
plugins/bean-validation/pom.xml | 2 +-
plugins/cdi/pom.xml | 2 +-
plugins/config-browser/pom.xml | 2 +-
plugins/convention/pom.xml | 2 +-
plugins/dwr/pom.xml | 2 +-
plugins/embeddedjsp/pom.xml | 2 +-
plugins/gxp/pom.xml | 2 +-
plugins/jasperreports/pom.xml | 2 +-
plugins/javatemplates/pom.xml | 2 +-
plugins/jfreechart/pom.xml | 2 +-
plugins/json/pom.xml | 2 +-
plugins/junit/pom.xml | 2 +-
plugins/osgi/pom.xml | 2 +-
plugins/oval/pom.xml | 2 +-
plugins/pell-multipart/pom.xml | 2 +-
plugins/plexus/pom.xml | 2 +-
plugins/pom.xml | 2 +-
plugins/portlet-junit/pom.xml | 2 +-
plugins/portlet-mocks/pom.xml | 2 +-
plugins/portlet-tiles/pom.xml | 2 +-
plugins/portlet/pom.xml | 2 +-
plugins/rest/pom.xml | 2 +-
plugins/sitemesh/pom.xml | 2 +-
plugins/spring/pom.xml | 2 +-
plugins/testng/pom.xml | 2 +-
plugins/tiles/pom.xml | 2 +-
plugins/velocity/pom.xml | 2 +-
plugins/xslt/pom.xml | 2 +-
pom.xml | 25 ++-----
44 files changed, 100 insertions(+), 136 deletions(-)
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 9fc2c975c..c3464f762 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -17,7 +17,9 @@ name: "CodeQL"
on:
push:
- branches: [ "master" ]
+ branches:
+ - master
+ - release/struts-7-0-x
pull_request:
permissions:
@@ -43,6 +45,12 @@ jobs:
steps:
- name: Checkout repository
uses: actions/checkout@v4
+ - name: Setup Java JDK
+ uses: actions/setup-java@v3
+ with:
+ distribution: temurin
+ java-version: 17
+ cache: 'maven'
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
with:
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index a12923ab0..23bc69dda 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -20,6 +20,7 @@ on:
push:
branches:
- master
+ - release/struts-7-0-x
permissions: read-all
@@ -33,7 +34,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
- java: [ '8', '11', '17', '21' ]
+ java: [ '17', '21' ]
steps:
- name: Checkout code
uses: actions/checkout@v4
diff --git a/.github/workflows/scorecards-analysis.yaml
b/.github/workflows/scorecards-analysis.yaml
index 47d72730d..fa941f659 100644
--- a/.github/workflows/scorecards-analysis.yaml
+++ b/.github/workflows/scorecards-analysis.yaml
@@ -20,7 +20,9 @@ on:
schedule:
- cron: "30 1 * * 6" # Weekly on Saturdays
push:
- branches: [ "master" ]
+ branches:
+ - master
+ - release/struts-7-0-x
permissions: read-all
diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml
index ba84aedb8..a08084e46 100644
--- a/.github/workflows/sonar.yml
+++ b/.github/workflows/sonar.yml
@@ -20,6 +20,7 @@ on:
push:
branches:
- master
+ - release/struts-7-0-x
permissions: read-all
diff --git a/Jenkinsfile b/Jenkinsfile
index e00cefb97..80d1d4771 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -25,12 +25,12 @@ pipeline {
}
}
}
- stage('JDK 17') {
+ stage('JDK 21') {
agent {
label 'ubuntu'
}
tools {
- jdk 'jdk_17_latest'
+ jdk 'jdk_21_latest'
maven 'maven_3_latest'
}
environment {
@@ -44,7 +44,7 @@ pipeline {
}
stage('Test') {
steps {
- sh './mvnw -B verify -Pcoverage -DskipAssembly'
+ sh './mvnw -B test'
}
post {
always {
@@ -53,49 +53,47 @@ pipeline {
}
}
}
- stage('Code Quality') {
+ stage('Build Source & JavaDoc') {
when {
branch 'master'
}
steps {
- withCredentials([string(credentialsId: 'asf-struts-sonarcloud',
variable: 'SONARCLOUD_TOKEN')]) {
- sh './mvnw -B -Pcoverage -DskipAssembly
-Dsonar.login=${SONARCLOUD_TOKEN} verify
org.sonarsource.scanner.maven:sonar-maven-plugin:sonar'
+ dir("local-snapshots-dir/") {
+ deleteDir()
}
+ sh './mvnw -B source:jar javadoc:jar -DskipTests -DskipAssembly'
}
}
- }
- post {
- always {
- cleanWs deleteDirs: true, patterns: [[pattern: '**/target/**', type:
'INCLUDE']]
- }
- }
- }
- stage('JDK 11') {
- agent {
- label 'ubuntu'
- }
- tools {
- jdk 'jdk_11_latest'
- maven 'maven_3_latest'
- }
- environment {
- MAVEN_OPTS = "-Xmx1024m"
- }
- stages {
- stage('Build') {
+ stage('Deploy Snapshot') {
+ when {
+ branch 'master'
+ }
steps {
- sh './mvnw -B clean install -DskipTests -DskipAssembly'
+ withCredentials([file(credentialsId:
'lukaszlenart-repository-access-token', variable: 'CUSTOM_SETTINGS')]) {
+ sh './mvnw -s \${CUSTOM_SETTINGS} deploy -DskipTests
-DskipAssembly'
+ }
}
}
- stage('Test') {
- steps {
- sh './mvnw -B test'
+ stage('Upload nightlies') {
+ when {
+ branch 'master'
}
- post {
- always {
- junit(testResults: '**/surefire-reports/*.xml',
allowEmptyResults: true)
- junit(testResults: '**/failsafe-reports/*.xml',
allowEmptyResults: true)
- }
+ steps {
+ sh './mvnw -B package -DskipTests'
+ sshPublisher(publishers: [
+ sshPublisherDesc(
+ configName: 'Nightlies',
+ transfers: [
+ sshTransfer(
+ remoteDirectory: '/struts/snapshot',
+ removePrefix: 'assembly/target/assembly/out',
+ sourceFiles:
'assembly/target/assembly/out/struts-*.zip',
+ cleanRemote: true
+ )
+ ],
+ verbose: true
+ )
+ ])
}
}
}
@@ -105,12 +103,12 @@ pipeline {
}
}
}
- stage('JDK 8') {
+ stage('JDK 17') {
agent {
label 'ubuntu'
}
tools {
- jdk 'jdk_1.8_latest'
+ jdk 'jdk_17_latest'
maven 'maven_3_latest'
}
environment {
@@ -124,7 +122,7 @@ pipeline {
}
stage('Test') {
steps {
- sh './mvnw -B test'
+ sh './mvnw -B verify -Pcoverage -DskipAssembly'
}
post {
always {
@@ -133,49 +131,16 @@ pipeline {
}
}
}
- stage('Build Source & JavaDoc') {
- when {
- branch 'master'
- }
- steps {
- dir("local-snapshots-dir/") {
- deleteDir()
- }
- sh './mvnw -B source:jar javadoc:jar -DskipTests -DskipAssembly'
- }
- }
- stage('Deploy Snapshot') {
+ stage('Code Quality') {
when {
branch 'master'
}
steps {
- withCredentials([file(credentialsId:
'lukaszlenart-repository-access-token', variable: 'CUSTOM_SETTINGS')]) {
- sh './mvnw -s \${CUSTOM_SETTINGS} deploy -DskipTests
-DskipAssembly'
+ withCredentials([string(credentialsId: 'asf-struts-sonarcloud',
variable: 'SONARCLOUD_TOKEN')]) {
+ sh './mvnw -B -Pcoverage -DskipAssembly
-Dsonar.login=${SONARCLOUD_TOKEN} verify
org.sonarsource.scanner.maven:sonar-maven-plugin:sonar'
}
}
}
- stage('Upload nightlies') {
- when {
- branch 'master'
- }
- steps {
- sh './mvnw -B package -DskipTests'
- sshPublisher(publishers: [
- sshPublisherDesc(
- configName: 'Nightlies',
- transfers: [
- sshTransfer(
- remoteDirectory: '/struts/snapshot',
- removePrefix: 'assembly/target/assembly/out',
- sourceFiles:
'assembly/target/assembly/out/struts-*.zip',
- cleanRemote: true
- )
- ],
- verbose: true
- )
- ])
- }
- }
}
post {
always {
diff --git a/apps/pom.xml b/apps/pom.xml
index a1a187151..b87c6bb99 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>6.4.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>struts2-apps</artifactId>
<packaging>pom</packaging>
diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml
index 7c6f16051..179fa3c23 100644
--- a/apps/rest-showcase/pom.xml
+++ b/apps/rest-showcase/pom.xml
@@ -24,12 +24,12 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>6.4.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>struts2-rest-showcase</artifactId>
<packaging>war</packaging>
- <version>6.4.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<name>Struts 2 Rest Showcase Webapp</name>
<description>Struts 2 Rest Showcase Example</description>
diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml
index 263c029f8..6955c7f8f 100644
--- a/apps/showcase/pom.xml
+++ b/apps/showcase/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>6.4.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>struts2-showcase</artifactId>
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 531e3fb1a..f5489212d 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>6.4.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>struts2-assembly</artifactId>
diff --git a/bom/pom.xml b/bom/pom.xml
index c0b520f81..0e9e2db68 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -25,11 +25,11 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>6.4.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>struts2-bom</artifactId>
- <version>6.4.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Struts 2 Bill of Materials</name>
diff --git a/bundles/admin/pom.xml b/bundles/admin/pom.xml
index 8c2c35a7d..f4e774951 100644
--- a/bundles/admin/pom.xml
+++ b/bundles/admin/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-osgi-bundles</artifactId>
- <version>6.4.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>struts2-osgi-admin-bundle</artifactId>
diff --git a/bundles/demo/pom.xml b/bundles/demo/pom.xml
index 884bdce3a..76e3a9252 100644
--- a/bundles/demo/pom.xml
+++ b/bundles/demo/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-osgi-bundles</artifactId>
- <version>6.4.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>struts2-osgi-demo-bundle</artifactId>
diff --git a/bundles/pom.xml b/bundles/pom.xml
index 408947c8f..2b5a6811f 100755
--- a/bundles/pom.xml
+++ b/bundles/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>6.4.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>struts2-osgi-bundles</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index 26634e2d6..29c6c7b3c 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>6.4.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>struts2-core</artifactId>
<packaging>jar</packaging>
diff --git a/plugins/async/pom.xml b/plugins/async/pom.xml
index 2233f9e3c..b7fec5e46 100644
--- a/plugins/async/pom.xml
+++ b/plugins/async/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.4.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>struts2-async-plugin</artifactId>
diff --git a/plugins/bean-validation/pom.xml b/plugins/bean-validation/pom.xml
index 5609961a7..717fb8875 100644
--- a/plugins/bean-validation/pom.xml
+++ b/plugins/bean-validation/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.4.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/plugins/cdi/pom.xml b/plugins/cdi/pom.xml
index 307f9af5a..1193adde0 100644
--- a/plugins/cdi/pom.xml
+++ b/plugins/cdi/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.4.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>struts2-cdi-plugin</artifactId>
diff --git a/plugins/config-browser/pom.xml b/plugins/config-browser/pom.xml
index f82e8d2b7..ba7d31997 100644
--- a/plugins/config-browser/pom.xml
+++ b/plugins/config-browser/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.4.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>struts2-config-browser-plugin</artifactId>
diff --git a/plugins/convention/pom.xml b/plugins/convention/pom.xml
index 99b114ae1..d2edc93eb 100644
--- a/plugins/convention/pom.xml
+++ b/plugins/convention/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.4.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>struts2-convention-plugin</artifactId>
diff --git a/plugins/dwr/pom.xml b/plugins/dwr/pom.xml
index ac49be32d..a3ce5ffae 100644
--- a/plugins/dwr/pom.xml
+++ b/plugins/dwr/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.4.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>struts2-dwr-plugin</artifactId>
diff --git a/plugins/embeddedjsp/pom.xml b/plugins/embeddedjsp/pom.xml
index 53d6b4be2..656d9c446 100644
--- a/plugins/embeddedjsp/pom.xml
+++ b/plugins/embeddedjsp/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.4.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>struts2-embeddedjsp-plugin</artifactId>
diff --git a/plugins/gxp/pom.xml b/plugins/gxp/pom.xml
index daec7b139..f5995b698 100644
--- a/plugins/gxp/pom.xml
+++ b/plugins/gxp/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.4.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>struts2-gxp-plugin</artifactId>
diff --git a/plugins/jasperreports/pom.xml b/plugins/jasperreports/pom.xml
index a81eef617..c23e13779 100644
--- a/plugins/jasperreports/pom.xml
+++ b/plugins/jasperreports/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.4.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>struts2-jasperreports-plugin</artifactId>
diff --git a/plugins/javatemplates/pom.xml b/plugins/javatemplates/pom.xml
index 57d4d08a9..e1c9b061a 100644
--- a/plugins/javatemplates/pom.xml
+++ b/plugins/javatemplates/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.4.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>struts2-javatemplates-plugin</artifactId>
diff --git a/plugins/jfreechart/pom.xml b/plugins/jfreechart/pom.xml
index 32d2f95de..ef2de302e 100644
--- a/plugins/jfreechart/pom.xml
+++ b/plugins/jfreechart/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.4.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>struts2-jfreechart-plugin</artifactId>
diff --git a/plugins/json/pom.xml b/plugins/json/pom.xml
index 63772ea1a..28af49b0a 100644
--- a/plugins/json/pom.xml
+++ b/plugins/json/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.4.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>struts2-json-plugin</artifactId>
diff --git a/plugins/junit/pom.xml b/plugins/junit/pom.xml
index 51041e0a9..3e04a6315 100644
--- a/plugins/junit/pom.xml
+++ b/plugins/junit/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.4.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>struts2-junit-plugin</artifactId>
diff --git a/plugins/osgi/pom.xml b/plugins/osgi/pom.xml
index a5b4ed0ad..1762903c9 100644
--- a/plugins/osgi/pom.xml
+++ b/plugins/osgi/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.4.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>struts2-osgi-plugin</artifactId>
diff --git a/plugins/oval/pom.xml b/plugins/oval/pom.xml
index ad011b259..2a04e7e6f 100644
--- a/plugins/oval/pom.xml
+++ b/plugins/oval/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.4.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>struts2-oval-plugin</artifactId>
diff --git a/plugins/pell-multipart/pom.xml b/plugins/pell-multipart/pom.xml
index 2b8cc9adc..2ff2e2e16 100644
--- a/plugins/pell-multipart/pom.xml
+++ b/plugins/pell-multipart/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.4.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>struts2-pell-multipart-plugin</artifactId>
diff --git a/plugins/plexus/pom.xml b/plugins/plexus/pom.xml
index 698ef7573..88d8f0fdf 100644
--- a/plugins/plexus/pom.xml
+++ b/plugins/plexus/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.4.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>struts2-plexus-plugin</artifactId>
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 04b024304..fdfd9144e 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>6.4.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>struts2-plugins</artifactId>
diff --git a/plugins/portlet-junit/pom.xml b/plugins/portlet-junit/pom.xml
index 45b6b94be..f5b9c9059 100644
--- a/plugins/portlet-junit/pom.xml
+++ b/plugins/portlet-junit/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.4.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>struts2-portlet-junit-plugin</artifactId>
diff --git a/plugins/portlet-mocks/pom.xml b/plugins/portlet-mocks/pom.xml
index 9b3a6081a..d2844c004 100644
--- a/plugins/portlet-mocks/pom.xml
+++ b/plugins/portlet-mocks/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.4.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>struts2-portlet-mocks-plugin</artifactId>
diff --git a/plugins/portlet-tiles/pom.xml b/plugins/portlet-tiles/pom.xml
index c738a9b68..b7c9322fa 100644
--- a/plugins/portlet-tiles/pom.xml
+++ b/plugins/portlet-tiles/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.4.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>struts2-portlet-tiles-plugin</artifactId>
diff --git a/plugins/portlet/pom.xml b/plugins/portlet/pom.xml
index 8aed31c0b..db8a04f70 100644
--- a/plugins/portlet/pom.xml
+++ b/plugins/portlet/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.4.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>struts2-portlet-plugin</artifactId>
diff --git a/plugins/rest/pom.xml b/plugins/rest/pom.xml
index a3187d1f4..7ca844415 100644
--- a/plugins/rest/pom.xml
+++ b/plugins/rest/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.4.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>struts2-rest-plugin</artifactId>
diff --git a/plugins/sitemesh/pom.xml b/plugins/sitemesh/pom.xml
index c7bde8e9d..08583eb04 100644
--- a/plugins/sitemesh/pom.xml
+++ b/plugins/sitemesh/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.4.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>struts2-sitemesh-plugin</artifactId>
diff --git a/plugins/spring/pom.xml b/plugins/spring/pom.xml
index b546ba4ba..618a66285 100644
--- a/plugins/spring/pom.xml
+++ b/plugins/spring/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.4.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>struts2-spring-plugin</artifactId>
diff --git a/plugins/testng/pom.xml b/plugins/testng/pom.xml
index fb0154bff..f55a03dd8 100644
--- a/plugins/testng/pom.xml
+++ b/plugins/testng/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.4.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>struts2-testng-plugin</artifactId>
diff --git a/plugins/tiles/pom.xml b/plugins/tiles/pom.xml
index 440f6ee79..1a6ebda54 100644
--- a/plugins/tiles/pom.xml
+++ b/plugins/tiles/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.4.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>struts2-tiles-plugin</artifactId>
diff --git a/plugins/velocity/pom.xml b/plugins/velocity/pom.xml
index 7ecfbb102..8a3e05738 100644
--- a/plugins/velocity/pom.xml
+++ b/plugins/velocity/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.4.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>struts2-velocity-plugin</artifactId>
diff --git a/plugins/xslt/pom.xml b/plugins/xslt/pom.xml
index cde4a8cfb..c2ac42a34 100644
--- a/plugins/xslt/pom.xml
+++ b/plugins/xslt/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.4.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>struts2-xslt-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index 13451500b..4945b016c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-parent</artifactId>
- <version>6.4.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Struts 2</name>
<url>https://struts.apache.org/</url>
@@ -51,7 +51,7 @@
<connection>scm:git:https://gitbox.apache.org/repos/asf/struts.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/struts.git</developerConnection>
<url>https://github.com/apache/struts/</url>
- <tag>STRUTS_6_3_0_1</tag>
+ <tag>HEAD</tag>
</scm>
<issueManagement>
@@ -104,9 +104,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-
<project.build.outputTimestamp>2023-09-11T07:49:50Z</project.build.outputTimestamp>
- <maven.compiler.source>1.8</maven.compiler.source>
- <maven.compiler.target>1.8</maven.compiler.target>
+
<project.build.outputTimestamp>2023-11-12T10:00:00Z</project.build.outputTimestamp>
+ <maven.compiler.release>17</maven.compiler.release>
<!-- dependency versions in alphanumeric order -->
<asm.version>9.6</asm.version>
@@ -165,9 +164,9 @@
</build>
</profile>
<profile>
- <id>jdk8</id>
+ <id>jdk17</id>
<activation>
- <jdk>[1.8,)</jdk>
+ <jdk>[17,)</jdk>
</activation>
<build>
<pluginManagement>
@@ -179,18 +178,6 @@
<doclint>none</doclint>
</configuration>
</plugin>
- </plugins>
- </pluginManagement>
- </build>
- </profile>
- <profile>
- <id>jdk17</id>
- <activation>
- <jdk>[17,)</jdk>
- </activation>
- <build>
- <pluginManagement>
- <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
