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 <lukaszlen...@apache.org>
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 @@@
<!-- dependency versions in alphanumeric order -->
<asm.version>9.7</asm.version>
+ <byte-buddy.version>1.14.11</byte-buddy.version>
+ <freemarker.version>2.3.33</freemarker.version>
+ <hibernate-validator.version>8.0.1.Final</hibernate-validator.version>
- <jackson.version>2.17.2</jackson.version>
- <log4j2.version>2.23.1</log4j2.version>
+ <jackson.version>2.18.0</jackson.version>
+ <log4j2.version>2.24.1</log4j2.version>
+ <maven-surefire-plugin.version>3.5.0</maven-surefire-plugin.version>
+ <mockito.version>5.8.0</mockito.version>
<ognl.version>3.3.5</ognl.version>
+ <sitemesh.version>2.5.0</sitemesh.version>
<slf4j.version>2.0.16</slf4j.version>
- <spring.platformVersion>5.3.39</spring.platformVersion>
+ <spring.platformVersion>6.0.13</spring.platformVersion>
<tiles.version>3.0.8</tiles.version>
<tiles-request.version>1.0.7</tiles-request.version>
- <maven-surefire-plugin.version>3.5.0</maven-surefire-plugin.version>
- <hibernate-validator.version>6.2.4.Final</hibernate-validator.version>
- <freemarker.version>2.3.33</freemarker.version>
+ <velocity-tools.version>3.1</velocity-tools.version>
<!-- Site generation -->
<fluido-skin.version>1.9</fluido-skin.version>
