(struts) branch feature/WW-5512-optional-inject-s7 updated (043ef3821 -> 358f80856)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/WW-5512-optional-inject-s7 in repository https://gitbox.apache.org/repos/asf/struts.git discard 043ef3821 WW-5512 Extends the container to support injecting optional parameters into constructor add 358f80856 WW-5512 Extends the container to support injecting optional parameters into constructor 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 (043ef3821) \ N -- N -- N refs/heads/feature/WW-5512-optional-inject-s7 (358f80856) 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: .../main/java/org/apache/struts2/inject/ContainerImpl.java | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-)
(struts) branch fix/proper-version created (now 6de93e77d)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch fix/proper-version in repository https://gitbox.apache.org/repos/asf/struts.git at 6de93e77d Defines proper snapshot version This branch includes the following new commits: new 6de93e77d Defines proper snapshot version 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: Defines proper snapshot version
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch fix/proper-version in repository https://gitbox.apache.org/repos/asf/struts.git commit 6de93e77dbe78eeb9577e8e8c6f87e591e3cb4fb Author: Lukasz Lenart AuthorDate: Fri Jan 24 07:58:39 2025 +0100 Defines proper snapshot version --- 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 | 4 ++-- 39 files changed, 42 insertions(+), 42 deletions(-) diff --git a/apps/pom.xml b/apps/pom.xml index 5df8e300f..acbf24d68 100644 --- a/apps/pom.xml +++ b/apps/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -6.7.1-SNASPHOT +6.7.1-SNAPSHOT struts2-apps pom diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml index f1c6b7c41..ac2464dbe 100644 --- a/apps/rest-showcase/pom.xml +++ b/apps/rest-showcase/pom.xml @@ -24,12 +24,12 @@ org.apache.struts struts2-apps -6.7.1-SNASPHOT +6.7.1-SNAPSHOT struts2-rest-showcase war -6.7.1-SNASPHOT +6.7.1-SNAPSHOT Struts 2 Rest Showcase Webapp Struts 2 Rest Showcase Example diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml index 8bd13b58b..65e01f559 100644 --- a/apps/showcase/pom.xml +++ b/apps/showcase/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-apps -6.7.1-SNASPHOT +6.7.1-SNAPSHOT struts2-showcase diff --git a/assembly/pom.xml b/assembly/pom.xml index 8dd14f6f7..55fc648f7 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -6.7.1-SNASPHOT +6.7.1-SNAPSHOT struts2-assembly diff --git a/bom/pom.xml b/bom/pom.xml index 206b04756..09d4daf40 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -25,11 +25,11 @@ org.apache.struts struts2-parent -6.7.1-SNASPHOT +6.7.1-SNAPSHOT struts2-bom -6.7.1-SNASPHOT +6.7.1-SNAPSHOT pom Struts 2 Bill of Materials diff --git a/bundles/admin/pom.xml b/bundles/admin/pom.xml index e9a7b5927..5ff189848 100644 --- a/bundles/admin/pom.xml +++ b/bundles/admin/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-osgi-bundles -6.7.1-SNASPHOT +6.7.1-SNAPSHOT struts2-osgi-admin-bundle diff --git a/bundles/demo/pom.xml b/bundles/demo/pom.xml index 70885e2fd..bbd051da3 100644 --- a/bundles/demo/pom.xml +++ b/bundles/demo/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-osgi-bundles -6.7.1-SNASPHOT +6.7.1-SNAPSHOT struts2-osgi-demo-bundle diff --git a/bundles/pom.xml b/bundles/pom.xml index 1f399e3cf..7d346e6ee 100755 --- a/bundles/pom.xml +++ b/bundles/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -6.7.1-SNASPHOT +6.7.1-SNAPSHOT struts2-osgi-bundles diff --git a/core/pom.xml b/core/pom.xml index fc6609b67..cc71d6319 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -6.7.1-SNASPHOT +6.7.1-SNAPSHOT struts2-core jar diff --git a/plugins/async/pom.xml b/plugins/async/pom.xml index 1e6b88047..ed8662675 100644 --- a/plugins/async/pom.xml +++ b/plugins/async/pom.xml @@ -24,7 +24,7 @@ org.apache.struts stru
(struts) 01/01: Merge pull request #1195 from apache/fix/proper-version
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch release/struts-6-7-x in repository https://gitbox.apache.org/repos/asf/struts.git commit 959b2182b20e737375f92c176cd6eb812eca0141 Merge: 59dc9301e 6de93e77d Author: Lukasz Lenart AuthorDate: Fri Jan 24 08:28:32 2025 +0100 Merge pull request #1195 from apache/fix/proper-version Defines proper snapshot version 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 | 4 ++-- 39 files changed, 42 insertions(+), 42 deletions(-)
(struts) branch fix/proper-version deleted (was 6de93e77d)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch fix/proper-version in repository https://gitbox.apache.org/repos/asf/struts.git was 6de93e77d Defines proper snapshot version 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-6-7-x updated (59dc9301e -> 959b2182b)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch release/struts-6-7-x in repository https://gitbox.apache.org/repos/asf/struts.git from 59dc9301e Merge pull request #1194 from apache/fix/jenkinsfile-67x add 6de93e77d Defines proper snapshot version new 959b2182b Merge pull request #1195 from apache/fix/proper-version 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: 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 | 4 ++-- 39 files changed, 42 insertions(+), 42 deletions(-)
