(struts) branch release/struts-7-0-x updated (762a0e02e -> c1b9ff4ed)
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 762a0e02e Merge pull request #1072 from apache/fix/WW-5468-modeldriven-2 add f03d36c46 Bump org.apache.maven.plugins:maven-site-plugin from 3.12.1 to 3.20.0 add 292420822 Merge pull request #1053 from apache/dependabot/maven/org.apache.maven.plugins-maven-site-plugin-3.20.0 add fda2c546b Bump org.owasp:dependency-check-maven from 10.0.3 to 10.0.4 add 0ce2c7b5d Merge pull request #1054 from apache/dependabot/maven/org.owasp-dependency-check-maven-10.0.4 add d7626ed7d Bump org.codehaus.mojo:exec-maven-plugin from 3.3.0 to 3.4.1 add 40b439580 Merge pull request #1057 from apache/dependabot/maven/org.codehaus.mojo-exec-maven-plugin-3.4.1 add 3c71b2ed8 Bump github/codeql-action from 3.26.6 to 3.26.8 add 48c4e3b6a Merge pull request #1058 from apache/dependabot/github_actions/github/codeql-action-3.26.8 add 0bd4266d2 WW-5297 Fixes checking nonce of invalidated session add 75cc664fd Merge pull request #1060 from apache/fix/WW-5297-invalid-session add c81245029 [maven-release-plugin] prepare release STRUTS_6_6_1 add d33be1d43 [maven-release-plugin] prepare for next development iteration add 3e04197ba Bump github/codeql-action from 3.26.8 to 3.26.12 add b3629460e Merge pull request #1073 from apache/dependabot/github_actions/github/codeql-action-3.26.12 add 3528b8832 Bump actions/upload-artifact from 4.4.0 to 4.4.3 add 2eff2da4f Merge pull request #1074 from apache/dependabot/github_actions/actions/upload-artifact-4.4.3 add 7473b4cef Bump commons-logging:commons-logging from 1.3.3 to 1.3.4 add cd7f1097e Merge pull request #1061 from apache/dependabot/maven/commons-logging-commons-logging-1.3.4 add 9d903ddf9 Bump org.apache.maven.plugins:maven-project-info-reports-plugin add fbab5d4df Merge pull request #1065 from apache/dependabot/maven/org.apache.maven.plugins-maven-project-info-reports-plugin-3.7.0 add 4ccde0087 Bump log4j2.version from 2.23.1 to 2.24.1 add b115a510a Merge pull request #1064 from apache/dependabot/maven/log4j2.version-2.24.1 add 1bcadd468 Bump jackson.version from 2.17.2 to 2.18.0 add 78451db87 Merge pull request #1062 from apache/dependabot/maven/jackson.version-2.18.0 add 8dc652789 Merge remote-tracking branch 'origin/master' into merge/master-to-7xx-2024-10-15 add c1b9ff4ed Merge pull request #1076 from apache/merge/master-to-7xx-2024-10-15 No new revisions were added by this update. Summary of changes: .github/workflows/codeql.yml | 6 +-- .github/workflows/scorecards-analysis.yaml | 4 +- .../java/org/apache/struts2/components/UIBean.java | 8 +++- .../org/apache/struts2/components/UIBeanTest.java | 43 +++--- .../struts2/views/java/simple/AbstractTest.java| 11 ++ .../apache/struts2/views/java/simple/HeadTest.java | 2 +- .../apache/struts2/views/java/simple/LinkTest.java | 18 ++--- .../struts2/views/java/simple/ScriptTest.java | 12 -- plugins/tiles/pom.xml | 2 +- pom.xml| 12 +++--- 10 files changed, 71 insertions(+), 47 deletions(-)
(struts) branch merge/master-to-7xx-2024-10-15 deleted (was 8dc652789)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch merge/master-to-7xx-2024-10-15 in repository https://gitbox.apache.org/repos/asf/struts.git was 8dc652789 Merge remote-tracking branch 'origin/master' into merge/master-to-7xx-2024-10-15 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-site) branch master updated (65c7b8293 -> 4c46a202c)
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-site.git from 65c7b8293 Merge pull request #251 from apache/feature/idea-plugin add c52928681 Fix demo wrong return class new 4c46a202c Merge pull request #252 from LaplusIjns/fix/stream-result 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: source/core-developers/stream-result.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(struts-site) branch asf-site updated: Automatic Site Publish by Buildbot
This is an automated email from the ASF dual-hosted git repository.
git-site-role pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/struts-site.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 80ed2d795 Automatic Site Publish by Buildbot
80ed2d795 is described below
commit 80ed2d795599fe01ab0037a1f2a8472437cb136f
Author: buildbot
AuthorDate: Tue Oct 15 05:05:09 2024 +
Automatic Site Publish by Buildbot
---
output/core-developers/stream-result.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/output/core-developers/stream-result.html
b/output/core-developers/stream-result.html
index e3e2ece11..c0d9ad4f3 100644
--- a/output/core-developers/stream-result.html
+++ b/output/core-developers/stream-result.html
@@ -231,7 +231,7 @@ in your Struts2 application.
return this.filename;
}
- private String getStream() {
+ private InputStream
getStream() {
return this.stream;
}
}
(struts-site) 01/01: Merge pull request #252 from LaplusIjns/fix/stream-result
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-site.git commit 4c46a202ced0854209055c683cbaa5393e1c Merge: 65c7b8293 c52928681 Author: Lukasz Lenart AuthorDate: Tue Oct 15 07:04:30 2024 +0200 Merge pull request #252 from LaplusIjns/fix/stream-result Fix demo wrong return class source/core-developers/stream-result.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(struts) branch merge/master-to-7xx-2024-10-15 updated (5e86fc92d -> ec6ddb398)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch merge/master-to-7xx-2024-10-15 in repository https://gitbox.apache.org/repos/asf/struts.git discard 5e86fc92d Merge remote-tracking branch 'origin/master' into merge/master-to-7xx-2024-10-15 add ec6ddb398 Merge remote-tracking branch 'origin/master' into merge/master-to-7xx-2024-10-15 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 (5e86fc92d) \ N -- N -- N refs/heads/merge/master-to-7xx-2024-10-15 (ec6ddb398) 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/test/java/org/apache/struts2/components/UIBeanTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
(struts) branch merge/master-to-7xx-2024-10-15 created (now 5e86fc92d)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch merge/master-to-7xx-2024-10-15 in repository https://gitbox.apache.org/repos/asf/struts.git at 5e86fc92d Merge remote-tracking branch 'origin/master' into merge/master-to-7xx-2024-10-15 This branch includes the following new commits: new 5e86fc92d Merge remote-tracking branch 'origin/master' into merge/master-to-7xx-2024-10-15 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-10-15
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch merge/master-to-7xx-2024-10-15
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 5e86fc92dbc362db1fb3bba49a9812dba4c365dc
Merge: 762a0e02e 78451db87
Author: Lukasz Lenart
AuthorDate: Tue Oct 15 07:19:00 2024 +0200
Merge remote-tracking branch 'origin/master' into
merge/master-to-7xx-2024-10-15
# Conflicts:
# core/src/main/java/org/apache/struts2/components/UIBean.java
#
plugins/javatemplates/src/test/java/org/apache/struts2/views/java/simple/AbstractTest.java
# pom.xml
.github/workflows/codeql.yml | 6 +--
.github/workflows/scorecards-analysis.yaml | 4 +-
.../java/org/apache/struts2/components/UIBean.java | 8 +++-
.../org/apache/struts2/components/UIBeanTest.java | 43 +++---
.../struts2/views/java/simple/AbstractTest.java| 10 +
.../apache/struts2/views/java/simple/HeadTest.java | 2 +-
.../apache/struts2/views/java/simple/LinkTest.java | 18 ++---
.../struts2/views/java/simple/ScriptTest.java | 12 --
plugins/tiles/pom.xml | 2 +-
pom.xml| 12 +++---
10 files changed, 70 insertions(+), 47 deletions(-)
diff --cc .github/workflows/codeql.yml
index 3d0c778ec,26db59be1..97a4ed500
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@@ -45,14 -43,8 +45,14 @@@ jobs
steps:
- name: Checkout repository
uses: actions/checkout@v4
+- name: Setup Java JDK
+ uses: actions/setup-java@v3
+ with:
+distribution: temurin
+java-version: 17
+cache: 'maven'
- name: Initialize CodeQL
- uses: github/codeql-action/init@v3.26.6
+ uses: github/codeql-action/init@v3.26.12
with:
languages: ${{ matrix.language }}
- name: Autobuild
diff --cc core/src/main/java/org/apache/struts2/components/UIBean.java
index ff89c035d,c787fd100..d4e9ee4b5
--- a/core/src/main/java/org/apache/struts2/components/UIBean.java
+++ b/core/src/main/java/org/apache/struts2/components/UIBean.java
@@@ -22,8 -22,6 +22,9 @@@ import com.opensymphony.xwork2.config.C
import com.opensymphony.xwork2.inject.Inject;
import com.opensymphony.xwork2.util.TextParseUtil;
import com.opensymphony.xwork2.util.ValueStack;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
++import jakarta.servlet.http.HttpSession;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
diff --cc pom.xml
index 9bbfc5295,8534610fe..dbe52b290
--- a/pom.xml
+++ b/pom.xml
@@@ -111,20 -110,16 +111,20 @@@
9.7
+1.14.11
+2.3.33
+8.0.1.Final
- 2.17.2
- 2.23.1
+ 2.18.0
+ 2.24.1
+3.5.0
+5.8.0
3.3.5
+2.5.0
2.0.16
-5.3.39
+6.0.13
3.0.8
1.0.7
-3.5.0
-6.2.4.Final
-2.3.33
+3.1
1.9
(struts) branch merge/master-to-7xx-2024-10-15 updated (ec6ddb398 -> 8dc652789)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch merge/master-to-7xx-2024-10-15 in repository https://gitbox.apache.org/repos/asf/struts.git discard ec6ddb398 Merge remote-tracking branch 'origin/master' into merge/master-to-7xx-2024-10-15 add 8dc652789 Merge remote-tracking branch 'origin/master' into merge/master-to-7xx-2024-10-15 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 (ec6ddb398) \ N -- N -- N refs/heads/merge/master-to-7xx-2024-10-15 (8dc652789) 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/org/apache/struts2/views/java/simple/AbstractTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
(struts) branch fix/WW-5468-modeldriven-2 deleted (was f6c17e9c6)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch fix/WW-5468-modeldriven-2 in repository https://gitbox.apache.org/repos/asf/struts.git was f6c17e9c6 WW-5468 Replace tabs with spaces 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 (ddc29445f -> 762a0e02e)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch release/struts-7-0-x in repository https://gitbox.apache.org/repos/asf/struts.git from ddc29445f Merge pull request #1051 from apache/merge/master-to-7xx-2024-09-10 add 5c5683907 WW-5468 Fixes @StrutsParameter for ModelDriven add a57f51cc2 WW-5468 Reworked fix, exempt ModelDriven Action parameters add 58e19dde3 WW-5468 Remove unneeded annotations add f6c17e9c6 WW-5468 Replace tabs with spaces add 762a0e02e Merge pull request #1072 from apache/fix/WW-5468-modeldriven-2 No new revisions were added by this update. Summary of changes: .../showcase/modelDriven/ModelDrivenAction.java| 2 +- .../java/com/opensymphony/xwork2/ModelDriven.java | 6 + .../parameter/ParametersInterceptor.java | 59 ++- .../com/opensymphony/xwork2/ModelDrivenAction.java | 3 +- .../xwork2/ModelDrivenAnnotationAction.java| 3 +- .../interceptor/ModelDrivenInterceptorTest.java| 2 +- .../xwork2/test/ModelDrivenAction2.java| 4 +- .../xwork2/test/ModelDrivenAnnotationAction2.java | 4 +- .../xwork2/test/subtest/NullModelDrivenAction.java | 3 +- .../validator/VisitorValidatorModelAction.java | 5 +- .../parameter/StrutsParameterAnnotationTest.java | 35 +- .../apache/struts2/result/StreamResultTest.java| 6 +- .../beanvalidation/actions/ModelDrivenAction.java | 5 +- .../actions/ValidateGroupAction.java | 5 +- .../apache/struts2/junit/StrutsRestTestCase.java | 3 +- .../struts2/rest/RestActionInvocationTest.java | 404 ++--- .../com/opensymphony/xwork2/ModelDrivenAction.java | 3 +- 17 files changed, 292 insertions(+), 260 deletions(-)
(struts) branch fix/WW-5468-modeldriven-2 updated (9a5080d40 -> f6c17e9c6)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch fix/WW-5468-modeldriven-2 in repository https://gitbox.apache.org/repos/asf/struts.git omit 9a5080d40 WW-5468 Replace tabs with spaces omit 10f47305b WW-5468 Remove unneeded annotations add 58e19dde3 WW-5468 Remove unneeded annotations add f6c17e9c6 WW-5468 Replace tabs with spaces 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 (9a5080d40) \ N -- N -- N refs/heads/fix/WW-5468-modeldriven-2 (f6c17e9c6) 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: .../org/apache/struts2/showcase/modelDriven/ModelDrivenAction.java | 2 +- core/src/test/java/com/opensymphony/xwork2/ModelDrivenAction.java | 2 +- .../test/java/com/opensymphony/xwork2/ModelDrivenAnnotationAction.java | 2 +- .../src/test/java/com/opensymphony/xwork2/test/ModelDrivenAction2.java | 2 +- .../com/opensymphony/xwork2/test/ModelDrivenAnnotationAction2.java | 2 +- .../com/opensymphony/xwork2/test/subtest/NullModelDrivenAction.java| 3 ++- .../com/opensymphony/xwork2/validator/VisitorValidatorModelAction.java | 3 ++- .../src/test/java/com/opensymphony/xwork2/ModelDrivenAction.java | 2 +- 8 files changed, 10 insertions(+), 8 deletions(-)
