(struts) branch dependabot/github_actions/actions/upload-artifact-4.6.1 deleted (was 744b29266)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch dependabot/github_actions/actions/upload-artifact-4.6.1 in repository https://gitbox.apache.org/repos/asf/struts.git was 744b29266 Bump actions/upload-artifact from 4.6.0 to 4.6.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) branch main updated: Bump github/codeql-action from 3.28.9 to 3.28.10 (#1228)
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/struts.git
The following commit(s) were added to refs/heads/main by this push:
new 31cb558fc Bump github/codeql-action from 3.28.9 to 3.28.10 (#1228)
31cb558fc is described below
commit 31cb558fc60681a03b9b8fc8c3e8878a02ac2fc7
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Tue Feb 25 07:00:00 2025 +0100
Bump github/codeql-action from 3.28.9 to 3.28.10 (#1228)
Bumps [github/codeql-action](https://github.com/github/codeql-action) from
3.28.9 to 3.28.10.
- [Release notes](https://github.com/github/codeql-action/releases)
-
[Commits](https://github.com/github/codeql-action/compare/v3.28.9...v3.28.10)
---
updated-dependencies:
- dependency-name: github/codeql-action
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot]
<49699333+dependabot[bot]@users.noreply.github.com>
---
.github/workflows/codeql.yml | 6 +++---
.github/workflows/scorecards-analysis.yaml | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 91c989a01..608839b01 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -52,12 +52,12 @@ jobs:
java-version: 17
cache: 'maven'
- name: Initialize CodeQL
- uses: github/codeql-action/init@v3.28.9
+ uses: github/codeql-action/init@v3.28.10
with:
languages: ${{ matrix.language }}
- name: Autobuild
- uses: github/codeql-action/autobuild@v3.28.9
+ uses: github/codeql-action/autobuild@v3.28.10
- name: Perform CodeQL Analysis
- uses: github/codeql-action/analyze@v3.28.9
+ uses: github/codeql-action/analyze@v3.28.10
with:
category: "/language:${{matrix.language}}"
diff --git a/.github/workflows/scorecards-analysis.yaml
b/.github/workflows/scorecards-analysis.yaml
index 0e364235f..db2a51a7e 100644
--- a/.github/workflows/scorecards-analysis.yaml
+++ b/.github/workflows/scorecards-analysis.yaml
@@ -65,6 +65,6 @@ jobs:
retention-days: 5
- name: "Upload to code-scanning"
-uses:
github/codeql-action/upload-sarif@0a35e8f6866a39b001e5f7ad1d0daf9836786896#
2.22.11
+uses:
github/codeql-action/upload-sarif@ff79de67cc25c7617163ae1e4b8aa23b902fdf15#
2.22.11
with:
sarif_file: results.sarif
(struts) branch main updated: Bump actions/upload-artifact from 4.6.0 to 4.6.1 (#1227)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/struts.git The following commit(s) were added to refs/heads/main by this push: new 8b66b575a Bump actions/upload-artifact from 4.6.0 to 4.6.1 (#1227) 8b66b575a is described below commit 8b66b575a1adcb5b1332b41fd80e600e9e7912d7 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Tue Feb 25 06:59:24 2025 +0100 Bump actions/upload-artifact from 4.6.0 to 4.6.1 (#1227) Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.6.0 to 4.6.1. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08...4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/scorecards-analysis.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scorecards-analysis.yaml b/.github/workflows/scorecards-analysis.yaml index 1e94b8152..0e364235f 100644 --- a/.github/workflows/scorecards-analysis.yaml +++ b/.github/workflows/scorecards-analysis.yaml @@ -58,7 +58,7 @@ jobs: publish_results: true - name: "Upload artifact" -uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # 4.6.0 +uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # 4.6.1 with: name: SARIF file path: results.sarif
(struts) branch main updated: Bump ossf/scorecard-action from 2.4.0 to 2.4.1 (#1229)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/struts.git The following commit(s) were added to refs/heads/main by this push: new 84cf66604 Bump ossf/scorecard-action from 2.4.0 to 2.4.1 (#1229) 84cf66604 is described below commit 84cf66604108232dd36865b1ba5dee4b51aa113b Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Tue Feb 25 07:00:25 2025 +0100 Bump ossf/scorecard-action from 2.4.0 to 2.4.1 (#1229) Bumps [ossf/scorecard-action](https://github.com/ossf/scorecard-action) from 2.4.0 to 2.4.1. - [Release notes](https://github.com/ossf/scorecard-action/releases) - [Changelog](https://github.com/ossf/scorecard-action/blob/main/RELEASE.md) - [Commits](https://github.com/ossf/scorecard-action/compare/62b2cac7ed8198b15735ed49ab1e5cf35480ba46...f49aabe0b5af0936a0987cfb85d86b75731b0186) --- updated-dependencies: - dependency-name: ossf/scorecard-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/scorecards-analysis.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scorecards-analysis.yaml b/.github/workflows/scorecards-analysis.yaml index db2a51a7e..8fbf60f9a 100644 --- a/.github/workflows/scorecards-analysis.yaml +++ b/.github/workflows/scorecards-analysis.yaml @@ -46,7 +46,7 @@ jobs: persist-credentials: false - name: "Run analysis" -uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46 # 2.4.0 +uses: ossf/scorecard-action@f49aabe0b5af0936a0987cfb85d86b75731b0186 # 2.4.1 with: results_file: results.sarif results_format: sarif
(struts) branch dependabot/github_actions/ossf/scorecard-action-2.4.1 deleted (was 50376a7e1)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch dependabot/github_actions/ossf/scorecard-action-2.4.1 in repository https://gitbox.apache.org/repos/asf/struts.git was 50376a7e1 Bump ossf/scorecard-action from 2.4.0 to 2.4.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) branch dependabot/github_actions/github/codeql-action-3.28.10 deleted (was 872491900)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch dependabot/github_actions/github/codeql-action-3.28.10 in repository https://gitbox.apache.org/repos/asf/struts.git was 872491900 Bump github/codeql-action from 3.28.9 to 3.28.10 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 WW-5376-bom-fix updated (e31b33329 -> b78996185)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch WW-5376-bom-fix in repository https://gitbox.apache.org/repos/asf/struts.git omit e31b33329 WW-5376 Fix BOM leaking unrelated dependencies add b78996185 WW-5376 Fix BOM leaking unrelated dependencies 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 (e31b33329) \ N -- N -- N refs/heads/WW-5376-bom-fix (b78996185) 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: bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(struts) branch WW-5376-bom-fix updated (b78996185 -> 9284b742f)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch WW-5376-bom-fix in repository https://gitbox.apache.org/repos/asf/struts.git discard b78996185 WW-5376 Fix BOM leaking unrelated dependencies add 9284b742f WW-5376 Fix BOM leaking unrelated dependencies 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 (b78996185) \ N -- N -- N refs/heads/WW-5376-bom-fix (9284b742f) 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 | 1 + 1 file changed, 1 insertion(+)
(struts) branch WW-5532-upg-deps updated (ed111dad4 -> 077e98589)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch WW-5532-upg-deps in repository https://gitbox.apache.org/repos/asf/struts.git omit ed111dad4 WW-5532 Upgrade and align various dependencies add 077e98589 WW-5532 Upgrade and align various dependencies 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 (ed111dad4) \ N -- N -- N refs/heads/WW-5532-upg-deps (077e98589) 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: plugins/bean-validation/pom.xml | 15 --- pom.xml | 8 2 files changed, 12 insertions(+), 11 deletions(-)
(struts) 01/01: WW-5376 Fix BOM leaking unrelated dependencies
This is an automated email from the ASF dual-hosted git repository.
kusal pushed a commit to branch WW-5376-bom-fix
in repository https://gitbox.apache.org/repos/asf/struts.git
commit acd0211f582cc7ee04abf126ebddeec3b582a334
Author: Kusal Kithul-Godage
AuthorDate: Tue Feb 25 12:57:47 2025 +1100
WW-5376 Fix BOM leaking unrelated dependencies
---
bom/pom.xml | 65 +++---
pom.xml | 85 +++--
2 files changed, 35 insertions(+), 115 deletions(-)
diff --git a/bom/pom.xml b/bom/pom.xml
index 2a8b5394a..4130aeb65 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -24,27 +24,26 @@
org.apache.struts
-struts2-parent
-7.0.4-SNAPSHOT
+struts-master
+15
struts2-bom
7.0.4-SNAPSHOT
pom
-Struts 2 Bill of Materials
-Struts 2 Bill of Materials
+Struts BOM
+Struts Bill of Materials (BOM)
The Apache Software License, Version 2.0
-http://www.apache.org/licenses/LICENSE-2.0.txt
+https://www.apache.org/licenses/LICENSE-2.0.txt
repo
-7.0.4-SNAPSHOT
true
true
@@ -54,115 +53,115 @@
org.apache.struts
struts2-core
-${struts-version.version}
+${project.version}
org.apache.struts
struts2-async-plugin
-${struts-version.version}
+${project.version}
org.apache.struts
struts2-bean-validation-plugin
-${struts-version.version}
+${project.version}
org.apache.struts
struts2-cdi-plugin
-${struts-version.version}
+${project.version}
org.apache.struts
struts2-convention-plugin
-${struts-version.version}
+${project.version}
org.apache.struts
struts2-config-browser-plugin
-${struts-version.version}
+${project.version}
org.apache.struts
struts2-embeddedjsp-plugin
-${struts-version.version}
+${project.version}
org.apache.struts
struts2-gxp-plugin
-${struts-version.version}
+${project.version}
org.apache.struts
struts2-jasperreports-plugin
-${struts-version.version}
+${project.version}
org.apache.struts
struts2-javatemplates-plugin
-${struts-version.version}
+${project.version}
org.apache.struts
struts2-jfreechart-plugin
-${struts-version.version}
+${project.version}
org.apache.struts
struts2-json-plugin
-${struts-version.version}
+${project.version}
org.apache.struts
struts2-junit-plugin
-${struts-version.version}
+${project.version}
org.apache.struts
struts2-osgi-plugin
-${struts-version.version}
+${project.version}
org.apache.struts
struts2-plexus-plugin
-${struts-version.version}
+${project.version}
org.apache.struts
struts2-rest-plugin
-${struts-version.version}
+${project.version}
org.apache.struts
struts2-spring-plugin
-${struts-version.version}
+${project.version}
org.apache.struts
struts2-testng-plugin
-${struts-version.version}
+${project.version}
org.apache.struts
struts2-tiles-plugin
-${struts-version.version}
+${project.version}
org.apache.struts
struts2-velocity-plugin
-${struts-version.version}
+${project.version}
org.apache.struts
str
(struts) branch WW-5376-bom-fix created (now acd0211f5)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch WW-5376-bom-fix in repository https://gitbox.apache.org/repos/asf/struts.git at acd0211f5 WW-5376 Fix BOM leaking unrelated dependencies This branch includes the following new commits: new acd0211f5 WW-5376 Fix BOM leaking unrelated dependencies 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) branch WW-5533-jee11-supp updated (97e08a7bc -> dfd54c96f)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch WW-5533-jee11-supp in repository https://gitbox.apache.org/repos/asf/struts.git discard 97e08a7bc WW-5533 Add compilation support for Jakarta EE 11 discard ed111dad4 WW-5532 Upgrade and align various dependencies add 077e98589 WW-5532 Upgrade and align various dependencies add dfd54c96f WW-5533 Add compilation support for Jakarta EE 11 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 (97e08a7bc) \ N -- N -- N refs/heads/WW-5533-jee11-supp (dfd54c96f) 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: plugins/bean-validation/pom.xml | 15 --- pom.xml | 8 2 files changed, 12 insertions(+), 11 deletions(-)
(struts) branch WW-5376-bom-fix updated (acd0211f5 -> e31b33329)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch WW-5376-bom-fix in repository https://gitbox.apache.org/repos/asf/struts.git discard acd0211f5 WW-5376 Fix BOM leaking unrelated dependencies add e31b33329 WW-5376 Fix BOM leaking unrelated dependencies 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 (acd0211f5) \ N -- N -- N refs/heads/WW-5376-bom-fix (e31b33329) 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: bom/pom.xml | 1 + 1 file changed, 1 insertion(+)
(struts) branch WW-5532-upg-deps created (now 2c8e9e9b9)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch WW-5532-upg-deps in repository https://gitbox.apache.org/repos/asf/struts.git at 2c8e9e9b9 WW-5532 Upgrade and align various dependencies This branch includes the following new commits: new 2c8e9e9b9 WW-5532 Upgrade and align various dependencies 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-5532 Upgrade and align various dependencies
This is an automated email from the ASF dual-hosted git repository.
kusal pushed a commit to branch WW-5532-upg-deps
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 2c8e9e9b95a6012174659be3226db0d8faab3e1d
Author: Kusal Kithul-Godage
AuthorDate: Mon Feb 24 20:38:21 2025 +1100
WW-5532 Upgrade and align various dependencies
---
apps/pom.xml | 1 -
core/pom.xml | 1 +
plugins/cdi/pom.xml| 21 +-
.../apache/struts2/cdi/CdiObjectFactoryTest.java | 37 +++-
plugins/jfreechart/pom.xml | 4 +-
.../apache/struts2/dispatcher/ChartResultTest.java | 116 +++---
plugins/junit/pom.xml | 1 +
plugins/rest/pom.xml | 1 +
plugins/testng/pom.xml | 1 +
plugins/tiles/pom.xml | 14 +-
plugins/velocity/pom.xml | 9 +-
.../template/VelocityTemplateEngineTest.java | 51 +++--
pom.xml| 239 ++---
13 files changed, 179 insertions(+), 317 deletions(-)
diff --git a/apps/pom.xml b/apps/pom.xml
index 614a3ada1..161b1c66b 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -99,7 +99,6 @@
org.springframework
spring-test
-${spring.platformVersion}
test
diff --git a/core/pom.xml b/core/pom.xml
index 887a68361..0862a0182 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -229,6 +229,7 @@
junit
junit
+compile
true
diff --git a/plugins/cdi/pom.xml b/plugins/cdi/pom.xml
index d22996444..9a34ceb67 100644
--- a/plugins/cdi/pom.xml
+++ b/plugins/cdi/pom.xml
@@ -33,7 +33,6 @@
jar
-
jakarta.enterprise
jakarta.enterprise.cdi-api
@@ -43,29 +42,31 @@
org.jboss.weld
weld-core-impl
-provided
+${weld.version}
+test
-
org.jboss.weld.se
weld-se-core
+${weld.version}
test
-
-org.springframework
-spring-test
-
-4.3.0.RELEASE
+com.github.h-thurow
+simple-jndi
+0.25.0
test
-
commons-logging
commons-logging
test
-
+
+jakarta.inject
+jakarta.inject-api
+test
+
diff --git
a/plugins/cdi/src/test/java/org/apache/struts2/cdi/CdiObjectFactoryTest.java
b/plugins/cdi/src/test/java/org/apache/struts2/cdi/CdiObjectFactoryTest.java
index 9e127811b..62fa170b2 100644
--- a/plugins/cdi/src/test/java/org/apache/struts2/cdi/CdiObjectFactoryTest.java
+++ b/plugins/cdi/src/test/java/org/apache/struts2/cdi/CdiObjectFactoryTest.java
@@ -21,11 +21,14 @@ package org.apache.struts2.cdi;
import org.jboss.weld.bootstrap.api.helpers.RegistrySingletonProvider;
import org.jboss.weld.environment.se.Weld;
import org.jboss.weld.environment.se.WeldContainer;
+import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.springframework.mock.jndi.SimpleNamingContextBuilder;
import jakarta.enterprise.inject.spi.InjectionTarget;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertSame;
@@ -33,14 +36,28 @@ import static org.junit.Assert.assertTrue;
public class CdiObjectFactoryTest {
+private static final String SHARED_JNDI = "org.osjava.sj.jndi.shared";
+private static InitialContext context;
+private static WeldContainer container;
+
@BeforeClass
public static void setup() throws Exception {
-Weld weld = new
Weld().containerId(RegistrySingletonProvider.STATIC_INSTANCE);
-WeldContainer container = weld.initialize();
+container = new
Weld().containerId(RegistrySingletonProvider.STATIC_INSTANCE).initialize();
+
+System.setProperty(Context.INITIAL_CONTEXT_FACTORY,
"org.osjava.sj.SimpleContextFactory");
+System.setProperty(SHARED_JNDI, "true");
+context = new InitialContext();
+context.bind(CdiObjectFactory.CDI_JNDIKEY_BEANMANAGER_COMP,
container.getBeanManager());
+}
+
+@AfterClass
+public static void tearDown() throws NamingException {
+container.shutdown();
-SimpleNamingContextBuilder builder = new SimpleNamingContextBuilder();
-builder.activate();
-builder.bind(CdiObjectFactory.CDI_JNDIKEY_BEANMANAGER_COMP,
container.getBeanManager());
+context.unbind(CdiObjectFactory.CDI_JNDIKEY_BEANMANAGER_COMP);
+context
(struts) branch WW-5532-upg-deps updated (2c8e9e9b9 -> 24936770e)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch WW-5532-upg-deps in repository https://gitbox.apache.org/repos/asf/struts.git omit 2c8e9e9b9 WW-5532 Upgrade and align various dependencies add 24936770e WW-5532 Upgrade and align various dependencies 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 (2c8e9e9b9) \ N -- N -- N refs/heads/WW-5532-upg-deps (24936770e) 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: .../src/test/java/org/apache/struts2/dispatcher/ChartResultTest.java| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(struts) branch WW-5532-upg-deps updated (24936770e -> 8272703cf)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch WW-5532-upg-deps in repository https://gitbox.apache.org/repos/asf/struts.git omit 24936770e WW-5532 Upgrade and align various dependencies add 8272703cf WW-5532 Upgrade and align various dependencies 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 (24936770e) \ N -- N -- N refs/heads/WW-5532-upg-deps (8272703cf) 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: .../test/java/it/org/apache/struts2/showcase/StrutsParametersTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
(struts) branch WW-5532-upg-deps updated (8272703cf -> ed111dad4)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch WW-5532-upg-deps in repository https://gitbox.apache.org/repos/asf/struts.git omit 8272703cf WW-5532 Upgrade and align various dependencies add ed111dad4 WW-5532 Upgrade and align various dependencies 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 (8272703cf) \ N -- N -- N refs/heads/WW-5532-upg-deps (ed111dad4) 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 | 37 ++--- 1 file changed, 6 insertions(+), 31 deletions(-)
(struts) branch WW-5533-jee11-supp created (now b247751fb)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch WW-5533-jee11-supp in repository https://gitbox.apache.org/repos/asf/struts.git at b247751fb WW-5533 Add compilation support for Jakarta EE 11 This branch includes the following new commits: new b247751fb WW-5533 Add compilation support for Jakarta EE 11 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-5533 Add compilation support for Jakarta EE 11
This is an automated email from the ASF dual-hosted git repository.
kusal pushed a commit to branch WW-5533-jee11-supp
in repository https://gitbox.apache.org/repos/asf/struts.git
commit b247751fbbcfd29551e83682385b90724a14ca7e
Author: Kusal Kithul-Godage
AuthorDate: Mon Feb 24 21:29:14 2025 +1100
WW-5533 Add compilation support for Jakarta EE 11
---
.github/workflows/maven.yml | 17 -
.../multipart/AbstractMultiPartRequestTest.java | 2 +-
.../main/java/org/apache/tiles/el/ScopeELResolver.java | 2 +-
.../org/apache/tiles/el/TilesContextBeanELResolver.java | 2 +-
.../org/apache/tiles/el/TilesContextELResolver.java | 2 +-
pom.xml | 7 +++
6 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 1a7ffde46..a9df53c26 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -30,18 +30,25 @@ env:
jobs:
build:
-name: Build and Test
+name: Build and Test${{ matrix.profile == '-Pjakartaee11' && ' with
Jakarta EE 11' || matrix.profile }}
runs-on: ubuntu-latest
strategy:
matrix:
-java: [ '17', '21' ]
+include:
+ - java: '17'
+profile: ''
+ - java: '21'
+profile: ''
+ - java: '21'
+profile: '-Pjakartaee11'
steps:
- name: Checkout code
uses: actions/checkout@v4
- - uses: actions/setup-java@v4
+ - name: Setup Java ${{ matrix.java }}
+uses: actions/setup-java@v4
with:
distribution: temurin
java-version: ${{ matrix.java }}
cache: 'maven'
- - name: Build with Maven on Java ${{ matrix.java }}
-run: mvn -B -V -DskipAssembly verify --no-transfer-progress
+ - name: Build with Maven on Java ${{ matrix.java }}${{ matrix.profile ==
'-Pjakartaee11' && ' (Jakarta EE 11)' || matrix.profile }}
+run: mvn -B -V -DskipAssembly verify ${{ matrix.profile }}
--no-transfer-progress
diff --git
a/core/src/test/java/org/apache/struts2/dispatcher/multipart/AbstractMultiPartRequestTest.java
b/core/src/test/java/org/apache/struts2/dispatcher/multipart/AbstractMultiPartRequestTest.java
index 22625cdf9..1f56b4435 100644
---
a/core/src/test/java/org/apache/struts2/dispatcher/multipart/AbstractMultiPartRequestTest.java
+++
b/core/src/test/java/org/apache/struts2/dispatcher/multipart/AbstractMultiPartRequestTest.java
@@ -417,7 +417,7 @@ abstract class AbstractMultiPartRequestTest {
assertThat(JakartaServletDiskFileUpload.isMultipartContent(mockRequest)).isTrue();
// when
-mockRequest.setCharacterEncoding(null);
+mockRequest.setCharacterEncoding((String) null);
multiPart.setDefaultEncoding(StandardCharsets.ISO_8859_1.name());
multiPart.parse(mockRequest, tempDir);
diff --git
a/plugins/tiles/src/main/java/org/apache/tiles/el/ScopeELResolver.java
b/plugins/tiles/src/main/java/org/apache/tiles/el/ScopeELResolver.java
index bb34179ba..9b83611a6 100644
--- a/plugins/tiles/src/main/java/org/apache/tiles/el/ScopeELResolver.java
+++ b/plugins/tiles/src/main/java/org/apache/tiles/el/ScopeELResolver.java
@@ -57,7 +57,7 @@ public class ScopeELResolver extends ELResolver {
/**
* {@inheritDoc}
*/
-@Override
+// @Override
public Iterator getFeatureDescriptors(ELContext
context, Object base) {
if (base != null) {
return Collections.emptyIterator();
diff --git
a/plugins/tiles/src/main/java/org/apache/tiles/el/TilesContextBeanELResolver.java
b/plugins/tiles/src/main/java/org/apache/tiles/el/TilesContextBeanELResolver.java
index 8412b0574..e833b1100 100644
---
a/plugins/tiles/src/main/java/org/apache/tiles/el/TilesContextBeanELResolver.java
+++
b/plugins/tiles/src/main/java/org/apache/tiles/el/TilesContextBeanELResolver.java
@@ -47,7 +47,7 @@ public class TilesContextBeanELResolver extends ELResolver {
}
/** {@inheritDoc} */
-@Override
+// @Override
public Iterator getFeatureDescriptors(ELContext
context, Object base) {
List list = new ArrayList<>();
diff --git
a/plugins/tiles/src/main/java/org/apache/tiles/el/TilesContextELResolver.java
b/plugins/tiles/src/main/java/org/apache/tiles/el/TilesContextELResolver.java
index 3fc6738b6..1723f9d40 100644
---
a/plugins/tiles/src/main/java/org/apache/tiles/el/TilesContextELResolver.java
+++
b/plugins/tiles/src/main/java/org/apache/tiles/el/TilesContextELResolver.java
@@ -70,7 +70,7 @@ public class TilesContextELResolver extends ELResolver {
/**
* {@inheritDoc}
*/
-@Override
+// @Override
public Iterator getFeatureDescriptors(ELContext context,
Object base) {
// only resolve at the root of the context
diff --git a/pom.xml b/pom.xml
index 48
(struts) branch WW-5533-jee11-supp updated (b247751fb -> 97e08a7bc)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch WW-5533-jee11-supp in repository https://gitbox.apache.org/repos/asf/struts.git omit b247751fb WW-5533 Add compilation support for Jakarta EE 11 add 97e08a7bc WW-5533 Add compilation support for Jakarta EE 11 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 (b247751fb) \ N -- N -- N refs/heads/WW-5533-jee11-supp (97e08a7bc) 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: .github/workflows/maven.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
