(struts) branch merge-master-to-7xx-2024-01-20 updated (4c2ff3c15 -> 13bf91bf3)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch merge-master-to-7xx-2024-01-20 in repository https://gitbox.apache.org/repos/asf/struts.git omit 4c2ff3c15 Merge remote-tracking branch 'origin/master' into merge-master-to-7xx-2024-01-20 add 13bf91bf3 Merge remote-tracking branch 'origin/master' into merge-master-to-7xx-2024-01-20 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (4c2ff3c15) \ N -- N -- N refs/heads/merge-master-to-7xx-2024-01-20 (13bf91bf3) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java | 3 +-- pom.xml | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-)
(struts) branch merge-master-to-7xx-2024-01-20 deleted (was 13bf91bf3)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch merge-master-to-7xx-2024-01-20 in repository https://gitbox.apache.org/repos/asf/struts.git was 13bf91bf3 Merge remote-tracking branch 'origin/master' into merge-master-to-7xx-2024-01-20 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 release/struts-7-0-x updated (273eb1f6a -> 95ba165ff)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch release/struts-7-0-x in repository https://gitbox.apache.org/repos/asf/struts.git from 273eb1f6a Merge pull request #833 from apache/merge-master-to-7xx-2024-01-04 add fb7fec355 Stops cleaning nightlies to allow to coexist different versions add 9a0df704a Merge pull request #834 from apache/fix/do-not-clean add 32584c355 WW-5382 Fix StrutsInternalTestCase add 15acd72d2 WW-5382 Fix stale injections in Dispatcher add 2024d8317 WW-5382 Fix stale bootstrap context on ActionContext add 6f1e1222b WW-5382 Rework existing Dispatcher tests and base test classes add fa5b46c78 WW-5382 Add test for Dispatcher reinjection add ae71c464a WW-5382 Delete redundant code add 946737c81 WW-5382 Rework Dispatcher injections add 3d25caa0a WW-5382 Update Dispatcher#getContainer JavaDoc add 3b078995a Merge pull request #826 from apache/WW-5382-stale-config add c322abacb WW-5381 Introduce extension point for MethodAccessor add 573dbbcea WW-5381 Revert bean removal for backwards compatibility add d4a0b3b85 WW-5381 Reimplement ability to register additional MethodAccessors add 78e97a42e Merge branch 'master' into WW-5381-method-accessor add 503c8daa1 WW-5381 Remove unnecessary/confusing parameters add 3b76678c0 Merge pull request #825 from apache/WW-5381-method-accessor add 8a245e865 WW-5352 Refactor ParametersInterceptor add aa4398ee2 WW-5352 Do not use setter notation for helper methods add 199ea0db6 WW-5352 Rename acceptable name/value methods add ecd02de8b Merge pull request #831 from apache/WW-5352-parameter-annotation-2 add b9d072d18 Bump org.apache.maven.plugins:maven-release-plugin add 07cecbf63 Merge pull request #837 from apache/dependabot/maven/org.apache.maven.plugins-maven-release-plugin-3.0.1 add 5b020eb57 Reduces log level to debug to reduce noise in the logs add f5a7c31f2 Merge pull request #838 from apache/fix/debug-level add 55ca7a5b3 WW-5365 Reverts changes introduced in WW-5192 to allow evaluate the value attribute add d8dc720d4 Merge pull request #835 from apache/fix/WW-5365-radio-value add 686189c1b Bump actions/upload-artifact from 4.0.0 to 4.1.0 add 0a94b50bc Merge pull request #842 from apache/dependabot/github_actions/actions/upload-artifact-4.1.0 add 3c8fff46d WW-5352 Clean up OgnlValueStackTest add 9b5cb2d7b WW-5352 Move method to XWorkTestCase add bdcedc55b Merge pull request #841 from apache/WW-5352-ognlvaluestack add 96618ebbd Bump org.apache.commons:commons-compress from 1.23.0 to 1.25.0 add d0ac76b9a Merge pull request #820 from apache/dependabot/maven/org.apache.commons-commons-compress-1.25.0 add e9738698a WW-5387 Fixes remove() signature add fdd996c68 Merge pull request #844 from apache/fix/WW-5387-remove add 72f551f40 WW-5369 Re-define minimal library set add 5ee381182 Merge pull request #847 from apache/fix/WW-5369-min-lib add dc96c257d WW-5374 Allows to prepend reportUri with Servlet context add d5932f82f WW-5374 Uses @code instead of add 790c663dd WW-5374 Adds additional test case to cover disabling prepending context add 3a1a89a54 Merge pull request #845 from apache/fix/WW-5374-context add 9a6411c8c Extends sleep period to avoid breaking a build add dd0f0b05a Merge pull request #849 from apache/fix/longer-sleep add 3ec313aa0 WW-5357 Adds support for disabled attribute to anchor tag add a763071d2 Merge pull request #848 from apache/fix/WW-5357-disabled add 13bf91bf3 Merge remote-tracking branch 'origin/master' into merge-master-to-7xx-2024-01-20 add 95ba165ff Merge pull request #850 from apache/merge-master-to-7xx-2024-01-20 No new revisions were added by this update. Summary of changes: .github/workflows/scorecards-analysis.yaml | 2 +- Jenkinsfile| 23 +- assembly/src/main/assembly/min-lib.xml | 2 + .../opensymphony/xwork2/XWorkJUnit4TestCase.java | 4 - .../com/opensymphony/xwork2/XWorkTestCase.java | 14 +- .../xwork2/config/impl/DefaultConfiguration.java | 11 +- .../StrutsDefaultConfigurationProvider.java| 4 - .../xwork2/ognl/OgnlValueStackFactory.java | 75 +++- .../xwork2/security/AcceptedPatternsChecker.java | 12 +- .../xwork2/security/ExcludedPatternsChecker.java | 12 +- .../java/org/apache/struts2/StrutsConstants.java | 3 + .../java/org/apache/struts2/components/Radio.java | 8 - .../config/StrutsBeanSelectionProvider.java| 2 + .../apache/struts2/dispatcher/ApplicationMap.java | 9 +- .../apache/struts2/dispatcher/ContainerHolder.java | 12 +- .../org/apache/struts2/dispatcher/Dispatcher.java | 159 --- .../struts2/dispatcher/ExecuteOperations.java | 4 +- .../apache/struts2/dispat
(struts) branch release/struts-7-0-x updated (95ba165ff -> f102bdd5a)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch release/struts-7-0-x in repository https://gitbox.apache.org/repos/asf/struts.git from 95ba165ff Merge pull request #850 from apache/merge-master-to-7xx-2024-01-20 add f102bdd5a Fixes wrong version in BOM No new revisions were added by this update. Summary of changes: bom/pom.xml | 4 ++-- pom.xml | 17 - 2 files changed, 10 insertions(+), 11 deletions(-)
(struts) branch release/struts-7-0-x updated (f102bdd5a -> f055f4f67)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch release/struts-7-0-x in repository https://gitbox.apache.org/repos/asf/struts.git discard f102bdd5a Fixes wrong version in BOM add f055f4f67 Fixes wrong version in BOM This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (f102bdd5a) \ N -- N -- N refs/heads/release/struts-7-0-x (f055f4f67) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
(struts) 02/04: Cleans up assembly definitions
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch release/struts-7-0-x in repository https://gitbox.apache.org/repos/asf/struts.git commit bfc5ddba22c6603114025dd14c5f0779960b1ebe Author: Lukasz Lenart AuthorDate: Sat Jan 20 11:23:38 2024 +0100 Cleans up assembly definitions --- assembly/src/main/assembly/all.xml | 400 ++-- assembly/src/main/assembly/apps.xml | 7 - assembly/src/main/assembly/docs.xml | 34 ++- assembly/src/main/assembly/lib.xml | 7 - assembly/src/main/assembly/src.xml | 16 -- 5 files changed, 214 insertions(+), 250 deletions(-) diff --git a/assembly/src/main/assembly/all.xml b/assembly/src/main/assembly/all.xml index e5cfe339d..5642d0b0e 100644 --- a/assembly/src/main/assembly/all.xml +++ b/assembly/src/main/assembly/all.xml @@ -23,206 +23,210 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd";> - all - -zip - - - - false - lib - runtime - -junit:junit -org.testng:testng - - - - - -src/main/resources - - -README* -LICENSE* -NOTICE* - - - - ../core/src/main/resources - - -FREEMARKER-LICENSE.txt -OGNL-LICENSE.txt - - - - ../plugins/rest/src/main/resources - - -XSTREAM-LICENSE.txt -XPP3-LICENSE.txt - - - - ../plugins/sitemesh/src/main/resources - - -SITEMESH-LICENSE.txt - - - - target/apps - apps - -*.war - - +all + +zip + + + +false +lib +runtime + +junit:junit +org.testng:testng + + + + + +src/main/resources + + +README* +LICENSE* +NOTICE* + + + +../core/src/main/resources + + +FREEMARKER-LICENSE.txt +OGNL-LICENSE.txt + + + +../plugins/rest/src/main/resources + + +XSTREAM-LICENSE.txt +XPP3-LICENSE.txt + + + +../plugins/sitemesh/src/main/resources + + +SITEMESH-LICENSE.txt + + + +target/apps +apps + +*.war + + - - -../core/target/site -docs/struts2-core - - -../core/target/apidocs -docs/struts2-core-apidocs - + + +../core/target/site +docs/struts2-core + + +../core/target/apidocs +docs/struts2-core-apidocs + - - -target/docs -docs/docs - + + +target/docs +docs/docs + - - - -../plugins/bean-validation/target/apidocs - docs/struts2-plugins/struts2-bean-validation/apidocs - - -../plugins/cdi/target/apidocs - docs/struts2-plugins/struts2-cdi-plugin/apidocs - - -../plugins/config-browser/target/apidocs - docs/struts2-plugins/struts2-config-browser-plugin/apidocs - - -../plugins/convention/target/apidocs - docs/struts2-plugins/struts2-convention-plugin/apidocs - - -../plugins/jasperreports/target/apidocs - docs/struts2-plugins/struts2-jasperreports-plugin/apidocs - - -../plugins/javatemplates/target/apidocs - docs/struts2-plugins/struts2-javatemplates-plugin/apidocs - - -../plugins/jfreechart/target/apidocs - docs/struts2-plugins/struts2-jfreechart-plugin/apidocs - - -../plugins/json/target/apidocs - docs/struts2-plugins/struts2-json-plugin/apidocs - - -../plugins/junit/target/apidocs - docs/struts2-plugins/struts2-junit-plugin/apidocs - - -../plugins/plexus/target/apidocs - docs/struts2-plugins/struts2-plexus-plugin/apidocs - - -../plugins/rest/target/apidocs - docs/struts2-plugins/struts2-rest-plugin/apidocs - - -../plugins/sitemesh/target/apidocs - docs/struts2-plugins/struts2-sitemesh-plugin/apidocs - - -../plugins/spring/target/apidocs - docs/struts2-plugins/struts2-spring-plugin/apidocs - - -../plugins/testng/targe
(struts) branch release/struts-7-0-x updated (f055f4f67 -> cd3389ab3)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch release/struts-7-0-x in repository https://gitbox.apache.org/repos/asf/struts.git from f055f4f67 Fixes wrong version in BOM new e7259ba00 Configure assembly plugin to use proper folders new bfc5ddba2 Cleans up assembly definitions new 7c375cd0b Configures source-release assembly https://maven.apache.org/apache-resource-bundles/source-release/ new cd3389ab3 [maven-release-plugin] prepare release STRUTS_7_0_0_M1 The 4 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: apps/pom.xml| 2 +- apps/rest-showcase/pom.xml | 4 +- apps/showcase/pom.xml | 2 +- assembly/pom.xml| 4 +- assembly/src/main/assembly/all.xml | 400 ++-- assembly/src/main/assembly/apps.xml | 7 - assembly/src/main/assembly/docs.xml | 34 +-- assembly/src/main/assembly/lib.xml | 7 - assembly/src/main/assembly/src.xml | 16 -- bom/pom.xml | 8 +- core/pom.xml| 5 +- jakarta/freemarker-jakarta/pom.xml | 6 +- jakarta/pom.xml | 6 +- jakarta/sitemesh2-jakarta/pom.xml | 6 +- jakarta/velocity-tools-jsp-jakarta/pom.xml | 6 +- jakarta/velocity-tools-view-jakarta/pom.xml | 6 +- 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/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/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 | 16 +- 35 files changed, 266 insertions(+), 305 deletions(-)
(struts) 03/04: Configures source-release assembly https://maven.apache.org/apache-resource-bundles/source-release/
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch release/struts-7-0-x in repository https://gitbox.apache.org/repos/asf/struts.git commit 7c375cd0b5e89d274bec451c864b782091ff6ba7 Author: Lukasz Lenart AuthorDate: Sat Jan 20 11:27:19 2024 +0100 Configures source-release assembly https://maven.apache.org/apache-resource-bundles/source-release/ --- pom.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pom.xml b/pom.xml index 207a92d13..917ba09a7 100644 --- a/pom.xml +++ b/pom.xml @@ -376,6 +376,8 @@ org.apache.maven.plugins maven-assembly-plugin +true +true assembly/out assembly/work
(struts) 01/04: Configure assembly plugin to use proper folders
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch release/struts-7-0-x
in repository https://gitbox.apache.org/repos/asf/struts.git
commit e7259ba001b335d30d043f2f864b39a873dd1665
Author: Lukasz Lenart
AuthorDate: Sat Jan 20 11:10:06 2024 +0100
Configure assembly plugin to use proper folders
---
assembly/pom.xml | 2 --
pom.xml | 8
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 2c5209364..44f044bd2 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -124,8 +124,6 @@
src/main/assembly/docs.xml
struts-${project.version}
-target/assembly/out
-target/assembly/work
diff --git a/pom.xml b/pom.xml
index 9f8875107..207a92d13 100644
--- a/pom.xml
+++ b/pom.xml
@@ -372,6 +372,14 @@
maven-wrapper-plugin
3.1.0
+
+org.apache.maven.plugins
+maven-assembly-plugin
+
+assembly/out
+assembly/work
+
+
(struts) 04/04: [maven-release-plugin] prepare release STRUTS_7_0_0_M1
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch release/struts-7-0-x in repository https://gitbox.apache.org/repos/asf/struts.git commit cd3389ab351ccb10c7ac9038f2d48e94a466a634 Author: Lukasz Lenart AuthorDate: Sat Jan 20 11:38:59 2024 +0100 [maven-release-plugin] prepare release STRUTS_7_0_0_M1 --- apps/pom.xml| 2 +- apps/rest-showcase/pom.xml | 4 ++-- apps/showcase/pom.xml | 2 +- assembly/pom.xml| 2 +- bom/pom.xml | 8 core/pom.xml| 5 ++--- jakarta/freemarker-jakarta/pom.xml | 6 ++ jakarta/pom.xml | 6 ++ jakarta/sitemesh2-jakarta/pom.xml | 6 ++ jakarta/velocity-tools-jsp-jakarta/pom.xml | 6 ++ jakarta/velocity-tools-view-jakarta/pom.xml | 6 ++ 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/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/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 +++--- 30 files changed, 42 insertions(+), 53 deletions(-) diff --git a/apps/pom.xml b/apps/pom.xml index b87c6bb99..b24ecc856 100644 --- a/apps/pom.xml +++ b/apps/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -7.0.0-SNAPSHOT +7.0.0-M1 struts2-apps pom diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml index 9a950949c..f08d97998 100644 --- a/apps/rest-showcase/pom.xml +++ b/apps/rest-showcase/pom.xml @@ -24,12 +24,12 @@ org.apache.struts struts2-apps -7.0.0-SNAPSHOT +7.0.0-M1 struts2-rest-showcase war -7.0.0-SNAPSHOT +7.0.0-M1 Struts 2 Rest Showcase Webapp Struts 2 Rest Showcase Example diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml index d715790cd..68b34a4e8 100644 --- a/apps/showcase/pom.xml +++ b/apps/showcase/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-apps -7.0.0-SNAPSHOT +7.0.0-M1 struts2-showcase diff --git a/assembly/pom.xml b/assembly/pom.xml index 44f044bd2..aed6edb14 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -7.0.0-SNAPSHOT +7.0.0-M1 struts2-assembly diff --git a/bom/pom.xml b/bom/pom.xml index d3b622ebc..c2ccf92c1 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -25,11 +25,11 @@ org.apache.struts struts2-parent -7.0.0-SNAPSHOT +7.0.0-M1 struts2-bom -7.0.0-SNAPSHOT +7.0.0-M1 pom Struts 2 Bill of Materials @@ -44,7 +44,7 @@ -7.0.0-SNAPSHOT +7.0.0-M1 true true @@ -165,7 +165,7 @@ -HEAD +STRUTS_7_0_0_M1 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/core/pom.xml b/core/pom.xml index 8027faaf6..dd95636d9 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -19,13 +19,12 @@ * 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 http://maven.apache.org/maven-v4_0_0.xsd";> 4.0.0 org.apache.struts struts2-parent -7.0.0-SNAPSHOT +7.0.0-M1 struts2-core jar diff --git a/jakarta/freemarker-jakarta/pom.xml b/jakarta/freemarker-jakarta/pom.xml index 613124324..5174b86fb 100644 --- a/jakarta/freemarker-jakarta/pom.xml +++ b/jakarta/freemarker-jakarta/pom.xml @@ -19,14 +19,12 @@ * under the License. */ --> -http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema
(struts) annotated tag STRUTS_7_0_0_M1 created (now 407f04715)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to annotated tag STRUTS_7_0_0_M1 in repository https://gitbox.apache.org/repos/asf/struts.git at 407f04715 (tag) tagging cd3389ab351ccb10c7ac9038f2d48e94a466a634 (commit) replaces STRUTS_6_3_0_1 by Lukasz Lenart on Sat Jan 20 11:39:04 2024 +0100 - Log - [maven-release-plugin] copy for tag STRUTS_7_0_0_M1 --- No new revisions were added by this update.
(struts) branch release/struts-7-0-x 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 release/struts-7-0-x in repository https://gitbox.apache.org/repos/asf/struts.git The following commit(s) were added to refs/heads/release/struts-7-0-x by this push: new 00533db15 [maven-release-plugin] prepare for next development iteration 00533db15 is described below commit 00533db153d6366ea31533d323610d980a3fbb2c Author: Lukasz Lenart AuthorDate: Sat Jan 20 11:39:08 2024 +0100 [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 core/pom.xml| 2 +- jakarta/freemarker-jakarta/pom.xml | 2 +- jakarta/pom.xml | 2 +- jakarta/sitemesh2-jakarta/pom.xml | 2 +- jakarta/velocity-tools-jsp-jakarta/pom.xml | 2 +- jakarta/velocity-tools-view-jakarta/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/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/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 +++--- 30 files changed, 36 insertions(+), 36 deletions(-) diff --git a/apps/pom.xml b/apps/pom.xml index b24ecc856..50ee4d2be 100644 --- a/apps/pom.xml +++ b/apps/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -7.0.0-M1 +7.0.0-M2-SNAPSHOT struts2-apps pom diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml index f08d97998..bfffcdc6f 100644 --- a/apps/rest-showcase/pom.xml +++ b/apps/rest-showcase/pom.xml @@ -24,12 +24,12 @@ org.apache.struts struts2-apps -7.0.0-M1 +7.0.0-M2-SNAPSHOT struts2-rest-showcase war -7.0.0-M1 +7.0.0-M2-SNAPSHOT Struts 2 Rest Showcase Webapp Struts 2 Rest Showcase Example diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml index 68b34a4e8..6f0fd9596 100644 --- a/apps/showcase/pom.xml +++ b/apps/showcase/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-apps -7.0.0-M1 +7.0.0-M2-SNAPSHOT struts2-showcase diff --git a/assembly/pom.xml b/assembly/pom.xml index aed6edb14..4f5ff0955 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -7.0.0-M1 +7.0.0-M2-SNAPSHOT struts2-assembly diff --git a/bom/pom.xml b/bom/pom.xml index c2ccf92c1..7ac1707a8 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -25,11 +25,11 @@ org.apache.struts struts2-parent -7.0.0-M1 +7.0.0-M2-SNAPSHOT struts2-bom -7.0.0-M1 +7.0.0-M2-SNAPSHOT pom Struts 2 Bill of Materials @@ -44,7 +44,7 @@ -7.0.0-M1 +7.0.0-M2-SNAPSHOT true true @@ -165,7 +165,7 @@ -STRUTS_7_0_0_M1 +HEAD 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/core/pom.xml b/core/pom.xml index dd95636d9..b4dd4b69c 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -7.0.0-M1 +7.0.0-M2-SNAPSHOT struts2-core jar diff --git a/jakarta/freemarker-jakarta/pom.xml b/jakarta/freemarker-jakarta/pom.xml index 5174b86fb..faed51f6e 100644 --- a/jakarta/freemarker-jakarta/pom.xml +++ b/jakarta/freemarker-jakarta/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-jakarta -7.0.0-M1 +7.0.0-M2-SNAPSHOT struts2-freemarker-jakarta jar diff --git a/jakarta/pom.xml b/jakarta/pom.xml index 2ba0c43a3..3f3a6777e 100644 --- a/jakarta/pom.xml +++ b/jakarta/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -
svn commit: r66717 - in /dev/struts/7.0.0-M1: *.zip.sha256 *.zip.sha512 ./
Author: lukaszlenart Date: Sat Jan 20 10:56:38 2024 New Revision: 66717 Log: Updates test release 7.0.0-M1 Added: dev/struts/7.0.0-M1/ dev/struts/7.0.0-M1/*.zip.sha256 dev/struts/7.0.0-M1/*.zip.sha512 Added: dev/struts/7.0.0-M1/*.zip.sha256 == (empty) Added: dev/struts/7.0.0-M1/*.zip.sha512 == (empty)
svn commit: r66718 - /dev/struts/7.0.0-M1/
Author: lukaszlenart Date: Sat Jan 20 10:59:07 2024 New Revision: 66718 Log: Drops wrong dist Removed: dev/struts/7.0.0-M1/
(struts) branch release/struts-7-0-x updated (00533db15 -> 77acd665e)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch release/struts-7-0-x in repository https://gitbox.apache.org/repos/asf/struts.git from 00533db15 [maven-release-plugin] prepare for next development iteration add 54a7c7094 Upgrade maven to 3.9.6 and wrapper to 3.2.0 add 77acd665e Merge pull request #851 from sepe81/feature/upgrade-maven-to-3.9.6 No new revisions were added by this update. Summary of changes: .mvn/wrapper/MavenWrapperDownloader.java | 117 - .mvn/wrapper/maven-wrapper.properties| 8 +- mvnw | 218 +++ mvnw.cmd | 31 - pom.xml | 7 +- 5 files changed, 134 insertions(+), 247 deletions(-) delete mode 100644 .mvn/wrapper/MavenWrapperDownloader.java
