svn commit: r68641 - /dev/struts/7.0.0-M4/
Author: lukaszlenart Date: Fri Apr 19 07:00:43 2024 New Revision: 68641 Log: Updates test release 7.0.0-M4 Added: dev/struts/7.0.0-M4/
svn commit: r68642 - /dev/struts/7.0.0-M4/
Author: lukaszlenart Date: Fri Apr 19 07:02:00 2024 New Revision: 68642 Log: Drops broke release Removed: dev/struts/7.0.0-M4/
(struts) branch release/struts-7-0-x updated (8b9173469 -> b3e5c2429)
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 8b9173469 [maven-release-plugin] prepare for next development iteration add b3e5c2429 Fixes after merge assembly issue No new revisions were added by this update. Summary of changes: assembly/pom.xml | 3 ++- pom.xml | 11 --- 2 files changed, 2 insertions(+), 12 deletions(-)
(struts) branch master updated (431053679 -> 63267a8e0)
This is an automated email from the ASF dual-hosted git repository.
kusal pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git
from 431053679 Merge pull request #917 from apache/WW-5406-injection-order
add bf5f29132 WW-5409 introduce final attribute to package element which
make them unextendable
add 4088f2ee2 WW-5409 update new dtd from 6.4.0 to 6.5.0
add 85783a0cc WW-5409 rename 6.5.0.dtd to 6.5.dtd to follow the naming
pattern
add 63267a8e0 Merge pull request #914 from
atlassian-forks/issue/WW-5409-introduce-final-attribute-to-package-element
No new revisions were added by this update.
Summary of changes:
.../xwork2/config/entities/PackageConfig.java | 13 +
.../providers/XmlDocConfigurationProvider.java | 25 +---
.../config/StrutsXmlConfigurationProvider.java | 1 +
.../resources/{struts-6.0.dtd => struts-6.5.dtd} | 5 +-
.../XmlConfigurationProviderPackagesTest.java | 68 ++
.../xwork-test-package-extends-final.xml} | 14 +++--
.../config/providers/xwork-test-package-final.xml} | 14 +++--
7 files changed, 109 insertions(+), 31 deletions(-)
copy core/src/main/resources/{struts-6.0.dtd => struts-6.5.dtd} (96%)
copy core/src/test/resources/{struts-checkbox-submit-unchecked.xml =>
com/opensymphony/xwork2/config/providers/xwork-test-package-extends-final.xml}
(66%)
copy core/src/test/resources/{struts-checkbox-submit-unchecked.xml =>
com/opensymphony/xwork2/config/providers/xwork-test-package-final.xml} (65%)
(struts) branch master updated (63267a8e0 -> f5cfb88f1)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/struts.git from 63267a8e0 Merge pull request #914 from atlassian-forks/issue/WW-5409-introduce-final-attribute-to-package-element add 0a720971c WW-5417 bump ognl version to fix security issue add 62b4b65c4 WW-5417 update ognl.version as 3.3.5 add f5cfb88f1 Merge pull request #915 from atlassian-forks/issue/WW-5417-bump-ongl-version-to-fix-security-issue No new revisions were added by this update. Summary of changes: .../struts2/ognl/OgnlSetPossiblePropertyTest.java | 240 + pom.xml| 2 +- 2 files changed, 241 insertions(+), 1 deletion(-) create mode 100644 core/src/test/java/org/apache/struts2/ognl/OgnlSetPossiblePropertyTest.java
(struts) branch main created (now f5cfb88f1)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/struts.git at f5cfb88f1 Merge pull request #915 from atlassian-forks/issue/WW-5417-bump-ongl-version-to-fix-security-issue No new revisions were added by this update.
(struts) branch main deleted (was f5cfb88f1)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/struts.git was f5cfb88f1 Merge pull request #915 from atlassian-forks/issue/WW-5417-bump-ongl-version-to-fix-security-issue 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 (b3e5c2429 -> ce7671568)
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 omit b3e5c2429 Fixes after merge assembly issue add ce7671568 Fixes after merge assembly issue 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 (b3e5c2429) \ N -- N -- N refs/heads/release/struts-7-0-x (ce7671568) 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: assembly/pom.xml | 4 +- .../admin/src/main/resources/osgi/admin/shell.ftl | 0 core/pom.xml | 45 -- pom.xml| 9 + 4 files changed, 11 insertions(+), 47 deletions(-) delete mode 100644 bundles/admin/src/main/resources/osgi/admin/shell.ftl
(struts) annotated tag STRUTS_7_0_0_M5 created (now 27d8e9e15)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to annotated tag STRUTS_7_0_0_M5 in repository https://gitbox.apache.org/repos/asf/struts.git at 27d8e9e15 (tag) tagging 4acb0d16da729e783bc4fdd763863f44116eb92c (commit) replaces STRUTS_7_0_0_M4 by Lukasz Lenart on Fri Apr 19 20:59:56 2024 +0200 - Log - [maven-release-plugin] copy for tag STRUTS_7_0_0_M5 --- No new revisions were added by this update.
(struts) branch release/struts-7-0-x updated: [maven-release-plugin] prepare release STRUTS_7_0_0_M5
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 4acb0d16d [maven-release-plugin] prepare release STRUTS_7_0_0_M5 4acb0d16d is described below commit 4acb0d16da729e783bc4fdd763863f44116eb92c Author: Lukasz Lenart AuthorDate: Fri Apr 19 20:59:51 2024 +0200 [maven-release-plugin] prepare release STRUTS_7_0_0_M5 --- 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 f02b21a10..091238706 100644 --- a/apps/pom.xml +++ b/apps/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -7.0.0-M5-SNAPSHOT +7.0.0-M5 struts2-apps pom diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml index 218b676b3..762f0f543 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-M5-SNAPSHOT +7.0.0-M5 struts2-rest-showcase war -7.0.0-M5-SNAPSHOT +7.0.0-M5 Struts 2 Rest Showcase Webapp Struts 2 Rest Showcase Example diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml index 867dac867..bbe515f76 100644 --- a/apps/showcase/pom.xml +++ b/apps/showcase/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-apps -7.0.0-M5-SNAPSHOT +7.0.0-M5 struts2-showcase diff --git a/assembly/pom.xml b/assembly/pom.xml index 2654b1c4c..b10d31ab4 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -7.0.0-M5-SNAPSHOT +7.0.0-M5 struts2-assembly diff --git a/bom/pom.xml b/bom/pom.xml index e4e96f59a..de2bdf837 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -25,11 +25,11 @@ org.apache.struts struts2-parent -7.0.0-M5-SNAPSHOT +7.0.0-M5 struts2-bom -7.0.0-M5-SNAPSHOT +7.0.0-M5 pom Struts 2 Bill of Materials @@ -44,7 +44,7 @@ -7.0.0-M5-SNAPSHOT +7.0.0-M5 true true @@ -165,7 +165,7 @@ -HEAD +STRUTS_7_0_0_M5 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 5dc84bf39..4a6ce770f 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -7.0.0-M5-SNAPSHOT +7.0.0-M5 struts2-core jar diff --git a/jakarta/freemarker-jakarta/pom.xml b/jakarta/freemarker-jakarta/pom.xml index ea6da0bf7..759329348 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-M5-SNAPSHOT +7.0.0-M5 struts2-freemarker-jakarta jar diff --git a/jakarta/pom.xml b/jakarta/pom.xml index d3acd71c7..165066f05 100644 --- a/jakarta/pom.xml +++ b/jakarta/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -7.0.0-M5-SNAP
(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 549c3bc98 [maven-release-plugin] prepare for next development iteration 549c3bc98 is described below commit 549c3bc989c43f83caadeb94651b1f15a5b7176f Author: Lukasz Lenart AuthorDate: Fri Apr 19 21:00:01 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 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 091238706..787c3ec93 100644 --- a/apps/pom.xml +++ b/apps/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -7.0.0-M5 +7.0.0-M6-SNAPSHOT struts2-apps pom diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml index 762f0f543..3b2a7ac6c 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-M5 +7.0.0-M6-SNAPSHOT struts2-rest-showcase war -7.0.0-M5 +7.0.0-M6-SNAPSHOT Struts 2 Rest Showcase Webapp Struts 2 Rest Showcase Example diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml index bbe515f76..900a3ae8c 100644 --- a/apps/showcase/pom.xml +++ b/apps/showcase/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-apps -7.0.0-M5 +7.0.0-M6-SNAPSHOT struts2-showcase diff --git a/assembly/pom.xml b/assembly/pom.xml index b10d31ab4..8aa56982b 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -7.0.0-M5 +7.0.0-M6-SNAPSHOT struts2-assembly diff --git a/bom/pom.xml b/bom/pom.xml index de2bdf837..25303221b 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -25,11 +25,11 @@ org.apache.struts struts2-parent -7.0.0-M5 +7.0.0-M6-SNAPSHOT struts2-bom -7.0.0-M5 +7.0.0-M6-SNAPSHOT pom Struts 2 Bill of Materials @@ -44,7 +44,7 @@ -7.0.0-M5 +7.0.0-M6-SNAPSHOT true true @@ -165,7 +165,7 @@ -STRUTS_7_0_0_M5 +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 4a6ce770f..fdba1e65a 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -7.0.0-M5 +7.0.0-M6-SNAPSHOT struts2-core jar diff --git a/jakarta/freemarker-jakarta/pom.xml b/jakarta/freemarker-jakarta/pom.xml index 759329348..c80a01740 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-M5 +7.0.0-M6-SNAPSHOT struts2-freemarker-jakarta jar diff --git a/jakarta/pom.xml b/jakarta/pom.xml index 165066f05..1613769ae 100644 --- a/jakarta/pom.xml +++ b/jakarta/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -
