This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/struts.git
commit a6d6d918fa6df82ff2682e904fc32abfad2e8c78 Author: Lukasz Lenart <lukaszlen...@apache.org> AuthorDate: Sun Apr 7 11:11:32 2024 +0200 Reverts release and fixes issue with assembly --- apps/pom.xml | 2 +- apps/rest-showcase/pom.xml | 4 ++-- apps/showcase/pom.xml | 2 +- assembly/pom.xml | 4 +++- bom/pom.xml | 6 +++--- 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 | 13 +------------ 39 files changed, 44 insertions(+), 53 deletions(-) diff --git a/apps/pom.xml b/apps/pom.xml index 16c95aa5f..a1a187151 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.5.0-SNAPSHOT</version> + <version>6.4.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 1961facbc..7c6f16051 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.5.0-SNAPSHOT</version> + <version>6.4.0-SNAPSHOT</version> </parent> <artifactId>struts2-rest-showcase</artifactId> <packaging>war</packaging> - <version>6.5.0-SNAPSHOT</version> + <version>6.4.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 a1a9138cd..263c029f8 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.5.0-SNAPSHOT</version> + <version>6.4.0-SNAPSHOT</version> </parent> <artifactId>struts2-showcase</artifactId> diff --git a/assembly/pom.xml b/assembly/pom.xml index cc4c61fef..2b5d960c1 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.5.0-SNAPSHOT</version> + <version>6.4.0-SNAPSHOT</version> </parent> <artifactId>struts2-assembly</artifactId> @@ -104,7 +104,9 @@ </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> + <version>3.6.0</version> <executions> <execution> <id>make-assembly</id> diff --git a/bom/pom.xml b/bom/pom.xml index a2bd291aa..c0b520f81 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.5.0-SNAPSHOT</version> + <version>6.4.0-SNAPSHOT</version> </parent> <artifactId>struts2-bom</artifactId> - <version>6.5.0-SNAPSHOT</version> + <version>6.4.0-SNAPSHOT</version> <packaging>pom</packaging> <name>Struts 2 Bill of Materials</name> @@ -44,7 +44,7 @@ </licenses> <properties> - <struts-version.version>6.5.0-SNAPSHOT</struts-version.version> + <struts-version.version>6.4.0-SNAPSHOT</struts-version.version> <maven.site.skip>true</maven.site.skip> <maven.site.deploy.skip>true</maven.site.deploy.skip> </properties> diff --git a/bundles/admin/pom.xml b/bundles/admin/pom.xml index 1485e7f68..8c2c35a7d 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.5.0-SNAPSHOT</version> + <version>6.4.0-SNAPSHOT</version> </parent> <artifactId>struts2-osgi-admin-bundle</artifactId> diff --git a/bundles/demo/pom.xml b/bundles/demo/pom.xml index ad74c9648..884bdce3a 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.5.0-SNAPSHOT</version> + <version>6.4.0-SNAPSHOT</version> </parent> <artifactId>struts2-osgi-demo-bundle</artifactId> diff --git a/bundles/pom.xml b/bundles/pom.xml index ebd7adbf3..408947c8f 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.5.0-SNAPSHOT</version> + <version>6.4.0-SNAPSHOT</version> </parent> <artifactId>struts2-osgi-bundles</artifactId> diff --git a/core/pom.xml b/core/pom.xml index 3fcfaaf7b..26634e2d6 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.5.0-SNAPSHOT</version> + <version>6.4.0-SNAPSHOT</version> </parent> <artifactId>struts2-core</artifactId> <packaging>jar</packaging> diff --git a/plugins/async/pom.xml b/plugins/async/pom.xml index 4eb41aa7f..2233f9e3c 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.5.0-SNAPSHOT</version> + <version>6.4.0-SNAPSHOT</version> </parent> <artifactId>struts2-async-plugin</artifactId> diff --git a/plugins/bean-validation/pom.xml b/plugins/bean-validation/pom.xml index f789b404d..5609961a7 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.5.0-SNAPSHOT</version> + <version>6.4.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/plugins/cdi/pom.xml b/plugins/cdi/pom.xml index 571dc169e..307f9af5a 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.5.0-SNAPSHOT</version> + <version>6.4.0-SNAPSHOT</version> </parent> <artifactId>struts2-cdi-plugin</artifactId> diff --git a/plugins/config-browser/pom.xml b/plugins/config-browser/pom.xml index 0dd09fd9a..f82e8d2b7 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.5.0-SNAPSHOT</version> + <version>6.4.0-SNAPSHOT</version> </parent> <artifactId>struts2-config-browser-plugin</artifactId> diff --git a/plugins/convention/pom.xml b/plugins/convention/pom.xml index 520c2f33a..99b114ae1 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.5.0-SNAPSHOT</version> + <version>6.4.0-SNAPSHOT</version> </parent> <artifactId>struts2-convention-plugin</artifactId> diff --git a/plugins/dwr/pom.xml b/plugins/dwr/pom.xml index 1ed3c97ca..ac49be32d 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.5.0-SNAPSHOT</version> + <version>6.4.0-SNAPSHOT</version> </parent> <artifactId>struts2-dwr-plugin</artifactId> diff --git a/plugins/embeddedjsp/pom.xml b/plugins/embeddedjsp/pom.xml index e18fe8f70..53d6b4be2 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.5.0-SNAPSHOT</version> + <version>6.4.0-SNAPSHOT</version> </parent> <artifactId>struts2-embeddedjsp-plugin</artifactId> diff --git a/plugins/gxp/pom.xml b/plugins/gxp/pom.xml index 61f2a6a4c..daec7b139 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.5.0-SNAPSHOT</version> + <version>6.4.0-SNAPSHOT</version> </parent> <artifactId>struts2-gxp-plugin</artifactId> diff --git a/plugins/jasperreports/pom.xml b/plugins/jasperreports/pom.xml index 23a4c49cf..59549ec7b 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.5.0-SNAPSHOT</version> + <version>6.4.0-SNAPSHOT</version> </parent> <artifactId>struts2-jasperreports-plugin</artifactId> diff --git a/plugins/javatemplates/pom.xml b/plugins/javatemplates/pom.xml index 9fe59abc6..57d4d08a9 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.5.0-SNAPSHOT</version> + <version>6.4.0-SNAPSHOT</version> </parent> <artifactId>struts2-javatemplates-plugin</artifactId> diff --git a/plugins/jfreechart/pom.xml b/plugins/jfreechart/pom.xml index ee88bc120..32d2f95de 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.5.0-SNAPSHOT</version> + <version>6.4.0-SNAPSHOT</version> </parent> <artifactId>struts2-jfreechart-plugin</artifactId> diff --git a/plugins/json/pom.xml b/plugins/json/pom.xml index 3f62a3172..63772ea1a 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.5.0-SNAPSHOT</version> + <version>6.4.0-SNAPSHOT</version> </parent> <artifactId>struts2-json-plugin</artifactId> diff --git a/plugins/junit/pom.xml b/plugins/junit/pom.xml index 6b0b02d57..51041e0a9 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.5.0-SNAPSHOT</version> + <version>6.4.0-SNAPSHOT</version> </parent> <artifactId>struts2-junit-plugin</artifactId> diff --git a/plugins/osgi/pom.xml b/plugins/osgi/pom.xml index 45787dcc0..a5b4ed0ad 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.5.0-SNAPSHOT</version> + <version>6.4.0-SNAPSHOT</version> </parent> <artifactId>struts2-osgi-plugin</artifactId> diff --git a/plugins/oval/pom.xml b/plugins/oval/pom.xml index ac39682a2..ad011b259 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.5.0-SNAPSHOT</version> + <version>6.4.0-SNAPSHOT</version> </parent> <artifactId>struts2-oval-plugin</artifactId> diff --git a/plugins/pell-multipart/pom.xml b/plugins/pell-multipart/pom.xml index 4cce2037d..2b8cc9adc 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.5.0-SNAPSHOT</version> + <version>6.4.0-SNAPSHOT</version> </parent> <artifactId>struts2-pell-multipart-plugin</artifactId> diff --git a/plugins/plexus/pom.xml b/plugins/plexus/pom.xml index 6836cbd98..698ef7573 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.5.0-SNAPSHOT</version> + <version>6.4.0-SNAPSHOT</version> </parent> <artifactId>struts2-plexus-plugin</artifactId> diff --git a/plugins/pom.xml b/plugins/pom.xml index 27f729071..04b024304 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.5.0-SNAPSHOT</version> + <version>6.4.0-SNAPSHOT</version> </parent> <artifactId>struts2-plugins</artifactId> diff --git a/plugins/portlet-junit/pom.xml b/plugins/portlet-junit/pom.xml index bc7198e0e..45b6b94be 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.5.0-SNAPSHOT</version> + <version>6.4.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 cd5dec22a..9b3a6081a 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.5.0-SNAPSHOT</version> + <version>6.4.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 9fa3a28f4..c738a9b68 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.5.0-SNAPSHOT</version> + <version>6.4.0-SNAPSHOT</version> </parent> <artifactId>struts2-portlet-tiles-plugin</artifactId> diff --git a/plugins/portlet/pom.xml b/plugins/portlet/pom.xml index 99a5248bd..8aed31c0b 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.5.0-SNAPSHOT</version> + <version>6.4.0-SNAPSHOT</version> </parent> <artifactId>struts2-portlet-plugin</artifactId> diff --git a/plugins/rest/pom.xml b/plugins/rest/pom.xml index e56121eeb..a3187d1f4 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.5.0-SNAPSHOT</version> + <version>6.4.0-SNAPSHOT</version> </parent> <artifactId>struts2-rest-plugin</artifactId> diff --git a/plugins/sitemesh/pom.xml b/plugins/sitemesh/pom.xml index 0c314cd59..c7bde8e9d 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.5.0-SNAPSHOT</version> + <version>6.4.0-SNAPSHOT</version> </parent> <artifactId>struts2-sitemesh-plugin</artifactId> diff --git a/plugins/spring/pom.xml b/plugins/spring/pom.xml index f34745f6f..b546ba4ba 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.5.0-SNAPSHOT</version> + <version>6.4.0-SNAPSHOT</version> </parent> <artifactId>struts2-spring-plugin</artifactId> diff --git a/plugins/testng/pom.xml b/plugins/testng/pom.xml index 72317e345..fb0154bff 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.5.0-SNAPSHOT</version> + <version>6.4.0-SNAPSHOT</version> </parent> <artifactId>struts2-testng-plugin</artifactId> diff --git a/plugins/tiles/pom.xml b/plugins/tiles/pom.xml index 618bc6a8c..1a6caf2c1 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.5.0-SNAPSHOT</version> + <version>6.4.0-SNAPSHOT</version> </parent> <artifactId>struts2-tiles-plugin</artifactId> diff --git a/plugins/velocity/pom.xml b/plugins/velocity/pom.xml index c7efbdc94..7ecfbb102 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.5.0-SNAPSHOT</version> + <version>6.4.0-SNAPSHOT</version> </parent> <artifactId>struts2-velocity-plugin</artifactId> diff --git a/plugins/xslt/pom.xml b/plugins/xslt/pom.xml index 2ddc88da3..cde4a8cfb 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.5.0-SNAPSHOT</version> + <version>6.4.0-SNAPSHOT</version> </parent> <artifactId>struts2-xslt-plugin</artifactId> diff --git a/pom.xml b/pom.xml index 5be8da4e9..ead06ba75 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ <modelVersion>4.0.0</modelVersion> <artifactId>struts2-parent</artifactId> - <version>6.5.0-SNAPSHOT</version> + <version>6.4.0-SNAPSHOT</version> <packaging>pom</packaging> <name>Struts 2</name> <url>https://struts.apache.org/</url> @@ -351,17 +351,6 @@ <skipRuntimeScope>true</skipRuntimeScope> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <version>3.6.0</version> - <configuration> - <skipAssembly>true</skipAssembly> - <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot> - <outputDirectory>assembly/out</outputDirectory> - <workDirectory>assembly/work</workDirectory> - </configuration> - </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId>