(struts) 01/01: Merge pull request #902 from apache/dependabot/maven/log4j2.version-2.23.1
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 ee38cd5b1472ed96cff90636d2b72fe165eedadb Merge: 5cf746f53 7a79576bb Author: Lukasz Lenart AuthorDate: Sat Apr 6 18:45:12 2024 +0200 Merge pull request #902 from apache/dependabot/maven/log4j2.version-2.23.1 WW-5404 Bump log4j2.version from 2.21.1 to 2.23.1 pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(struts) branch master updated (5cf746f53 -> ee38cd5b1)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/struts.git from 5cf746f53 Merge pull request #901 from apache/fix/branch-protction add 7a79576bb Bump log4j2.version from 2.21.1 to 2.23.1 new ee38cd5b1 Merge pull request #902 from apache/dependabot/maven/log4j2.version-2.23.1 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. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(struts) branch dependabot/maven/log4j2.version-2.23.1 deleted (was 7a79576bb)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch dependabot/maven/log4j2.version-2.23.1 in repository https://gitbox.apache.org/repos/asf/struts.git was 7a79576bb Bump log4j2.version from 2.21.1 to 2.23.1 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(struts-master) branch master updated (a87b03a -> 1c85154)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/struts-master.git from a87b03a [maven-release-plugin] prepare for next development iteration new 7b0bb25 Uses Apache Master 31 version new 1c85154 [maven-release-plugin] prepare release STRUTS_MASTER_15 The 2 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. Summary of changes: pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
(struts-master) 02/02: [maven-release-plugin] prepare release STRUTS_MASTER_15
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-master.git commit 1c851543c49e77b461116f14347968460fb50014 Author: Lukasz Lenart AuthorDate: Sat Apr 6 19:10:32 2024 +0200 [maven-release-plugin] prepare release STRUTS_MASTER_15 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index a2d14c4..9f94f85 100755 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ org.apache.struts struts-master -15-SNAPSHOT +15 pom Apache Struts @@ -15,7 +15,7 @@ scm:git:https://gitbox.apache.org/repos/asf/struts-master.git scm:git:https://gitbox.apache.org/repos/asf/struts-master.git https://github.com/apache/struts-master/ -HEAD +STRUTS_MASTER_15
(struts-master) 01/02: Uses Apache Master 31 version
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-master.git commit 7b0bb25dc2fb3a2e2f688425f6a0d706abd05b78 Author: Lukasz Lenart AuthorDate: Sat Apr 6 19:09:48 2024 +0200 Uses Apache Master 31 version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 94d3d86..a2d14c4 100755 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ org.apache apache -22 +31 org.apache.struts struts-master
(struts-master) annotated tag STRUTS_MASTER_15 created (now 8757af7)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to annotated tag STRUTS_MASTER_15 in repository https://gitbox.apache.org/repos/asf/struts-master.git at 8757af7 (tag) tagging 1c851543c49e77b461116f14347968460fb50014 (commit) replaces STRUTS_MASTER_14 by Lukasz Lenart on Sat Apr 6 19:10:47 2024 +0200 - Log - [maven-release-plugin] copy for tag STRUTS_MASTER_15 --- No new revisions were added by this update.
(struts-master) branch master updated: [maven-release-plugin] prepare for next development iteration
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-master.git The following commit(s) were added to refs/heads/master by this push: new 088099c [maven-release-plugin] prepare for next development iteration 088099c is described below commit 088099cd5327176d19998102eb5bcb3e436505de Author: Lukasz Lenart AuthorDate: Sat Apr 6 19:10:52 2024 +0200 [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 9f94f85..e964c3f 100755 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ org.apache.struts struts-master -15 +16-SNAPSHOT pom Apache Struts @@ -15,7 +15,7 @@ scm:git:https://gitbox.apache.org/repos/asf/struts-master.git scm:git:https://gitbox.apache.org/repos/asf/struts-master.git https://github.com/apache/struts-master/ -STRUTS_MASTER_15 +HEAD
(struts) branch fix/WW-5390-assembly created (now db725518e)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch fix/WW-5390-assembly in repository https://gitbox.apache.org/repos/asf/struts.git at db725518e WW-5390 Fixes creating assembly and attaching sources when preparing a new release This branch includes the following new commits: new db725518e WW-5390 Fixes creating assembly and attaching sources when preparing a new release 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) 01/01: WW-5390 Fixes creating assembly and attaching sources when preparing a new release
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch fix/WW-5390-assembly in repository https://gitbox.apache.org/repos/asf/struts.git commit db725518ee82158acb422bee414d0b6fd2bac540 Author: Lukasz Lenart AuthorDate: Sat Apr 6 19:36:14 2024 +0200 WW-5390 Fixes creating assembly and attaching sources when preparing a new release --- pom.xml | 25 - 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/pom.xml b/pom.xml index 418017057..79824373b 100644 --- a/pom.xml +++ b/pom.xml @@ -296,14 +296,7 @@ org.apache.maven.plugins maven-source-plugin - - -attach-sources - -jar - - - +3.3.0 org.apache.rat @@ -358,6 +351,17 @@ true + +org.apache.maven.plugins +maven-assembly-plugin +3.6.0 + +true +true +assembly/out +assembly/work + + org.apache.maven.plugins maven-enforcer-plugin @@ -388,7 +392,6 @@ org.apache.maven.plugins maven-release-plugin - 3.0.1 @@ -412,10 +415,6 @@ - -org.apache.maven.plugins -maven-source-plugin - org.apache.maven.plugins maven-site-plugin
(struts) 01/01: Merge pull request #903 from apache/fix/WW-5390-assembly
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 0f6d5dbb2f5ef0399f73d17309f91cab9f625030 Merge: ee38cd5b1 db725518e Author: Lukasz Lenart AuthorDate: Sun Apr 7 07:08:19 2024 +0200 Merge pull request #903 from apache/fix/WW-5390-assembly WW-5390 Fixes creating assembly and attaching sources when preparing a new release pom.xml | 25 - 1 file changed, 12 insertions(+), 13 deletions(-)
(struts) branch master updated (ee38cd5b1 -> 0f6d5dbb2)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/struts.git from ee38cd5b1 Merge pull request #902 from apache/dependabot/maven/log4j2.version-2.23.1 add db725518e WW-5390 Fixes creating assembly and attaching sources when preparing a new release new 0f6d5dbb2 Merge pull request #903 from apache/fix/WW-5390-assembly 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. Summary of changes: pom.xml | 25 - 1 file changed, 12 insertions(+), 13 deletions(-)
(struts) branch fix/WW-5390-assembly deleted (was db725518e)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch fix/WW-5390-assembly in repository https://gitbox.apache.org/repos/asf/struts.git was db725518e WW-5390 Fixes creating assembly and attaching sources when preparing a new release The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(struts) branch merge/master-to-7xx-2024-04-07 created (now e5e6145c3)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch merge/master-to-7xx-2024-04-07 in repository https://gitbox.apache.org/repos/asf/struts.git at e5e6145c3 Merge remote-tracking branch 'origin/master' into merge/master-to-7xx-2024-04-07 This branch includes the following new commits: new e5e6145c3 Merge remote-tracking branch 'origin/master' into merge/master-to-7xx-2024-04-07 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) 01/01: Merge remote-tracking branch 'origin/master' into merge/master-to-7xx-2024-04-07
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch merge/master-to-7xx-2024-04-07
in repository https://gitbox.apache.org/repos/asf/struts.git
commit e5e6145c361ec6e6c98d86f9aaeef7e4bdb14f30
Merge: 4939d3cef 0f6d5dbb2
Author: Lukasz Lenart
AuthorDate: Sun Apr 7 07:58:50 2024 +0200
Merge remote-tracking branch 'origin/master' into
merge/master-to-7xx-2024-04-07
# Conflicts:
# pom.xml
.asf.yaml | 8 +-
README.md | 2 +-
.../showcase/fileupload/FileUploadAction.java | 5 +-
.../MultipleFileUploadUsingArrayAction.java| 82 ++---
.../MultipleFileUploadUsingListAction.java | 88 +++---
.../providers/XmlDocConfigurationProvider.java | 4 +-
.../apache/struts2/action/UploadedFilesAware.java | 3 +-
.../org/apache/struts2/dispatcher/Dispatcher.java | 13 ++-
.../multipart/AbstractMultiPartRequest.java| 11 +-
.../multipart/JakartaMultiPartRequest.java | 7 +-
.../multipart/JakartaStreamMultiPartRequest.java | 6 +-
.../dispatcher/multipart/MultiPartRequest.java | 2 +-
.../multipart/MultiPartRequestWrapper.java | 3 +-
.../dispatcher/multipart/StrutsUploadedFile.java | 4 +-
.../struts2/dispatcher/multipart/UploadedFile.java | 4 +-
.../interceptor/AbstractFileUploadInterceptor.java | 3 +-
.../interceptor/ActionFileUploadInterceptor.java | 7 +-
.../struts2/interceptor/ApplicationAware.java} | 16 +--
.../struts2/interceptor/HttpParametersAware.java} | 16 +--
.../struts2/interceptor/ParameterAware.java} | 20 ++--
.../struts2/interceptor/PrincipalAware.java} | 14 +--
.../apache/struts2/interceptor/RequestAware.java} | 23 +++-
.../struts2/interceptor/ServletRequestAware.java} | 16 +--
.../struts2/interceptor/ServletResponseAware.java} | 16 +--
.../apache/struts2/interceptor/SessionAware.java} | 16 +--
.../apache/struts2/util/ServletContextAware.java} | 16 +--
.../multipart/AbstractMultiPartRequestTest.java| 8 +-
.../multipart/JakartaMultiPartRequestTest.java | 4 +-
.../ActionFileUploadInterceptorTest.java | 14 +--
.../interceptor/FileUploadInterceptorTest.java | 14 +--
plugins/jasperreports/pom.xml | 2 +-
.../portlet/interceptor/PortletContextAware.java | 16 +--
.../interceptor/PortletPreferencesAware.java | 16 +--
.../portlet/interceptor/PortletRequestAware.java | 16 +--
.../portlet/interceptor/PortletResponseAware.java | 16 +--
plugins/tiles/pom.xml | 3 -
.../struts2/tiles/StrutsTilesContainerFactory.java | 28 +++--
.../tiles/StrutsTilesContainerFactoryTest.java | 128 +
pom.xml| 47 +++-
39 files changed, 436 insertions(+), 281 deletions(-)
diff --cc
core/src/main/java/org/apache/struts2/dispatcher/multipart/AbstractMultiPartRequest.java
index 1c9148047,23d879ba4..630d2ca43
---
a/core/src/main/java/org/apache/struts2/dispatcher/multipart/AbstractMultiPartRequest.java
+++
b/core/src/main/java/org/apache/struts2/dispatcher/multipart/AbstractMultiPartRequest.java
@@@ -46,10 -34,8 +46,10 @@@ import java.util.Map
* Abstract class with some helper methods, it should be used
* when starting development of another implementation of {@link
MultiPartRequest}
*/
- public abstract class AbstractMultiPartRequest implements MultiPartRequest
{
+ public abstract class AbstractMultiPartRequest implements MultiPartRequest {
+protected static final String
STRUTS_MESSAGES_UPLOAD_ERROR_PARAMETER_TOO_LONG_KEY =
"struts.messages.upload.error.parameter.too.long";
+
private static final Logger LOG =
LogManager.getLogger(AbstractMultiPartRequest.class);
/**
@@@ -98,14 -76,9 +98,14 @@@
protected String defaultEncoding;
/**
- * Localization to be used regarding errors.
+ * Map between file fields and file data.
*/
- protected Map>> uploadedFiles = new
HashMap<>();
-protected Locale defaultLocale = Locale.ENGLISH;
++protected Map> uploadedFiles = new HashMap<>();
+
+/**
+ * Map between non-file fields and values.
+ */
+protected Map> parameters = new HashMap<>();
/**
* @param bufferSize Sets the buffer size to be used.
@@@ -296,109 -169,4 +296,108 @@@
return fileName;
}
+protected String sanitizeNewlines(String before) {
+return before.replaceAll("\\R", "_");
+}
+
+/* (non-Javadoc)
+ * @see
org.apache.struts2.dispatcher.multipart.MultiPartRequest#getErrors()
+ */
+public List getErrors() {
+return errors;
+}
+
+/* (non-Javadoc)
+ * @see
org.apache.struts2.dispatcher.multipart.MultiPartRequest#getFileParameterNames()
+ */
+public Enumeratio
(struts) branch master updated: [maven-release-plugin] prepare release STRUTS_6_4_0
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 The following commit(s) were added to refs/heads/master by this push: new f8381fbdb [maven-release-plugin] prepare release STRUTS_6_4_0 f8381fbdb is described below commit f8381fbdbf2893d232b12a24299c5698041f0efd Author: Lukasz Lenart AuthorDate: Sun Apr 7 08:13:07 2024 +0200 [maven-release-plugin] prepare release STRUTS_6_4_0 --- apps/pom.xml| 2 +- apps/rest-showcase/pom.xml | 4 ++-- apps/showcase/pom.xml | 2 +- assembly/pom.xml| 2 +- bom/pom.xml | 8 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 | 6 +++--- 39 files changed, 45 insertions(+), 45 deletions(-) diff --git a/apps/pom.xml b/apps/pom.xml index a1a187151..def718cbe 100644 --- a/apps/pom.xml +++ b/apps/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -6.4.0-SNAPSHOT +6.4.0 struts2-apps pom diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml index 7c6f16051..0af45ba83 100644 --- a/apps/rest-showcase/pom.xml +++ b/apps/rest-showcase/pom.xml @@ -24,12 +24,12 @@ org.apache.struts struts2-apps -6.4.0-SNAPSHOT +6.4.0 struts2-rest-showcase war -6.4.0-SNAPSHOT +6.4.0 Struts 2 Rest Showcase Webapp Struts 2 Rest Showcase Example diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml index 263c029f8..e07d22dcd 100644 --- a/apps/showcase/pom.xml +++ b/apps/showcase/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-apps -6.4.0-SNAPSHOT +6.4.0 struts2-showcase diff --git a/assembly/pom.xml b/assembly/pom.xml index 531e3fb1a..4e76f7f3e 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -6.4.0-SNAPSHOT +6.4.0 struts2-assembly diff --git a/bom/pom.xml b/bom/pom.xml index c0b520f81..b4fe9687a 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -25,11 +25,11 @@ org.apache.struts struts2-parent -6.4.0-SNAPSHOT +6.4.0 struts2-bom -6.4.0-SNAPSHOT +6.4.0 pom Struts 2 Bill of Materials @@ -44,7 +44,7 @@ -6.4.0-SNAPSHOT +6.4.0 true true @@ -190,7 +190,7 @@ -STRUTS_6_3_0_1 +STRUTS_6_4_0 scm:git:https://gitbox.apache.org/repos/asf/struts.git scm:git:https://gitbox.apache.org/repos/asf/struts.git https://github.com/apache/struts/ diff --git a/bundles/admin/pom.xml b/bundles/admin/pom.xml index 8c2c35a7d..0bd89bb80 100644 --- a/bundles/admin/pom.xml +++ b/bundles/admin/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-osgi-bundles -6.4.0-SNAPSHOT +6.4.0 struts2-osgi-admin-bundle diff --git a/bundles/demo/pom.xml b/bundles/demo/pom.xml index 884bdce3a..f2b8399da 100644 --- a/bundles/demo/pom.xml +++ b/bundles/demo/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-osgi-bundles -6.4.0-SNAPSHOT +6.4.0 struts2-osgi-demo-bundle diff --git a/bundles/pom.xml b/bundles/pom.xml index 408947c8f..bce21ff1d 100755 --- a/bundles/pom.xml +++ b/bundles/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -6.4.0-SNAPSHOT +6.4.0 struts2-osgi-bundles diff --git a/core/pom.xml b/core/pom.xml index 2663
(struts) annotated tag STRUTS_6_4_0 created (now 55c21072d)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to annotated tag STRUTS_6_4_0 in repository https://gitbox.apache.org/repos/asf/struts.git at 55c21072d (tag) tagging f8381fbdbf2893d232b12a24299c5698041f0efd (commit) replaces STRUTS_6_3_0_1 by Lukasz Lenart on Sun Apr 7 08:13:12 2024 +0200 - Log - [maven-release-plugin] copy for tag STRUTS_6_4_0 --- No new revisions were added by this update.
(struts) branch master updated: [maven-release-plugin] prepare for next development iteration
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 The following commit(s) were added to refs/heads/master by this push: new 5e8b81b38 [maven-release-plugin] prepare for next development iteration 5e8b81b38 is described below commit 5e8b81b3822b1e14b829cf69e6d8aa87b80376d9 Author: Lukasz Lenart AuthorDate: Sun Apr 7 08:13:17 2024 +0200 [maven-release-plugin] prepare for next development iteration --- apps/pom.xml| 2 +- apps/rest-showcase/pom.xml | 4 ++-- apps/showcase/pom.xml | 2 +- assembly/pom.xml| 2 +- bom/pom.xml | 8 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 | 6 +++--- 39 files changed, 45 insertions(+), 45 deletions(-) diff --git a/apps/pom.xml b/apps/pom.xml index def718cbe..16c95aa5f 100644 --- a/apps/pom.xml +++ b/apps/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -6.4.0 +6.5.0-SNAPSHOT struts2-apps pom diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml index 0af45ba83..1961facbc 100644 --- a/apps/rest-showcase/pom.xml +++ b/apps/rest-showcase/pom.xml @@ -24,12 +24,12 @@ org.apache.struts struts2-apps -6.4.0 +6.5.0-SNAPSHOT struts2-rest-showcase war -6.4.0 +6.5.0-SNAPSHOT Struts 2 Rest Showcase Webapp Struts 2 Rest Showcase Example diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml index e07d22dcd..a1a9138cd 100644 --- a/apps/showcase/pom.xml +++ b/apps/showcase/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-apps -6.4.0 +6.5.0-SNAPSHOT struts2-showcase diff --git a/assembly/pom.xml b/assembly/pom.xml index 4e76f7f3e..cc4c61fef 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -6.4.0 +6.5.0-SNAPSHOT struts2-assembly diff --git a/bom/pom.xml b/bom/pom.xml index b4fe9687a..a2bd291aa 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -25,11 +25,11 @@ org.apache.struts struts2-parent -6.4.0 +6.5.0-SNAPSHOT struts2-bom -6.4.0 +6.5.0-SNAPSHOT pom Struts 2 Bill of Materials @@ -44,7 +44,7 @@ -6.4.0 +6.5.0-SNAPSHOT true true @@ -190,7 +190,7 @@ -STRUTS_6_4_0 +STRUTS_6_3_0_1 scm:git:https://gitbox.apache.org/repos/asf/struts.git scm:git:https://gitbox.apache.org/repos/asf/struts.git https://github.com/apache/struts/ diff --git a/bundles/admin/pom.xml b/bundles/admin/pom.xml index 0bd89bb80..1485e7f68 100644 --- a/bundles/admin/pom.xml +++ b/bundles/admin/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-osgi-bundles -6.4.0 +6.5.0-SNAPSHOT struts2-osgi-admin-bundle diff --git a/bundles/demo/pom.xml b/bundles/demo/pom.xml index f2b8399da..ad74c9648 100644 --- a/bundles/demo/pom.xml +++ b/bundles/demo/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-osgi-bundles -6.4.0 +6.5.0-SNAPSHOT struts2-osgi-demo-bundle diff --git a/bundles/pom.xml b/bundles/pom.xml index bce21ff1d..ebd7adbf3 100755 --- a/bundles/pom.xml +++ b/bundles/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -6.4.0 +6.5.0-SNAPSHOT struts2-osgi-bundles diff --git a/core/pom.xml b/cor
