You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2024/01/04 09:27:29 UTC
(struts) branch merge-master-to-7xx-2024-01-04 created (now d8090ef9d)
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a change to branch merge-master-to-7xx-2024-01-04
in repository https://gitbox.apache.org/repos/asf/struts.git
at d8090ef9d Merge remote-tracking branch 'origin/master' into merge-master-to-7xx-2024-01-04
This branch includes the following new commits:
new d8090ef9d Merge remote-tracking branch 'origin/master' into merge-master-to-7xx-2024-01-04
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-01-04
Posted by lu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch merge-master-to-7xx-2024-01-04
in repository https://gitbox.apache.org/repos/asf/struts.git
commit d8090ef9d898188bcda66c1697f9f7895dd9579a
Merge: 3af581855 5e9dd3d69
Author: Lukasz Lenart <lu...@apache.org>
AuthorDate: Thu Jan 4 10:21:52 2024 +0100
Merge remote-tracking branch 'origin/master' into merge-master-to-7xx-2024-01-04
# Conflicts:
# Jenkinsfile
# bundles/admin/src/main/resources/osgi/admin/shell.ftl
# bundles/admin/src/main/resources/osgi/admin/viewBundle.ftl
# bundles/admin/src/main/resources/osgi/admin/viewBundles.ftl
# plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/AbstractDirective.java
.github/workflows/codeql.yml | 6 +-
.github/workflows/scorecards-analysis.yaml | 4 +-
.../src/main/webapp/WEB-INF/decorators/main.jsp | 2 +-
.../webapp/WEB-INF/validation/ajaxFormSubmit.jsp | 2 +-
assembly/src/main/resources/template.vm | 8 +-
.../admin/src/main/resources/osgi/admin/shell.ftl | 0
.../xwork2/config/impl/DefaultConfiguration.java | 7 +-
.../StrutsDefaultConfigurationProvider.java | 3 -
.../xwork2/interceptor/NoParameters.java | 2 +-
.../interceptor/ParameterFilterInterceptor.java | 4 +-
.../xwork2/interceptor/ParameterNameAware.java | 17 +-
.../xwork2/interceptor/ParameterValueAware.java | 17 +-
.../xwork2/interceptor/ParametersInterceptor.java | 533 +--------------------
.../com/opensymphony/xwork2/ognl/OgnlUtil.java | 3 +-
.../opensymphony/xwork2/ognl/OgnlValueStack.java | 64 +--
.../xwork2/ognl/OgnlValueStackFactory.java | 33 +-
.../xwork2/ognl/SecurityMemberAccess.java | 9 +-
.../xwork2/ognl/accessor/CompoundRootAccessor.java | 12 +-
.../xwork2/ognl/accessor/RootAccessor.java} | 14 +-
.../xwork2/util/MemberAccessValueStack.java | 16 -
.../java/org/apache/struts2/StrutsConstants.java | 11 +
.../org/apache/struts2/action/CspReportAction.java | 2 +-
.../org/apache/struts2/action/NoParameters.java | 3 +-
.../apache/struts2/action}/ParameterNameAware.java | 12 +-
.../struts2/action}/ParameterValueAware.java | 20 +-
.../config/StrutsBeanSelectionProvider.java | 6 +-
.../ActionMappingParametersInterceptor.java | 6 +-
.../parameter}/ParametersInterceptor.java | 15 +-
.../apache/struts2/util/ValueStackProvider.java} | 15 +-
.../struts2/interceptor/debugging/browser.ftl | 20 +-
.../struts2/interceptor/debugging/console.ftl | 2 +-
core/src/main/resources/struts-beans.xml | 12 +-
.../resources/template/css_xhtml/form-validate.ftl | 2 +-
.../main/resources/template/simple/combobox.ftl | 2 +-
.../resources/template/simple/doubleselect.ftl | 2 +-
.../template/simple/form-close-tooltips.ftl | 2 +-
.../main/resources/template/simple/form-close.ftl | 2 +-
core/src/main/resources/template/simple/head.ftl | 2 +-
.../template/simple/inputtransferselect.ftl | 2 +-
.../template/simple/optiontransferselect.ftl | 2 +-
.../resources/template/simple/updownselect.ftl | 2 +-
.../template/xhtml/form-close-validate.ftl | 2 +-
.../main/resources/template/xhtml/form-close.ftl | 2 +-
.../resources/template/xhtml/form-validate.ftl | 2 +-
.../site/confluence/ww-template-autoexport.html | 2 +-
.../com/opensymphony/xwork2/ognl/OgnlUtilTest.java | 4 +-
.../xwork2/ognl/OgnlValueStackTest.java | 18 +-
.../parameter}/ParametersInterceptorTest.java | 21 +-
.../org/apache/struts2/views/jsp/ui/ComboBox-1.txt | 2 +-
.../org/apache/struts2/views/jsp/ui/ComboBox-2.txt | 2 +-
.../org/apache/struts2/views/jsp/ui/ComboBox-3.txt | 2 +-
.../org/apache/struts2/views/jsp/ui/ComboBox-4.txt | 2 +-
.../apache/struts2/views/jsp/ui/DoubleSelect-1.txt | 2 +-
.../apache/struts2/views/jsp/ui/DoubleSelect-2.txt | 2 +-
.../apache/struts2/views/jsp/ui/DoubleSelect-3.txt | 2 +-
.../apache/struts2/views/jsp/ui/DoubleSelect-4.txt | 2 +-
.../apache/struts2/views/jsp/ui/DoubleSelect-5.txt | 2 +-
.../apache/struts2/views/jsp/ui/DoubleSelect-6.txt | 2 +-
.../org/apache/struts2/views/jsp/ui/Formtag-11.txt | 6 +-
.../org/apache/struts2/views/jsp/ui/Formtag-12.txt | 2 +-
.../org/apache/struts2/views/jsp/ui/Formtag-2.txt | 8 +-
.../org/apache/struts2/views/jsp/ui/Formtag-22.txt | 8 +-
.../org/apache/struts2/views/jsp/ui/Formtag-24.txt | 8 +-
.../org/apache/struts2/views/jsp/ui/Formtag-6.txt | 6 +-
.../apache/struts2/views/jsp/ui/HeadTagTest-1.txt | 2 +-
.../struts2/views/jsp/ui/inputtransferselect-1.txt | 2 +-
.../struts2/views/jsp/ui/inputtransferselect-2.txt | 2 +-
.../views/jsp/ui/optiontransferselect-1.txt | 16 +-
.../views/jsp/ui/optiontransferselect-2.txt | 10 +-
.../views/jsp/ui/optiontransferselect-3.txt | 10 +-
.../views/jsp/ui/optiontransferselect-4.txt | 12 +-
.../views/jsp/ui/optiontransferselect-5.txt | 12 +-
.../views/jsp/ui/optiontransferselect-6.txt | 10 +-
.../views/jsp/ui/optiontransferselect-7.txt | 10 +-
.../views/jsp/ui/optiontransferselect-8.txt | 2 +-
.../org/apache/struts2/views/jsp/ui/tooltip-1.txt | 2 +-
.../org/apache/struts2/views/jsp/ui/tooltip-2.txt | 2 +-
.../org/apache/struts2/views/jsp/ui/tooltip-3.txt | 2 +-
.../struts2/views/jsp/ui/updownselecttag-1.txt | 2 +-
.../struts2/views/jsp/ui/updownselecttag-10.txt | 10 +-
.../struts2/views/jsp/ui/updownselecttag-11.txt | 2 +-
.../struts2/views/jsp/ui/updownselecttag-2.txt | 2 +-
.../struts2/views/jsp/ui/updownselecttag-3.txt | 2 +-
.../struts2/views/jsp/ui/updownselecttag-4.txt | 2 +-
.../struts2/views/jsp/ui/updownselecttag-5.txt | 2 +-
.../struts2/views/jsp/ui/updownselecttag-6.txt | 2 +-
.../struts2/views/jsp/ui/updownselecttag-7.txt | 2 +-
.../struts2/views/jsp/ui/updownselecttag-8.txt | 2 +-
.../struts2/views/jsp/ui/updownselecttag-9.txt | 2 +-
.../PackageBasedActionConfigBuilder.java | 190 ++++----
.../views/velocity/StrutsVelocityContext.java | 14 +-
.../velocity/components/AbstractDirective.java | 33 +-
.../views/velocity/StrutsVelocityContextTest.java | 4 +-
pom.xml | 2 +-
94 files changed, 460 insertions(+), 914 deletions(-)
diff --cc .github/workflows/codeql.yml
index c3464f762,d195fcd5a..11e27f287
--- 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@v2
+ uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
- name: Autobuild
diff --cc bundles/admin/src/main/resources/osgi/admin/shell.ftl
index 000000000,927795e1a..e69de29bb
mode 000000,100644..100644
--- a/bundles/admin/src/main/resources/osgi/admin/shell.ftl
+++ b/bundles/admin/src/main/resources/osgi/admin/shell.ftl
diff --cc plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/AbstractDirective.java
index e05fbe450,539f64bdd..3e5996930
--- a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/AbstractDirective.java
+++ b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/AbstractDirective.java
@@@ -18,17 -18,16 +18,22 @@@
*/
package org.apache.struts2.views.velocity.components;
-import com.opensymphony.xwork2.inject.Container;
-import com.opensymphony.xwork2.util.ValueStack;
+import java.io.IOException;
+import java.io.Writer;
+import java.util.HashMap;
+import java.util.Map;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.components.Component;
+ import org.apache.struts2.util.ValueStackProvider;
+ import org.apache.struts2.views.util.ContextUtil;
+ import org.apache.velocity.context.AbstractContext;
+ import org.apache.velocity.context.Context;
import org.apache.velocity.context.InternalContextAdapter;
+ import org.apache.velocity.context.InternalWrapperContext;
import org.apache.velocity.exception.MethodInvocationException;
import org.apache.velocity.exception.ParseErrorException;
import org.apache.velocity.exception.ResourceNotFoundException;