(struts) branch merge-master-to-7xx-2024-02-16 created (now 45b06dd69)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch merge-master-to-7xx-2024-02-16 in repository https://gitbox.apache.org/repos/asf/struts.git at 45b06dd69 Merge remote-tracking branch 'origin/master' into merge-master-to-7xx-2024-02-16 This branch includes the following new commits: new 45b06dd69 Merge remote-tracking branch 'origin/master' into merge-master-to-7xx-2024-02-16 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-02-16
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch merge-master-to-7xx-2024-02-16
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 45b06dd69c875cbde943b77fc77c7fd608a5cfe1
Merge: 7edcac886 a84f85798
Author: Lukasz Lenart
AuthorDate: Fri Feb 16 09:27:16 2024 +0100
Merge remote-tracking branch 'origin/master' into
merge-master-to-7xx-2024-02-16
# Conflicts:
#
plugins/osgi/src/main/java/org/apache/struts2/osgi/OsgiConfigurationProvider.java
#
plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletVelocityResult.java
#
plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/OldDecorator2NewStrutsVelocityDecorator.java
#
plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityDecoratorServlet.java
#
plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityPageFilter.java
# pom.xml
.github/workflows/scorecards-analysis.yaml | 2 +-
.../java/org/apache/struts2/components/File.java | 6 +
core/src/site/resources/tags/file-attributes.html | 2 +-
.../struts2/config_browser/ShowBeansAction.java| 4 +-
.../struts2/views/java/simple/FileHandler.java | 1 -
.../apache/struts2/views/java/simple/FileTest.java | 3 +-
.../struts2/rest/ContentTypeInterceptor.java | 3 +-
.../struts2/rest/ContentTypeInterceptorTest.java | 154
.../OldDecorator2NewStrutsVelocityDecorator.java | 211 +--
.../struts2/sitemesh/VelocityDecoratorServlet.java | 390 +++--
.../struts2/sitemesh/VelocityPageFilter.java | 22 +-
.../velocity/VelocityBeanSelectionProvider.java| 2 +-
.../struts2/views/velocity/VelocityManager.java| 5 +-
.../views/velocity/VelocityManagerInterface.java | 38 ++
.../views/velocity/result/VelocityResult.java | 37 +-
.../velocity/template/VelocityTemplateEngine.java | 17 +-
.../velocity/src/main/resources/struts-plugin.xml | 4 +
pom.xml| 22 +-
18 files changed, 591 insertions(+), 332 deletions(-)
diff --cc
plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/OldDecorator2NewStrutsVelocityDecorator.java
index 57564f47e,33d5b1f3a..6168b29c0
---
a/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/OldDecorator2NewStrutsVelocityDecorator.java
+++
b/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/OldDecorator2NewStrutsVelocityDecorator.java
@@@ -1,101 -1,110 +1,110 @@@
- /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
- package org.apache.struts2.sitemesh;
-
- import com.opensymphony.module.sitemesh.HTMLPage;
- import com.opensymphony.sitemesh.Content;
- import com.opensymphony.sitemesh.compatability.Content2HTMLPage;
- import com.opensymphony.xwork2.ActionContext;
- import com.opensymphony.xwork2.inject.Inject;
- import org.apache.logging.log4j.Logger;
- import org.apache.logging.log4j.LogManager;
- import org.apache.struts2.views.velocity.VelocityManager;
- import org.apache.velocity.context.Context;
-
- import jakarta.servlet.ServletContext;
- import jakarta.servlet.ServletException;
- import jakarta.servlet.http.HttpServletRequest;
- import jakarta.servlet.http.HttpServletResponse;
- import java.io.IOException;
- import java.io.PrintWriter;
-
- /**
- * Extends OldDecorator2NewStrutsDecorator to add Struts functionality for
Velocity
- */
- public class OldDecorator2NewStrutsVelocityDecorator extends
OldDecorator2NewStrutsDecorator {
- private static final Logger LOG =
LogManager.getLogger(OldDecorator2NewStrutsFreemarkerDecorator.class);
-
- private static VelocityManager velocityManager;
-
- @Inject(required = false)
- public static void setVelocityManager(VelocityManager mgr) {
- velocityManager = mgr;
- }
-
- public
OldDecorator2NewStrutsVelocityDecorator(com.opensymphony.module.sitemesh.Decorator
oldDecorator) {
- this.oldDecorator = oldDecorator;
- }
-
- /**
- * Applies the decorator, using the relevent contexts
- *
- * @param contentThe content
- * @param requestTh
(struts) branch dependabot/maven/spring.platformVersion-6.1.3 deleted (was 2281d23a2)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch dependabot/maven/spring.platformVersion-6.1.3 in repository https://gitbox.apache.org/repos/asf/struts.git was 2281d23a2 Bump spring.platformVersion from 5.3.27 to 6.1.3 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 master updated (a84f85798 -> c553c93fa)
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.git from a84f85798 Merge pull request #876 from gregh3269/fix-for-WW-5396 add ceb0a9a73 Bump net.sf.jasperreports:jasperreports from 6.20.6 to 6.21.0 new c553c93fa Merge pull request #843 from apache/dependabot/maven/net.sf.jasperreports-jasperreports-6.21.0 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: plugins/jasperreports/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(struts) 01/01: Merge pull request #843 from apache/dependabot/maven/net.sf.jasperreports-jasperreports-6.21.0
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.git commit c553c93fab4ed181f3b3945644562d746e19ac55 Merge: a84f85798 ceb0a9a73 Author: Lukasz Lenart AuthorDate: Fri Feb 16 09:43:26 2024 +0100 Merge pull request #843 from apache/dependabot/maven/net.sf.jasperreports-jasperreports-6.21.0 WW-5397 Bump net.sf.jasperreports:jasperreports from 6.20.6 to 6.21.0 plugins/jasperreports/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(struts) branch dependabot/maven/net.sf.jasperreports-jasperreports-6.21.0 deleted (was ceb0a9a73)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch dependabot/maven/net.sf.jasperreports-jasperreports-6.21.0 in repository https://gitbox.apache.org/repos/asf/struts.git was ceb0a9a73 Bump net.sf.jasperreports:jasperreports from 6.20.6 to 6.21.0 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/maven/org.hibernate.validator-hibernate-validator-8.0.1.Final deleted (was 908cde545)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch dependabot/maven/org.hibernate.validator-hibernate-validator-8.0.1.Final in repository https://gitbox.apache.org/repos/asf/struts.git was 908cde545 Bump org.hibernate.validator:hibernate-validator 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/maven/org.codehaus.plexus-plexus-container-default-2.1.1 deleted (was 394025bcc)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch dependabot/maven/org.codehaus.plexus-plexus-container-default-2.1.1 in repository https://gitbox.apache.org/repos/asf/struts.git was 394025bcc Bump org.codehaus.plexus:plexus-container-default 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 fix/build-status created (now 9d2a7649c)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch fix/build-status in repository https://gitbox.apache.org/repos/asf/struts.git at 9d2a7649c Updates link to build status on Jenkins This branch includes the following new commits: new 9d2a7649c Updates link to build status on Jenkins 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: Updates link to build status on Jenkins
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch fix/build-status in repository https://gitbox.apache.org/repos/asf/struts.git commit 9d2a7649c57c5b1ec7819628a772e1a5b8880e98 Author: Lukasz Lenart AuthorDate: Sat Feb 17 08:31:57 2024 +0100 Updates link to build status on Jenkins --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ca6366563..cdabef1fc 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ The Apache Struts web framework --- -[](https://ci-builds.apache.org/job/Struts/job/Struts%20Core/job/master/) +[](https://ci-builds.apache.org/job/Struts/job/Struts%20Core/job/master/) [](https://github.com/apache/struts/actions/workflows/maven.yml) [](https://maven-badges.herokuapp.com/maven-central/org.apache.struts/struts2-core/) [](https://javadoc.io/doc/org.apache.struts/struts2-core)
