[maven-release-plugin] prepare release STRUTS_6_8_0

WW-5504 Allows to use request instead of session attribute to store nonce (#1174 )
Merge pull request #1345 from apache/dependabot/maven/release/struts-6-7-x/org.assertj-assertj-core-3.27.4
2026-08-10 00:57:04 +00:00 · 2025-09-15 07:46:18 +02:00 · 2025-09-15 07:13:24 +02:00 · 2025-09-15 07:12:26 +02:00 · 2025-09-15 07:12:00 +02:00 · 2025-09-15 07:10:30 +02:00
2401 changed files with 118228 additions and 16129 deletions
@@ -11,20 +11,24 @@ notifications:
  jira_options: link label worklog

 github:
+  description: "Apache Struts is a free, open-source, MVC framework for creating elegant, modern Java web applications"
+  homepage: https://struts.apache.org/
  del_branch_on_merge: true
  protected_branches:
    main:
      # contexts are the names of checks that must pass.
-      contexts:
-        - build
+      required_status_checks:
+        contexts:
+          - "Build and Test (JDK 17)"
      required_pull_request_reviews:
        # it does not work because our github teams are private/secret, see INFRA-25666
        require_code_owner_reviews: false
        required_approving_review_count: 0
    release/*:
      # contexts are the names of checks that must pass.
-      contexts:
-        - build
+      required_status_checks:
+        contexts:
+          - "Build and Test (JDK 8)"
      required_pull_request_reviews:
        # it does not work because our github teams are private/secret, see INFRA-25666
        require_code_owner_reviews: false
@@ -1,5 +0,0 @@
-# Set the default behavior, in case people don't have core.autocrlf set.
-* text=auto
-*.bat eol=crlf
-*.cmd eol=crlf
-*.sh eol=lf
@@ -18,7 +18,6 @@ name: "CodeQL"
 on:
  push:
    branches:
-      - 'main'
      - 'release/*'
  pull_request:

@@ -43,21 +42,21 @@ jobs:
      matrix:
        language: [ 'java' ]
    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v4
-    - name: Setup Java JDK
-      uses: actions/setup-java@v4
-      with:
-        distribution: temurin
-        java-version: 17
-        cache: 'maven'
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3.27.7
-      with:
-        languages: ${{ matrix.language }}
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v3.27.7
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3.27.7
-      with:
-        category: "/language:${{matrix.language}}"
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Setup Java JDK
+        uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: 17
+          cache: 'maven'
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v3.28.8
+        with:
+          languages: ${{ matrix.language }}
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@v3.28.8
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v3.28.8
+        with:
+          category: "/language:${{matrix.language}}"
@@ -19,8 +19,7 @@ on:
  pull_request:
  push:
    branches:
-      - 'main'
-      - 'release/*'
+      - master

 permissions: read-all

@@ -34,7 +33,7 @@ jobs:
    runs-on: ubuntu-latest
    strategy:
      matrix:
-        java: [ '17', '21' ]
+        java: [ '8', '11', '17', '21' ]
    steps:
      - name: Checkout code
        uses: actions/checkout@v4
@@ -20,8 +20,7 @@ on:
  schedule:
    - cron: "30 1 * * 6"    # Weekly on Saturdays
  push:
-    branches:
-      - "main"
+    branches: [ "master" ]

 permissions: read-all

@@ -65,6 +64,6 @@ jobs:
          retention-days: 5

      - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@89757925c7adddb19b7a2f28e3e1b27da88b7304    # 2.22.11
+        uses: github/codeql-action/upload-sarif@acb9cb18eec7e3a113ef83cff0be91e75cfd9526    # 2.22.11
        with:
          sarif_file: results.sarif
@@ -19,7 +19,7 @@ on:
  pull_request:
  push:
    branches:
-      - 'main'
+      - master

 permissions: read-all

@@ -31,7 +31,7 @@ jobs:
  sonarcloud:
    name: Scan
    runs-on: ubuntu-latest
-    if: ${{ !github.event.pull_request.base.repo.fork && !github.event.pull_request.head.repo.fork && github.actor != 'dependabot[bot]' }}
+    if: ${{ !github.event.pull_request.head.repo.fork }}
    steps:
      - uses: actions/checkout@v4
        with:
@@ -39,11 +39,9 @@ jobs:
      - uses: actions/setup-java@v4
        with:
          distribution: temurin
-          java-version: 21
+          java-version: 17
          cache: 'maven'
      - env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
          SONAR_TOKEN: ${{ secrets.SONARCLOUD_TOKEN }}
-          MAIN_BRANCH: ${{ github.ref || github.base_ref || github.ref || github.base_ref }}
-        if: ${{ github.ref == 'main' || github.base_ref == 'main' }}
-        run: ./mvnw -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.branch.name=${{ env.MAIN_BRANCH }} -Pcoverage -DskipAssembly
+        run: mvn -B -V -Pcoverage -DskipAssembly verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar --no-transfer-progress
@@ -1,5 +1,5 @@
 # IDEA
-.idea
+.idea/
 *.iml
 *.ipr
 *.iws
@@ -38,11 +38,14 @@ buildNumber.properties
 .mvn/timing.properties
 .mvn/wrapper/maven-wrapper.jar

-plugins/testng/test-output
-test-output
+plugins/testng/test-output/
+test-output/

 # Sonar
-/.sonar/
+.sonar/

 # Tidelift CLI scanner
 .tidelift
+
+# Claude Code specific local settings
+.claude/
@@ -14,6 +14,5 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-wrapperVersion=3.3.2
-distributionType=only-script
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
@@ -0,0 +1,160 @@
+# CLAUDE.md
+
+This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
+
+## Apache Struts 2 Framework (Version 6.7.x)
+
+This is the Apache Struts 2 web framework, a free open-source solution for creating Java web applications. The codebase is a multi-module Maven project with comprehensive plugin architecture.
+
+## Build System & Common Commands
+
+### Maven Commands
+```bash
+# Build entire project
+./mvnw clean install
+
+# Build without running tests
+./mvnw clean install -DskipTests
+
+# Build without assembly
+./mvnw clean install -DskipAssembly
+
+# Run all tests
+./mvnw clean test
+
+# Run tests with coverage
+./mvnw clean verify -Pcoverage -DskipAssembly
+
+# Run integration tests
+./mvnw clean verify -DskipAssembly
+
+# Test specific module
+./mvnw -pl core clean test
+./mvnw -pl plugins/spring clean test
+
+# Check for security vulnerabilities
+./mvnw clean verify -Pdependency-check
+
+# Run Apache RAT license check
+./mvnw clean prepare-package
+```
+
+### Test Framework
+- **Primary**: JUnit 4.13.2 with Maven Surefire Plugin 3.5.1
+- **Pattern**: `**/*Test.java` (excludes `**/TestBean.java`)
+- **Coverage**: JaCoCo 0.8.12
+- **Additional**: Mockito, EasyMock, AssertJ, Spring Test
+- **Integration**: Maven Failsafe Plugin with Jetty on port 8090
+
+## Project Architecture
+
+### Core Structure
+```
+struts6/
+├── core/                    # Core Struts 2 framework (main dependency)
+├── plugins/                 # Plugin modules
+│   ├── spring/             # Spring integration
+│   ├── json/               # JSON support
+│   ├── tiles/              # Apache Tiles integration
+│   ├── velocity/           # Velocity template engine
+│   └── [20+ other plugins]
+├── apps/                   # Sample applications
+│   ├── showcase/           # Feature demonstration app
+│   └── rest-showcase/      # REST API examples
+├── bundles/                # OSGi bundles
+├── bom/                    # Bill of Materials
+└── assembly/               # Distribution packaging
+```
+
+### Key Technologies
+- **Java**: Minimum JDK 8, supports up to JDK 21
+- **Servlet API**: 3.1+ required
+- **Expression Language**: OGNL 3.3.5
+- **Dependency Injection**: Custom container (`com.opensymphony.xwork2.inject`)
+- **Templating**: FreeMarker 2.3.33 (default), Velocity, JSP
+- **Logging**: SLF4J 2.0.16 with Log4j2 2.24.1
+- **Build**: Maven with wrapper (3.9.6)
+
+### Core Components Architecture
+
+#### Action Framework (MVC Pattern)
+- **Actions**: Located in `core/src/main/java/org/apache/struts2/action/`
+- **Action Support**: `ActionSupport` base class with validation and i18n
+- **Action Context**: `ActionContext` provides access to servlet objects
+- **Action Invocation**: `DefaultActionInvocation` handles action execution
+
+#### Configuration System
+- **XML-based**: Primary configuration via `struts.xml` files
+- **Annotation-based**: Convention plugin for zero-config approach  
+- **Java-based**: `StrutsJavaConfiguration` for programmatic setup
+- **Property files**: `struts.properties` for framework settings
+
+#### Interceptor Chain
+- **Framework Core**: All requests processed through interceptor chain
+- **Built-in Interceptors**: 20+ interceptors in `org.apache.struts2.interceptor`
+- **Validation**: `ValidationInterceptor` with annotation support
+- **File Upload**: `FileUploadInterceptor` with security controls
+- **Parameters**: `ParametersInterceptor` with OGNL expression handling
+
+#### Result Framework  
+- **Result Types**: JSP, FreeMarker, Redirect, Stream, JSON, etc.
+- **Chaining**: `ActionChainResult` for action-to-action calls
+- **Templates**: Pluggable result renderers
+
+#### Value Stack (OGNL Integration)
+- **Expression Language**: OGNL for property access and method calls
+- **Security**: `SecurityMemberAccess` prevents dangerous operations
+- **Performance**: Caffeine-based expression caching
+- **Context**: CompoundRoot provides hierarchical value resolution
+
+### Plugin Architecture
+Each plugin is a separate Maven module with:
+- **Plugin Descriptor**: `struts-plugin.xml` defines beans and configuration
+- **Dependency Isolation**: Separate classloaders for plugin resources
+- **Extension Points**: Configurable via dependency injection
+- **Popular Plugins**: Spring (DI), JSON (REST), Tiles (Layout), Bean Validation (JSR-303)
+
+### Security Architecture
+- **OGNL Security**: Restricted method access and class loading
+- **CSRF Protection**: Token-based with `TokenInterceptor`
+- **File Upload Security**: Type and size restrictions  
+- **Content Security Policy**: Built-in CSP support
+- **Input Validation**: Server-side validation framework
+- **Pattern Matching**: Configurable allowed/excluded patterns
+
+## Development Guidelines
+
+### Code Organization
+- **Package Structure**: Follow existing `org.apache.struts2.*` hierarchy
+- **Naming Conventions**: Use Struts conventions (Actions end with `Action`)
+- **Configuration**: Prefer XML configuration in `struts.xml` for complex setups
+- **Testing**: Each module has comprehensive unit and integration tests
+
+### Plugin Development
+```java
+// Plugin descriptor example (struts-plugin.xml)
+<bean type="com.opensymphony.xwork2.ObjectFactory" 
+      name="myObjectFactory" 
+      class="com.example.MyObjectFactory" />
+```
+
+### Common Patterns
+- **Action Implementation**: Extend `ActionSupport` or implement `Action`
+- **Result Mapping**: Use result configuration in `struts.xml`
+- **Interceptor Development**: Extend `AbstractInterceptor`
+- **Type Conversion**: Implement `TypeConverter` for custom types
+- **Validation**: Use validation XML or annotations
+
+### Important Notes
+- **Version**: Currently 6.7.5-SNAPSHOT (release branch: `release/struts-6-7-x`)
+- **Java Compatibility**: Compiled for Java 8, tested through Java 21
+- **Security**: Always validate inputs and follow OWASP guidelines
+- **Performance**: Leverage built-in caching (OGNL expressions, templates)
+- **Deprecation**: Some legacy XWork components marked for removal
+
+### Build Profiles
+- **coverage**: Enables JaCoCo coverage reporting
+- **dependency-check**: OWASP dependency vulnerability scanning  
+- **jdk17**: Special configuration for Java 17+ module system
+
+This is a mature, enterprise-grade framework with extensive documentation at https://struts.apache.org/ and active community support through Apache mailing lists and JIRA (project WW).
@@ -39,7 +39,7 @@ pipeline {
      stages {
        stage('Test') {
          steps {
-            sh './mvnw -B -DskipAssembly verify'
+            sh './mvnw -B -DskipAssembly verify --no-transfer-progress'
          }
          post {
            always {
@@ -64,15 +64,10 @@ pipeline {
        maven 'maven_3_latest'
      }
      environment {
-        MAVEN_OPTS = "-Xmx2048m"
+        MAVEN_OPTS = "-Xmx1024m"
      }
      stages {
-        stage('Install') {
-          steps {
-            sh './mvnw -B install -DskipTests -DskipAssembly'
-          }
-        }
-        stage('Test') {
+        stage('Test & Coverage') {
          steps {
            sh './mvnw -B verify -Pcoverage -DskipAssembly'
          }
@@ -83,12 +78,57 @@ pipeline {
            }
          }
        }
-        stage('Build Source & JavaDoc') {
+        stage('Code Quality') {
          when {
            anyOf {
-              branch 'main'
+              branch 'release/struts-6-7-x'
            }
          }
+          steps {
+            withCredentials([string(credentialsId: 'asf-struts-sonarcloud', variable: 'SONARCLOUD_TOKEN')]) {
+              sh './mvnw -B -Pcoverage -DskipAssembly -Dsonar.login=${SONARCLOUD_TOKEN} verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar'
+            }
+          }
+        }
+      }
+      post {
+        always {
+          cleanWs deleteDirs: true, patterns: [[pattern: '**/target/**', type: 'INCLUDE']]
+        }
+      }
+    }
+    stage('JDK 8') {
+      agent {
+        label 'ubuntu'
+      }
+      tools {
+        jdk 'jdk_1.8_latest'
+        maven 'maven_3_latest'
+      }
+      environment {
+        MAVEN_OPTS = "-Xmx1024m"
+      }
+      stages {
+        stage('Build') {
+          steps {
+            sh './mvnw -B clean install -DskipTests -DskipAssembly'
+          }
+        }
+        stage('Test') {
+          steps {
+            sh './mvnw -B verify -DskipAssembly'
+          }
+          post {
+            always {
+              junit(testResults: '**/surefire-reports/*.xml', allowEmptyResults: true)
+              junit(testResults: '**/failsafe-reports/*.xml', allowEmptyResults: true)
+            }
+          }
+        }
+        stage('Build Source & JavaDoc') {
+          when {
+            branch 'release/struts-6-7-x'
+          }
          steps {
            dir("local-snapshots-dir/") {
              deleteDir()
@@ -98,9 +138,7 @@ pipeline {
        }
        stage('Deploy Snapshot') {
          when {
-            anyOf {
-              branch 'main'
-            }
+            branch 'release/struts-6-7-x'
          }
          steps {
            withCredentials([file(credentialsId: 'lukaszlenart-repository-access-token', variable: 'CUSTOM_SETTINGS')]) {
@@ -110,9 +148,7 @@ pipeline {
        }
        stage('Upload nightlies') {
          when {
-            anyOf {
-              branch 'main'
-            }
+            branch 'release/struts-6-7-x'
          }
          steps {
            sh './mvnw -B package -DskipTests'
@@ -17,7 +17,7 @@
 The Apache Struts web framework
 -------------------------------

-[![Build Status](https://ci-builds.apache.org/buildStatus/icon?job=Struts%2FStruts+Core%2Fmain)](https://ci-builds.apache.org/job/Struts/job/Struts%20Core/job/main/)
+[![Build Status](https://ci-builds.apache.org/buildStatus/icon?job=Struts%2FStruts+Core%2Fmaster)](https://ci-builds.apache.org/job/Struts/job/Struts%20Core/job/master/)
 [![Java Build](https://github.com/apache/struts/actions/workflows/maven.yml/badge.svg)](https://github.com/apache/struts/actions/workflows/maven.yml)
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.apache.struts/struts2-core/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.apache.struts/struts2-core/)
 [![Javadocs](https://javadoc.io/badge/org.apache.struts/struts2-core.svg)](https://javadoc.io/doc/org.apache.struts/struts2-core)
@@ -24,7 +24,7 @@
    <parent>
        <groupId>org.apache.struts</groupId>
        <artifactId>struts2-parent</artifactId>
-        <version>7.0.0</version>
+        <version>6.8.0</version>
    </parent>
    <artifactId>struts2-apps</artifactId>
    <packaging>pom</packaging>
@@ -24,12 +24,12 @@
    <parent>
        <groupId>org.apache.struts</groupId>
        <artifactId>struts2-apps</artifactId>
-        <version>7.0.0</version>
+        <version>6.8.0</version>
    </parent>

    <artifactId>struts2-rest-showcase</artifactId>
    <packaging>war</packaging>
-    <version>7.0.0</version>
+    <version>6.8.0</version>
    <name>Struts 2 Rest Showcase Webapp</name>
    <description>Struts 2 Rest Showcase Example</description>

@@ -76,7 +76,7 @@
        </dependency>

        <dependency>
-            <groupId>org.htmlunit</groupId>
+            <groupId>net.sourceforge.htmlunit</groupId>
            <artifactId>htmlunit</artifactId>
            <scope>test</scope>
        </dependency>
@@ -107,7 +107,7 @@
            <plugin>
                <groupId>org.eclipse.jetty</groupId>
                <artifactId>jetty-maven-plugin</artifactId>
-                <version>11.0.18</version>
+                <version>9.4.46.v20220331</version>
                <configuration>
                    <stopKey>CTRL+C</stopKey>
                    <stopPort>8999</stopPort>
@@ -18,9 +18,9 @@
 */
 package org.demo.rest.example;

-import org.apache.struts2.ModelDriven;
-import org.apache.struts2.Validateable;
-import org.apache.struts2.ValidationAwareSupport;
+import com.opensymphony.xwork2.ModelDriven;
+import com.opensymphony.xwork2.Validateable;
+import com.opensymphony.xwork2.ValidationAwareSupport;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.struts2.convention.annotation.Result;
@@ -26,6 +26,7 @@
        </Console>
    </Appenders>
    <Loggers>
+        <Logger name="com.opensymphony.xwork2" level="info"/>
        <Logger name="org.apache.struts2" level="info"/>
        <Logger name="org.demo.rest" level="debug"/>
        <Root level="warn">
@@ -18,41 +18,31 @@
 */
 package it.org.apache.struts2.rest.example;

-import org.junit.Before;
-import org.junit.Test;
+import net.sourceforge.jwebunit.junit.WebTestCase;

-import static net.sourceforge.jwebunit.junit.JWebUnit.assertTextNotPresent;
-import static net.sourceforge.jwebunit.junit.JWebUnit.assertTextPresent;
-import static net.sourceforge.jwebunit.junit.JWebUnit.beginAt;
-import static net.sourceforge.jwebunit.junit.JWebUnit.getTestContext;
+public class GetOrdersTest extends WebTestCase {

-public class GetOrdersTest {
-
-    @Before
    public void setUp() throws Exception {
        getTestContext().setBaseUrl(ParameterUtils.getBaseUrl());
    }

-    @Test
+
    public void testGetOrders() {
        beginAt("/orders/3");
        assertTextPresent("Bob");
        assertTextNotPresent("Sarah");
    }

-    @Test
    public void testGetOrdersInHtml() {
        beginAt("/orders/3.xhtml");
        assertTextPresent("Bob");
    }

-    @Test
    public void testGetOrdersInXml() {
        beginAt("/orders/3.xml");
        assertTextPresent("<clientName>Bob");
    }

-    @Test
    public void testGetOrdersInJson() {
        beginAt("/orders/3.json");
        assertTextPresent("\"clientName\":\"Bob\"");
@@ -18,21 +18,15 @@
 */
 package it.org.apache.struts2.rest.example;

-import org.junit.Before;
-import org.junit.Test;
+import net.sourceforge.jwebunit.junit.WebTestCase;

-import static net.sourceforge.jwebunit.junit.JWebUnit.assertTextPresent;
-import static net.sourceforge.jwebunit.junit.JWebUnit.beginAt;
-import static net.sourceforge.jwebunit.junit.JWebUnit.getTestContext;
+public class ListOrdersTest extends WebTestCase {

-public class ListOrdersTest {
-
-    @Before
    public void setUp() throws Exception {
        getTestContext().setBaseUrl(ParameterUtils.getBaseUrl());
    }

-    @Test
+
    public void testListOrders() {
        beginAt("/orders");
        assertTextPresent("Bob");
@@ -40,7 +34,6 @@ public class ListOrdersTest {
        assertTextPresent("Jim");
    }

-    @Test
    public void testListOrdersInHtml() {
        beginAt("/orders.xhtml");
        assertTextPresent("Bob");
@@ -48,7 +41,6 @@ public class ListOrdersTest {
        assertTextPresent("Jim");
    }

-    @Test
    public void testListOrdersInXml() {
        beginAt("/orders.xml");
        assertTextPresent("<clientName>Bob");
@@ -56,7 +48,6 @@ public class ListOrdersTest {
        assertTextPresent("<clientName>Jim");
    }

-    @Test
    public void testListOrdersInJson() {
        beginAt("/orders.json");
        assertTextPresent("\"clientName\":\"Bob\"");
@@ -18,37 +18,23 @@
 */
 package it.org.apache.struts2.rest.example;

+import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException;
+import net.sourceforge.jwebunit.junit.WebTestCase;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
-import org.htmlunit.FailingHttpStatusCodeException;
-import org.junit.Before;
-import org.junit.Test;

 import java.io.IOException;

-import static net.sourceforge.jwebunit.junit.JWebUnit.assertLinkNotPresentWithText;
-import static net.sourceforge.jwebunit.junit.JWebUnit.assertTextFieldEquals;
-import static net.sourceforge.jwebunit.junit.JWebUnit.assertTextPresent;
-import static net.sourceforge.jwebunit.junit.JWebUnit.beginAt;
-import static net.sourceforge.jwebunit.junit.JWebUnit.getTestContext;
-import static net.sourceforge.jwebunit.junit.JWebUnit.setTextField;
-import static net.sourceforge.jwebunit.junit.JWebUnit.setWorkingForm;
-import static net.sourceforge.jwebunit.junit.JWebUnit.submit;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+public class PostOrderTest extends WebTestCase {

-public class PostOrderTest {
-
-    @Before
    public void setUp() throws Exception {
        getTestContext().setBaseUrl(ParameterUtils.getBaseUrl());
    }

-    @Test
+
    public void testPostOrder() {
        beginAt("/orders/new");
        setWorkingForm(0);
@@ -59,7 +45,6 @@ public class PostOrderTest {
        assertLinkNotPresentWithText("Back to Orders");
    }

-    @Test
    public void testPostOrderWithErrors() {
        beginAt("/orders/new");
        setWorkingForm(0);
@@ -73,7 +58,6 @@ public class PostOrderTest {
        assertTextFieldEquals("amount", "321");
    }

-    @Test
    public void testPostOrderInHtml() {
        beginAt("/orders/new.xhtml");
        setWorkingForm(0);
@@ -88,7 +72,6 @@ public class PostOrderTest {
        assertLinkNotPresentWithText("Back to Orders");
    }

-    @Test
    public void testPostOrderInXml() throws IOException {
        CloseableHttpClient client = HttpClients.createDefault();
        HttpPost httpPost = new HttpPost(ParameterUtils.getBaseUrl() + "/orders.xml");
@@ -102,7 +85,6 @@ public class PostOrderTest {
        client.close();
    }

-    @Test
    public void testPostOrderInXmlWithBadData() throws IOException {
        CloseableHttpClient client = HttpClients.createDefault();
        HttpPost httpPost = new HttpPost(ParameterUtils.getBaseUrl() + "/orders.xml");
@@ -116,7 +98,6 @@ public class PostOrderTest {
        client.close();
    }

-    @Test
    public void testPostOrderInJson() throws IOException {
        CloseableHttpClient client = HttpClients.createDefault();
        HttpPost httpPost = new HttpPost(ParameterUtils.getBaseUrl() + "/orders.json");
@@ -127,7 +108,6 @@ public class PostOrderTest {
        client.close();
    }

-    @Test
    public void testPostOrderInJsonWithBadData() throws IOException {
        CloseableHttpClient client = HttpClients.createDefault();
        HttpPost httpPost = new HttpPost(ParameterUtils.getBaseUrl() + "/orders.json");
@@ -24,7 +24,7 @@
    <parent>
        <groupId>org.apache.struts</groupId>
        <artifactId>struts2-apps</artifactId>
-        <version>7.0.0</version>
+        <version>6.8.0</version>
    </parent>

    <artifactId>struts2-showcase</artifactId>
@@ -48,11 +48,21 @@
            <artifactId>struts2-config-browser-plugin</artifactId>
        </dependency>

+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-sitemesh-plugin</artifactId>
+        </dependency>
+
        <dependency>
            <groupId>org.apache.struts</groupId>
            <artifactId>struts2-tiles-plugin</artifactId>
        </dependency>

+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-dwr-plugin</artifactId>
+        </dependency>
+
        <dependency>
            <groupId>org.apache.struts</groupId>
            <artifactId>struts2-json-plugin</artifactId>
@@ -82,14 +92,6 @@
            <groupId>org.apache.struts</groupId>
            <artifactId>struts2-velocity-plugin</artifactId>
        </dependency>
-        <dependency>
-            <groupId>org.apache.struts</groupId>
-            <artifactId>struts2-velocity-tools-view-jakarta</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.struts</groupId>
-            <artifactId>struts2-velocity-tools-jsp-jakarta</artifactId>
-        </dependency>

        <dependency>
            <groupId>org.apache.struts</groupId>
@@ -97,8 +99,8 @@
        </dependency>

        <dependency>
-            <groupId>jakarta.servlet</groupId>
-            <artifactId>jakarta.servlet-api</artifactId>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
            <scope>provided</scope>
        </dependency>

@@ -121,9 +123,12 @@
        </dependency>

        <dependency>
-           <groupId>org.sitemesh</groupId>
-           <artifactId>sitemesh</artifactId>
-           <version>3.2.1</version>
+            <groupId>opensymphony</groupId>
+            <artifactId>sitemesh</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.directwebremoting</groupId>
+            <artifactId>dwr</artifactId>
        </dependency>

       <dependency>
@@ -139,71 +144,22 @@
        </dependency>

       <dependency>
-           <groupId>org.htmlunit</groupId>
-           <artifactId>htmlunit</artifactId>
-           <scope>test</scope>
-       </dependency>
+            <groupId>net.sourceforge.htmlunit</groupId>
+            <artifactId>htmlunit</artifactId>
+            <scope>test</scope>
+        </dependency>

        <!-- BeanValidation Example -->
        <dependency>
            <groupId>org.hibernate.validator</groupId>
            <artifactId>hibernate-validator</artifactId>
            <version>${hibernate-validator.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>jakarta.validation</groupId>
-                    <artifactId>jakarta.validation-api</artifactId>
-                </exclusion>
-            </exclusions>
        </dependency>

-        <!--
-         Nashorn (the built-in JDK javascript engine) was deprecated in JDK 11 and removed in JDK 15
-         As a result attempting to use @ScriptAssert on JDK 17 leads to the exception
-         See more details
-         https://stackoverflow.com/questions/78008950/resolve-org-hibernate-validator-spi-scripting-scriptevaluatornotfoundexception
-         -->
-        <dependency>
-            <groupId>org.codehaus.groovy</groupId>
-            <artifactId>groovy-jsr223</artifactId>
-            <version>3.0.22</version>
-        </dependency>
    </dependencies>

    <build>
        <plugins>
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-dependency-plugin</artifactId>
-              <executions>
-                <execution>
-                  <?m2e ignore?>
-                  <id>copy-dependencies</id>
-                  <phase>package</phase>
-                  <goals>
-                    <goal>copy</goal>
-                  </goals>
-                  <configuration>
-                    <outputDirectory>${project.build.directory}/extraclasspath</outputDirectory>
-                    <artifactItems>
-                      <artifactItem>
-                        <groupId>org.apache.struts</groupId>
-                        <artifactId>struts2-velocity-tools-view-jakarta</artifactId>
-                        <destFileName>struts2-velocity-tools-view-jakarta.jar</destFileName>
-                      </artifactItem>
-                      <artifactItem>
-                        <groupId>org.apache.struts</groupId>
-                        <artifactId>struts2-velocity-tools-jsp-jakarta</artifactId>
-                        <destFileName>struts2-velocity-tools-jsp-jakarta.jar</destFileName>
-                      </artifactItem>
-                    </artifactItems>
-                    <overWriteReleases>false</overWriteReleases>
-                    <overWriteSnapshots>false</overWriteSnapshots>
-                    <overWriteIfNewer>true</overWriteIfNewer>
-                  </configuration>
-                </execution>
-              </executions>
-            </plugin>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-failsafe-plugin</artifactId>
@@ -234,7 +190,7 @@
            <plugin>
                <groupId>org.eclipse.jetty</groupId>
                <artifactId>jetty-maven-plugin</artifactId>
-                <version>11.0.18</version>
+                <version>9.4.46.v20220331</version>
                <configuration>
                    <stopKey>CTRL+C</stopKey>
                    <stopPort>8999</stopPort>
@@ -247,15 +203,12 @@
                    <httpConnector>
                        <port>8090</port>
                    </httpConnector>
-                    <scan>10</scan>
-                    <webApp>
-                      <extraClasspath>
-                        ${project.build.directory}/extraclasspath/struts2-velocity-tools-view-jakarta.jar,
-                        ${project.build.directory}/extraclasspath/struts2-velocity-tools-jsp-jakarta
-                      </extraClasspath>
-                      <contextPath>/struts2-showcase</contextPath>
-                      <descriptor>${basedir}/src/main/webapp/WEB-INF/web.xml</descriptor>
-                    </webApp>
+                    <scanIntervalSeconds>10</scanIntervalSeconds>
+                    <webAppSourceDirectory>${basedir}/src/main/webapp/</webAppSourceDirectory>
+                    <webAppConfig>
+                        <contextPath>/struts2-showcase</contextPath>
+                        <descriptor>${basedir}/src/main/webapp/WEB-INF/web.xml</descriptor>
+                    </webAppConfig>
                </configuration>
                <executions>
                    <execution>
@@ -20,7 +20,7 @@
 */
 package org.apache.struts2.showcase;

-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;

 import java.text.DateFormat;
 import java.util.Calendar;
@@ -20,7 +20,7 @@
 */
 package org.apache.struts2.showcase;

-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;
 import org.apache.struts2.showcase.ajax.tree.Category;

@@ -20,7 +20,7 @@
 */
 package org.apache.struts2.showcase;

-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;

 import java.util.ArrayList;
@@ -20,7 +20,7 @@
 */
 package org.apache.struts2.showcase;

-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;

 /**
@@ -20,7 +20,7 @@
 */
 package org.apache.struts2.showcase;

-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;

 import java.util.ArrayList;
@@ -20,7 +20,7 @@
 */
 package org.apache.struts2.showcase;

-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;
 import org.apache.struts2.showcase.ajax.tree.Category;

@@ -20,7 +20,7 @@
 */
 package org.apache.struts2.showcase;

-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.showcase.ajax.tree.Category;

 // START SNIPPET: treeExampleDynamicJavaShow
@@ -20,9 +20,9 @@
 */
 package org.apache.struts2.showcase;

-import org.apache.struts2.ActionSupport;
-import org.apache.struts2.Validateable;
-import org.apache.struts2.util.ValueStack;
+import com.opensymphony.xwork2.ActionSupport;
+import com.opensymphony.xwork2.Validateable;
+import com.opensymphony.xwork2.util.ValueStack;
 import org.apache.struts2.ServletActionContext;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;

@@ -18,7 +18,7 @@
 */
 package org.apache.struts2.showcase.action;

-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;
@@ -18,7 +18,7 @@
 */
 package org.apache.struts2.showcase.action;

-import org.apache.struts2.Preparable;
+import com.opensymphony.xwork2.Preparable;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;
@@ -18,7 +18,7 @@
 */
 package org.apache.struts2.showcase.action;

-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;

 import java.util.Arrays;
 import java.util.Date;
@@ -18,8 +18,8 @@
 */
 package org.apache.struts2.showcase.action;

-import org.apache.struts2.action.Action;
-import org.apache.struts2.interceptor.annotations.After;
+import com.opensymphony.xwork2.Action;
+import com.opensymphony.xwork2.interceptor.annotations.After;
 import org.apache.struts2.ServletActionContext;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;

@@ -18,7 +18,7 @@
 */
 package org.apache.struts2.showcase.action;

-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;
 import org.apache.struts2.showcase.model.MyDto;

@@ -18,7 +18,7 @@
 */
 package org.apache.struts2.showcase.action;

-import org.apache.struts2.Preparable;
+import com.opensymphony.xwork2.Preparable;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;
@@ -18,7 +18,7 @@
 */
 package org.apache.struts2.showcase.actionchaining;

-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;

 public class ActionChain1 extends ActionSupport {
@@ -18,7 +18,7 @@
 */
 package org.apache.struts2.showcase.actionchaining;

-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;

 public class ActionChain2 extends ActionSupport {
@@ -18,7 +18,7 @@
 */
 package org.apache.struts2.showcase.actionchaining;

-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;

 public class ActionChain3 extends ActionSupport {
@@ -20,7 +20,7 @@
 */
 package org.apache.struts2.showcase.ajax;

-import org.apache.struts2.action.Action;
+import com.opensymphony.xwork2.Action;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;

 import java.io.Serializable;
@@ -20,7 +20,7 @@
 */
 package org.apache.struts2.showcase.ajax;

-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;

 import java.util.ArrayList;
@@ -20,7 +20,7 @@
 */
 package org.apache.struts2.showcase.ajax;

-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;

 import java.text.SimpleDateFormat;
@@ -20,7 +20,7 @@
 */
 package org.apache.struts2.showcase.ajax;

-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;

 public class Example5Action extends ActionSupport {
@@ -46,7 +46,8 @@ public class Category {
 						new Category(15, "Dojo"),
 						new Category(16, "Prototype"),
 						new Category(17, "Scriptaculous"),
-						new Category(18, "OpenRico")));
+						new Category(18, "OpenRico"),
+						new Category(19, "DWR")));
 	}

 	public static Category getById(long id) {
@@ -20,7 +20,7 @@
 */
 package org.apache.struts2.showcase.ajax.tree;

-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;

 /**
@@ -31,10 +31,9 @@ import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

-import java.io.Serial;
 import java.io.Serializable;
+import java.util.Arrays;
 import java.util.Date;
-import java.util.List;

 /**
 * TestDataProvider.
@@ -42,76 +41,74 @@ import java.util.List;
@Service
 public class TestDataProvider implements Serializable, InitializingBean {

-    @Serial
-    private static final long serialVersionUID = 1L;
-    private static final Logger log = LogManager.getLogger(TestDataProvider.class);
+	private static final long serialVersionUID = 1L;
+	private static final Logger log = LogManager.getLogger(TestDataProvider.class);

-    public static final String[] POSITIONS = {
-            "Developer",
-            "System Architect",
-            "Sales Manager",
-            "CEO"
-    };
+	public static final String[] POSITIONS = {
+			"Developer",
+			"System Architect",
+			"Sales Manager",
+			"CEO"
+	};

-    public static final String[] LEVELS = {
-            "Junior",
-            "Senior",
-            "Master"
-    };
+	public static final String[] LEVELS = {
+			"Junior",
+			"Senior",
+			"Master"
+	};

-    private static final Skill[] TEST_SKILLS = {
-            new Skill("WW-SEN", "Struts Senior Developer"),
-            new Skill("WW-JUN", "Struts Junior Developer"),
-            new Skill("SPRING-DEV", "Spring Developer")
-    };
+	private static final Skill[] TEST_SKILLS = {
+			new Skill("WW-SEN", "Struts Senior Developer"),
+			new Skill("WW-JUN", "Struts Junior Developer"),
+			new Skill("SPRING-DEV", "Spring Developer")
+	};

-    public static final Employee[] TEST_EMPLOYEES = {
-            new Employee(1L, "Alan", "Smithee", new Date(), 2000f, true, POSITIONS[0],
-                    TEST_SKILLS[0], null, "alan", LEVELS[0], "Nice guy"),
-            new Employee(2L, "Robert", "Robson", new Date(), 10000f, false, POSITIONS[1],
-                    TEST_SKILLS[1], List.of(TEST_SKILLS).subList(1, TEST_SKILLS.length), "rob", LEVELS[1], "Smart guy")
-    };
+	public static final Employee[] TEST_EMPLOYEES = {
+			new Employee(new Long(1), "Alan", "Smithee", new Date(), new Float(2000f), true, POSITIONS[0],
+					TEST_SKILLS[0], null, "alan", LEVELS[0], "Nice guy"),
+			new Employee(new Long(2), "Robert", "Robson", new Date(), new Float(10000f), false, POSITIONS[1],
+					TEST_SKILLS[1], Arrays.asList(TEST_SKILLS).subList(1, TEST_SKILLS.length), "rob", LEVELS[1], "Smart guy")
+	};

-    @Autowired
-    private SkillDao skillDao;
+	@Autowired
+	private SkillDao skillDao;

-    @Autowired
-    private EmployeeDao employeeDao;
+	@Autowired
+	private EmployeeDao employeeDao;

-    protected void addTestSkills() {
-        try {
-            for (Skill testSkill : TEST_SKILLS) {
-                skillDao.merge(testSkill);
-            }
-            if (log.isInfoEnabled()) {
-                log.info("TestDataProvider - [addTestSkills]: Added test skill data.");
-            }
-        } catch (StorageException e) {
-            log.error("TestDataProvider - [addTestSkills]: Exception caught: {}", e.getMessage());
-        }
-    }
+	protected void addTestSkills() {
+		try {
+			for (int i = 0, j = TEST_SKILLS.length; i < j; i++) {
+				skillDao.merge(TEST_SKILLS[i]);
+			}
+			if (log.isInfoEnabled()) {
+				log.info("TestDataProvider - [addTestSkills]: Added test skill data.");
+			}
+		} catch (StorageException e) {
+			log.error("TestDataProvider - [addTestSkills]: Exception catched: " + e.getMessage());
+		}
+	}

-    protected void addTestEmployees() {
-        try {
-            for (Employee testEmployee : TEST_EMPLOYEES) {
-                employeeDao.merge(testEmployee);
-            }
-            if (log.isInfoEnabled()) {
-                log.info("TestDataProvider - [addTestEmployees]: Added test employee data.");
-            }
-        } catch (StorageException e) {
-            log.error("TestDataProvider - [addTestEmployees]: Exception caught: {}", e.getMessage());
-        }
-    }
+	protected void addTestEmployees() {
+		try {
+			for (int i = 0, j = TEST_EMPLOYEES.length; i < j; i++) {
+				employeeDao.merge(TEST_EMPLOYEES[i]);
+			}
+			if (log.isInfoEnabled()) {
+				log.info("TestDataProvider - [addTestEmployees]: Added test employee data.");
+			}
+		} catch (StorageException e) {
+			log.error("TestDataProvider - [addTestEmployees]: Exception catched: " + e.getMessage());
+		}
+	}

-    protected void addTestData() {
-        addTestSkills();
-        addTestEmployees();
-    }
+	protected void addTestData() {
+		addTestSkills();
+		addTestEmployees();
+	}

-    @Override
-    public void afterPropertiesSet() throws Exception {
-        addTestData();
-    }
+	public void afterPropertiesSet() throws Exception {
+		addTestData();
+	}

 }
@@ -18,13 +18,13 @@
 */
 package org.apache.struts2.showcase.async;

-import jakarta.servlet.Filter;
-import jakarta.servlet.FilterChain;
-import jakarta.servlet.FilterConfig;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.ServletRequest;
-import jakarta.servlet.ServletResponse;
-import jakarta.servlet.http.HttpServletRequest;
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;

 /**
@@ -18,7 +18,7 @@
 */
 package org.apache.struts2.showcase.async;

-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;

 import java.util.ArrayList;
@@ -21,10 +21,10 @@
 package org.apache.struts2.showcase.chat;


-import org.apache.struts2.action.Action;
-import org.apache.struts2.ActionContext;
-import org.apache.struts2.ActionInvocation;
-import org.apache.struts2.interceptor.AbstractInterceptor;
+import com.opensymphony.xwork2.Action;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.interceptor.AbstractInterceptor;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

@@ -20,10 +20,10 @@
 */
 package org.apache.struts2.showcase.chat;

-import org.apache.struts2.action.Action;
-import org.apache.struts2.ActionContext;
-import org.apache.struts2.ActionInvocation;
-import org.apache.struts2.interceptor.AbstractInterceptor;
+import com.opensymphony.xwork2.Action;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.interceptor.AbstractInterceptor;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

@@ -20,7 +20,7 @@
 */
 package org.apache.struts2.showcase.chat;

-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.action.SessionAware;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;

@@ -20,7 +20,7 @@
 */
 package org.apache.struts2.showcase.chat;

-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;

 import java.util.Map;

@@ -25,9 +25,9 @@ import org.apache.logging.log4j.LogManager;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;

-import jakarta.servlet.http.HttpSession;
-import jakarta.servlet.http.HttpSessionEvent;
-import jakarta.servlet.http.HttpSessionListener;
+import javax.servlet.http.HttpSession;
+import javax.servlet.http.HttpSessionEvent;
+import javax.servlet.http.HttpSessionListener;

 public class ChatSessionListener implements HttpSessionListener {

@@ -20,7 +20,7 @@
 */
 package org.apache.struts2.showcase.chat;

-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;

 public class CrudRoomAction extends ActionSupport {
@@ -20,8 +20,8 @@
 */
 package org.apache.struts2.showcase.chat;

-import org.apache.struts2.conversion.impl.XWorkConverter;
-import org.apache.struts2.inject.Inject;
+import com.opensymphony.xwork2.conversion.impl.XWorkConverter;
+import com.opensymphony.xwork2.inject.Inject;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
 import org.apache.struts2.util.StrutsTypeConverter;
@@ -20,7 +20,7 @@
 */
 package org.apache.struts2.showcase.chat;

-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.action.SessionAware;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;

@@ -20,7 +20,7 @@
 */
 package org.apache.struts2.showcase.chat;

-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.action.SessionAware;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;

@@ -20,7 +20,7 @@
 */
 package org.apache.struts2.showcase.chat;

-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;

 import java.util.ArrayList;
@@ -20,7 +20,7 @@
 */
 package org.apache.struts2.showcase.chat;

-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;

 import java.util.ArrayList;
 import java.util.List;
@@ -20,7 +20,7 @@
 */
 package org.apache.struts2.showcase.chat;

-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.action.SessionAware;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;

@@ -20,7 +20,7 @@
 */
 package org.apache.struts2.showcase.chat;

-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;

 import java.util.ArrayList;
 import java.util.List;
@@ -20,7 +20,7 @@
 */
 package org.apache.struts2.showcase.chat;

-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;

 import java.util.ArrayList;
@@ -20,7 +20,7 @@
 */
 package org.apache.struts2.showcase.conversion;

-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;

 import java.util.LinkedHashSet;
@@ -20,7 +20,7 @@
 */
 package org.apache.struts2.showcase.conversion;

-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;

 import java.util.Arrays;
@@ -20,7 +20,7 @@
 */
 package org.apache.struts2.showcase.conversion;

-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;

 import java.util.List;
@@ -20,7 +20,7 @@
 */
 package org.apache.struts2.showcase.filedownload;

-import org.apache.struts2.action.Action;
+import com.opensymphony.xwork2.Action;
 import org.apache.struts2.ServletActionContext;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;

@@ -20,7 +20,7 @@
 */
 package org.apache.struts2.showcase.fileupload;

-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.action.UploadedFilesAware;
 import org.apache.struts2.dispatcher.multipart.UploadedFile;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;
@@ -21,7 +21,7 @@
 // START SNIPPET: entire-file
 package org.apache.struts2.showcase.fileupload;

-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.action.UploadedFilesAware;
 import org.apache.struts2.dispatcher.multipart.UploadedFile;

@@ -21,7 +21,7 @@
 // START SNIPPET: entire-file
 package org.apache.struts2.showcase.fileupload;

-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.action.UploadedFilesAware;
 import org.apache.struts2.dispatcher.multipart.UploadedFile;

@@ -20,12 +20,12 @@
 */
 package org.apache.struts2.showcase.freemarker;

-import org.apache.struts2.util.ValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
 import org.apache.struts2.views.freemarker.FreemarkerManager;
 import org.apache.struts2.views.freemarker.ScopesHashModel;

-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;

 /**
 * <p>
@@ -20,8 +20,8 @@
 */
 package org.apache.struts2.showcase.freemarker;

-import org.apache.struts2.ActionSupport;
-import org.apache.struts2.Preparable;
+import com.opensymphony.xwork2.ActionSupport;
+import com.opensymphony.xwork2.Preparable;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;

 import java.text.DateFormatSymbols;
@@ -20,7 +20,7 @@
 */
 package org.apache.struts2.showcase.hangman;

-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;

 import java.util.Map;

@@ -20,7 +20,7 @@
 */
 package org.apache.struts2.showcase.hangman;

-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.action.SessionAware;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;

@@ -20,34 +20,40 @@
 */
 package org.apache.struts2.showcase.hangman;

-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-import java.io.Serial;
 import java.io.Serializable;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;

 public class Hangman implements Serializable {

-	private static final Logger log = LogManager.getLogger(Hangman.class);
-
-	@Serial
 	private static final long serialVersionUID = 8566954355839652509L;

-	private final Vocab vocab;
+	private Vocab vocab;

 	private Boolean win = false;

 	private int guessLeft = 5;
-	public final List<Character> charactersAvailable;
+	public List<Character> charactersAvailable;
 	public List<Character> charactersGuessed;

 	public Hangman(Vocab vocab) {
-		charactersAvailable = new ArrayList<>(List.of(
-                'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
-				'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z'));
-		charactersGuessed = new ArrayList<>();
+		// Arrays.asList(...) returns List that doesn't support remove(), hence
+		// we wrap it with an ArrayList to avoid UnsupportedOperationException
+		// when doing a remove()
+		charactersAvailable = new ArrayList<Character>(Arrays.asList(
+				new Character[]{
+						Character.valueOf('A'), Character.valueOf('B'), Character.valueOf('C'),
+						Character.valueOf('D'), Character.valueOf('E'), Character.valueOf('F'),
+						Character.valueOf('G'), Character.valueOf('H'), Character.valueOf('I'),
+						Character.valueOf('J'), Character.valueOf('K'), Character.valueOf('L'),
+						Character.valueOf('M'), Character.valueOf('N'), Character.valueOf('O'),
+						Character.valueOf('P'), Character.valueOf('Q'), Character.valueOf('R'),
+						Character.valueOf('S'), Character.valueOf('T'), Character.valueOf('U'),
+						Character.valueOf('V'), Character.valueOf('W'), Character.valueOf('X'),
+						Character.valueOf('Y'), Character.valueOf('Z')
+				}));
+		charactersGuessed = new ArrayList<Character>();
 		this.vocab = vocab;
 	}

@@ -69,8 +75,8 @@ public class Hangman implements Serializable {
 			}
 			if (vocab.containsAllCharacter(charactersGuessed)) {
 				win = true;
-				log.info("Game won");
 			}
+			System.out.println(" *********************************** " + win);
 		}
 	}

@@ -92,7 +98,7 @@ public class Hangman implements Serializable {

 	public List<Character> getCharactersAvailable() {
 		synchronized (charactersAvailable) {
-			return new ArrayList<>(charactersAvailable);
+			return new ArrayList<Character>(charactersAvailable);
 			//return charactersAvailable;
 		}
 	}
@@ -20,7 +20,7 @@
 */
 package org.apache.struts2.showcase.hangman;

-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;

 import java.util.Map;

@@ -20,19 +20,17 @@
 */
 package org.apache.struts2.showcase.hangman;

-import java.io.Serial;
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.HashSet;
 import java.util.List;

 public class Vocab implements Serializable {

-	@Serial
 	private static final long serialVersionUID = 1L;

-	private final String vocab;
-	private final String hint;
+	private String vocab;
+	private String hint;
 	private Character[] characters; // character this vocab is made up of

 	public Vocab(String vocab, String hint) {
@@ -54,7 +52,7 @@ public class Vocab implements Serializable {
 	public Boolean containCharacter(Character character) {
 		assert (character != null);

-		return vocab.contains(character.toString());
+		return (vocab.contains(character.toString())) ? true : false;
 	}

 	public Character[] inCharacters() {
@@ -62,21 +60,32 @@ public class Vocab implements Serializable {
 			char[] c = vocab.toCharArray();
 			characters = new Character[c.length];
 			for (int a = 0; a < c.length; a++) {
-				characters[a] = c[a];
+				characters[a] = Character.valueOf(c[a]);
 			}
 		}
 		return characters;
 	}

 	public boolean containsAllCharacter(List<Character> charactersGuessed) {
-		return new HashSet<>(charactersGuessed).containsAll(Arrays.asList(inCharacters()));
+		Character[] chars = inCharacters();
+		List<Character> tmpChars = Arrays.asList(chars);
+		return charactersGuessed.containsAll(tmpChars);
 	}

-	public static void main(String[] args) throws Exception {
+	public static void main(String args[]) throws Exception {
 		Vocab v = new Vocab("JAVA", "a java word");

-		System.out.println(v.containsAllCharacter(List.of('J', 'V')));
-		System.out.println(v.containsAllCharacter(List.of('J', 'V', 'A')));
+		List<Character> list1 = new ArrayList<Character>();
+		list1.add(new Character('J'));
+		list1.add(new Character('V'));
+
+		List<Character> list2 = new ArrayList<Character>();
+		list2.add(new Character('J'));
+		list2.add(new Character('V'));
+		list2.add(new Character('A'));
+
+		System.out.println(v.containsAllCharacter(list1));
+		System.out.println(v.containsAllCharacter(list2));

 	}
 }
@@ -20,8 +20,8 @@
 */
 package org.apache.struts2.showcase.modelDriven;

-import org.apache.struts2.ActionSupport;
-import org.apache.struts2.ModelDriven;
+import com.opensymphony.xwork2.ActionSupport;
+import com.opensymphony.xwork2.ModelDriven;
 import org.apache.struts2.showcase.modelDriven.model.Gangster;

 /**
@@ -20,7 +20,7 @@
 */
 package org.apache.struts2.showcase.person;

-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.convention.annotation.Result;
 import org.apache.struts2.convention.annotation.Results;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;
@@ -20,7 +20,7 @@
 */
 package org.apache.struts2.showcase.person;

-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.convention.annotation.Result;
 import org.springframework.beans.factory.annotation.Autowired;

@@ -20,7 +20,7 @@
 */
 package org.apache.struts2.showcase.person;

-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.convention.annotation.Result;
 import org.apache.struts2.convention.annotation.Results;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;
@@ -20,10 +20,10 @@
 */
 package org.apache.struts2.showcase.servlet;

-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServlet;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;

 public class TestServlet extends HttpServlet {
@@ -20,12 +20,12 @@
 */
 package org.apache.struts2.showcase.source;

-import org.apache.struts2.ActionSupport;
-import org.apache.struts2.util.ClassLoaderUtil;
+import com.opensymphony.xwork2.ActionSupport;
+import com.opensymphony.xwork2.util.ClassLoaderUtil;
 import org.apache.struts2.action.ServletContextAware;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;

-import jakarta.servlet.ServletContext;
+import javax.servlet.ServletContext;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
@@ -20,7 +20,7 @@
 */
 package org.apache.struts2.showcase.tag.nonui.actionPrefix;

-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;

 public class SubmitAction extends ActionSupport {
@@ -20,7 +20,7 @@
 */
 package org.apache.struts2.showcase.tag.nonui.actiontag;

-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;

 /**
 */
@@ -18,7 +18,7 @@
 */
 package org.apache.struts2.showcase.tag.nonui.debugtag;

-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.dispatcher.PrepareOperations;

 public class DebugTagAction extends ActionSupport {
@@ -20,8 +20,8 @@
 */
 package org.apache.struts2.showcase.tag.nonui.iteratortag;

-import org.apache.struts2.ActionSupport;
-import org.apache.struts2.Validateable;
+import com.opensymphony.xwork2.ActionSupport;
+import com.opensymphony.xwork2.Validateable;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;

 /**
@@ -20,7 +20,7 @@
 */
 package org.apache.struts2.showcase.tag.nonui.iteratortag;

-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;

 /**
@@ -20,8 +20,8 @@
 */
 package org.apache.struts2.showcase.tag.nonui.iteratortag;

-import org.apache.struts2.ActionSupport;
-import org.apache.struts2.Validateable;
+import com.opensymphony.xwork2.ActionSupport;
+import com.opensymphony.xwork2.Validateable;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;


@@ -20,8 +20,8 @@
 */
 package org.apache.struts2.showcase.tag.nonui.iteratortag;

-import org.apache.struts2.ActionSupport;
-import org.apache.struts2.Validateable;
+import com.opensymphony.xwork2.ActionSupport;
+import com.opensymphony.xwork2.Validateable;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;

 /**
@@ -24,7 +24,7 @@ import org.apache.struts2.convention.annotation.Result;
 import org.apache.struts2.tiles.annotation.TilesDefinition;
 import org.apache.struts2.tiles.annotation.TilesPutAttribute;

-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;

@Namespace("/tiles")
@ParentPackage("tiles")
@@ -20,8 +20,8 @@
 */
 package org.apache.struts2.showcase.token;

-import org.apache.struts2.ActionContext;
-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;

 import java.util.Date;
@@ -20,7 +20,7 @@
 */
 package org.apache.struts2.showcase.validation;

-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;

 /**
 */
@@ -18,15 +18,15 @@
 */
 package org.apache.struts2.showcase.validation;

-import org.apache.struts2.validator.annotations.DateRangeFieldValidator;
-import org.apache.struts2.validator.annotations.EmailValidator;
-import org.apache.struts2.validator.annotations.FieldExpressionValidator;
-import org.apache.struts2.validator.annotations.IntRangeFieldValidator;
-import org.apache.struts2.validator.annotations.RegexFieldValidator;
-import org.apache.struts2.validator.annotations.RequiredFieldValidator;
-import org.apache.struts2.validator.annotations.RequiredStringValidator;
-import org.apache.struts2.validator.annotations.StringLengthFieldValidator;
-import org.apache.struts2.validator.annotations.UrlValidator;
+import com.opensymphony.xwork2.validator.annotations.DateRangeFieldValidator;
+import com.opensymphony.xwork2.validator.annotations.EmailValidator;
+import com.opensymphony.xwork2.validator.annotations.FieldExpressionValidator;
+import com.opensymphony.xwork2.validator.annotations.IntRangeFieldValidator;
+import com.opensymphony.xwork2.validator.annotations.RegexFieldValidator;
+import com.opensymphony.xwork2.validator.annotations.RequiredFieldValidator;
+import com.opensymphony.xwork2.validator.annotations.RequiredStringValidator;
+import com.opensymphony.xwork2.validator.annotations.StringLengthFieldValidator;
+import com.opensymphony.xwork2.validator.annotations.UrlValidator;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;

 import java.sql.Date;
@@ -20,7 +20,7 @@
 */
 package org.apache.struts2.showcase.validation;

-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts.beanvalidation.constraints.FieldMatch;
 import org.apache.struts2.convention.annotation.Action;
 import org.apache.struts2.convention.annotation.Namespace;
@@ -31,13 +31,13 @@ import org.apache.struts2.interceptor.validation.SkipValidation;
 import org.hibernate.validator.constraints.ScriptAssert;
 import org.hibernate.validator.constraints.URL;

-import jakarta.validation.constraints.Email;
-import jakarta.validation.constraints.Max;
-import jakarta.validation.constraints.Min;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Pattern;
-import jakarta.validation.constraints.Size;
+import javax.validation.constraints.Email;
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
+import javax.validation.constraints.Size;
 import java.util.Date;

 // <!-- START SNIPPET: beanValidationExample -->
@@ -20,7 +20,7 @@
 */
 package org.apache.struts2.showcase.validation;

-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;

 /**
@@ -20,7 +20,7 @@
 */
 package org.apache.struts2.showcase.validation;

-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;

 /**
@@ -20,7 +20,7 @@
 */
 package org.apache.struts2.showcase.wait;

-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;

 /**
@@ -20,12 +20,10 @@
 */
 package org.apache.struts2.showcase.xslt;

-import org.apache.struts2.ActionSupport;
-
-import jakarta.servlet.http.HttpServletRequest;
-
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.action.ServletRequestAware;

+import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
 import java.util.Properties;

@@ -30,5 +30,6 @@
            <AppenderRef ref="STDOUT"/>
        </Root>
        <Logger name="org.apache.struts2" level="info"/>
+        <Logger name="com.opensymphony.xwork2" level="info"/>
    </Loggers>
 </Configuration>
@@ -21,6 +21,6 @@
 <div style="background-color:yellow;">
 <p>
 Freemarker Custom Template -
-parameter 'paramName' - ${attributes.paramName}
+parameter 'paramName' - ${parameters.paramName}
 </p>
 </div>
@@ -24,9 +24,6 @@
 	"https://struts.apache.org/dtds/struts-6.0.dtd">

 <struts>
-
-	<constant name="struts.multipart.maxSize" value="10240" />
-
 	<package name="fileupload" extends="struts-default" namespace="/fileupload">

        <action name="upload" class="org.apache.struts2.showcase.fileupload.FileUploadAction" method="input">
@@ -47,7 +47,12 @@
            <result>/WEB-INF/validation/quiz-success.jsp</result>
        </action>

-		<action name="quizClientCss" class="org.apache.struts2.showcase.validation.QuizAction">
+		<action name="quizDwr" class="org.apache.struts2.showcase.validation.QuizAction">
+			<result name="input">/WEB-INF/validation/quiz-dwr.jsp</result>
+			<result>/WEB-INF/validation/quiz-success.jsp</result>
+		</action>
+
+        <action name="quizClientCss" class="org.apache.struts2.showcase.validation.QuizAction">
            <result name="input">/WEB-INF/validation/quiz-client-css.jsp</result>
            <result>/WEB-INF/validation/quiz-success.jsp</result>
        </action>
@@ -42,6 +42,7 @@
    "/>
    <constant name="struts.allowlist.classes" value="
            org.apache.struts2.showcase.hangman.Hangman,
+            org.apache.struts2.showcase.hangman.HangmanConstants,
            org.apache.struts2.showcase.hangman.Vocab
    "/>

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Lukasz Lenart	80225c7169	[maven-release-plugin] prepare release STRUTS_6_8_0	2025-09-15 07:46:18 +02:00
Lukasz Lenart	6b2de2df4a	WW-5504 Allows to use request instead of session attribute to store nonce (#1174 )	2025-09-15 07:13:24 +02:00
Lukasz Lenart	15e257d075	Merge pull request #1345 from apache/dependabot/maven/release/struts-6-7-x/org.assertj-assertj-core-3.27.4 Bump org.assertj:assertj-core from 3.26.3 to 3.27.4	2025-09-15 07:12:26 +02:00
Lukasz Lenart	daf2f51721	Merge pull request #1344 from apache/dependabot/maven/release/struts-6-7-x/org.apache.commons-commons-compress-1.28.0 WW-5571 Bump org.apache.commons:commons-compress from 1.27.1 to 1.28.0	2025-09-15 07:12:00 +02:00
Lukasz Lenart	440dfe8c6d	Merge pull request #1343 from apache/dependabot/maven/release/struts-6-7-x/org.apache.maven.plugins-maven-project-info-reports-plugin-3.9.0 Bump org.apache.maven.plugins:maven-project-info-reports-plugin from 3.7.0 to 3.9.0	2025-09-15 07:10:30 +02:00
Lukasz Lenart	a016d50b53	Merge pull request #1342 from apache/dependabot/maven/release/struts-6-7-x/org.apache.commons-commons-collections4-4.5.0 WW-5570 Bump org.apache.commons:commons-collections4 from 4.4 to 4.5.0	2025-09-15 07:09:59 +02:00
dependabot[bot]	d718290ad1	Bump org.assertj:assertj-core from 3.26.3 to 3.27.4 Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.26.3 to 3.27.4. - [Release notes](https://github.com/assertj/assertj/releases) - [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.26.3...assertj-build-3.27.4) --- updated-dependencies: - dependency-name: org.assertj:assertj-core dependency-version: 3.27.4 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2025-09-15 01:37:30 +00:00
dependabot[bot]	2f73fc9ccf	Bump org.apache.commons:commons-compress from 1.27.1 to 1.28.0 Bumps [org.apache.commons:commons-compress](https://github.com/apache/commons-compress) from 1.27.1 to 1.28.0. - [Changelog](https://github.com/apache/commons-compress/blob/master/RELEASE-NOTES.txt) - [Commits](https://github.com/apache/commons-compress/compare/rel/commons-compress-1.27.1...rel/commons-compress-1.28.0) --- updated-dependencies: - dependency-name: org.apache.commons:commons-compress dependency-version: 1.28.0 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2025-09-15 01:36:18 +00:00
dependabot[bot]	d054d638b6	Bump org.apache.maven.plugins:maven-project-info-reports-plugin Bumps [org.apache.maven.plugins:maven-project-info-reports-plugin](https://github.com/apache/maven-project-info-reports-plugin) from 3.7.0 to 3.9.0. - [Release notes](https://github.com/apache/maven-project-info-reports-plugin/releases) - [Commits](https://github.com/apache/maven-project-info-reports-plugin/compare/maven-project-info-reports-plugin-3.7.0...maven-project-info-reports-plugin-3.9.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-project-info-reports-plugin dependency-version: 3.9.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2025-09-15 01:35:59 +00:00
dependabot[bot]	399ec92c4a	Bump org.apache.commons:commons-collections4 from 4.4 to 4.5.0 Bumps org.apache.commons:commons-collections4 from 4.4 to 4.5.0. --- updated-dependencies: - dependency-name: org.apache.commons:commons-collections4 dependency-version: 4.5.0 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2025-09-15 01:34:36 +00:00
Lukasz Lenart	c58fe8bfb9	Merge pull request #1334 from apache/dependabot/maven/release/struts-6-7-x/jackson.version-2.20.0 WW-5568 Bump jackson.version from 2.18.0 to 2.20.0	2025-09-10 10:56:56 +02:00
Lukasz Lenart	aa56c07972	Merge pull request #1337 from apache/dependabot/maven/release/struts-6-7-x/org.apache.maven.plugins-maven-wrapper-plugin-3.3.3 Bump org.apache.maven.plugins:maven-wrapper-plugin from 3.3.2 to 3.3.3	2025-09-10 10:24:19 +02:00
Lukasz Lenart	5148a9f088	Merge pull request #1335 from apache/dependabot/maven/release/struts-6-7-x/slf4j.version-2.0.17 Bump slf4j.version from 2.0.16 to 2.0.17	2025-09-10 10:23:47 +02:00
dependabot[bot]	f743b18e19	Bump jackson.version from 2.18.0 to 2.20.0 Bumps `jackson.version` from 2.18.0 to 2.20.0. Updates `com.fasterxml.jackson.core:jackson-core` from 2.18.0 to 2.20.0 - [Commits](https://github.com/FasterXML/jackson-core/compare/jackson-core-2.18.0...jackson-core-2.20.0) Updates `com.fasterxml.jackson.core:jackson-databind` from 2.18.0 to 2.20.0 - [Commits](https://github.com/FasterXML/jackson/commits) Updates `com.fasterxml.jackson.dataformat:jackson-dataformat-xml` from 2.18.0 to 2.20.0 - [Commits](https://github.com/FasterXML/jackson-dataformat-xml/compare/jackson-dataformat-xml-2.18.0...jackson-dataformat-xml-2.20.0) --- updated-dependencies: - dependency-name: com.fasterxml.jackson.core:jackson-core dependency-version: 2.20.0 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.fasterxml.jackson.core:jackson-databind dependency-version: 2.20.0 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.fasterxml.jackson.dataformat:jackson-dataformat-xml dependency-version: 2.20.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2025-09-10 08:22:31 +00:00
Lukasz Lenart	b674e32cbe	Merge pull request #1330 from apache/dependabot/maven/release/struts-6-7-x/log4j2.version-2.25.1 WW-5567 Bump log4j2.version from 2.24.1 to 2.25.1	2025-09-10 10:21:18 +02:00
dependabot[bot]	862013273b	Bump org.apache.maven.plugins:maven-wrapper-plugin from 3.3.2 to 3.3.3 Bumps [org.apache.maven.plugins:maven-wrapper-plugin](https://github.com/apache/maven-wrapper) from 3.3.2 to 3.3.3. - [Release notes](https://github.com/apache/maven-wrapper/releases) - [Commits](https://github.com/apache/maven-wrapper/compare/maven-wrapper-3.3.2...maven-wrapper-3.3.3) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-wrapper-plugin dependency-version: 3.3.3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2025-09-10 06:03:37 +00:00
dependabot[bot]	d92509fc29	Bump slf4j.version from 2.0.16 to 2.0.17 Bumps `slf4j.version` from 2.0.16 to 2.0.17. Updates `org.slf4j:slf4j-api` from 2.0.16 to 2.0.17 Updates `org.slf4j:slf4j-simple` from 2.0.16 to 2.0.17 --- updated-dependencies: - dependency-name: org.slf4j:slf4j-api dependency-version: 2.0.17 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.slf4j:slf4j-simple dependency-version: 2.0.17 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2025-09-10 06:03:31 +00:00
dependabot[bot]	e11ea4778f	Bump log4j2.version from 2.24.1 to 2.25.1 Bumps `log4j2.version` from 2.24.1 to 2.25.1. Updates `org.apache.logging.log4j:log4j-api` from 2.24.1 to 2.25.1 Updates `org.apache.logging.log4j:log4j-core` from 2.24.1 to 2.25.1 Updates `org.apache.logging.log4j:log4j-jcl` from 2.24.1 to 2.25.1 Updates `org.apache.logging.log4j:log4j-slf4j-impl` from 2.24.1 to 2.25.1 --- updated-dependencies: - dependency-name: org.apache.logging.log4j:log4j-api dependency-version: 2.25.1 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.apache.logging.log4j:log4j-core dependency-version: 2.25.1 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.apache.logging.log4j:log4j-jcl dependency-version: 2.25.1 dependency-type: direct:development update-type: version-update:semver-minor - dependency-name: org.apache.logging.log4j:log4j-slf4j-impl dependency-version: 2.25.1 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2025-09-10 06:03:16 +00:00
Lukasz Lenart	0649b5686b	Merge pull request #1328 from apache/WW-5564-fileupload WW-5564 Upgrades commons-fileupload to version 1.6.0	2025-09-10 08:02:32 +02:00
Lukasz Lenart	272797f764	Fixes .ads.yaml to use proper structure for checks	2025-09-10 07:38:43 +02:00
Lukasz Lenart	03cbbdba90	WW-5564 Upgrades commons-fileupload to version 1.6.0	2025-09-10 07:35:21 +02:00
Lukasz Lenart	1460c482c3	Merge pull request #1317 from apache/feature/WW-5511-removes-addCspHeaders WW-5511 Removes deprecated addCspHeaders method	2025-09-02 08:16:56 +02:00
Lukasz Lenart	ea97930474	WW-5511 Removes deprecated addCspHeaders method	2025-08-22 08:35:26 +02:00
Lukasz Lenart	f25321661f	Merge pull request #1316 from apache/fix/WW-5524-converter-factory-s6 WW-5524 Fixup StrutsConverterFactory - Struts 6	2025-08-20 07:13:37 +02:00
Martin Ashby	a92568423e	Fixup StrutsConverterFactory It should delegate back to ObjectFactory#buildBean instead of directly calling Container#inject, otherwise overrides of buildBean in subclasses of ObjectFactory e.g. SpringObjectFactory are skipped; meaning that TypeConverters cannot make use of Spring dependency injection Fixes: https://issues.apache.org/jira/projects/WW/issues/WW-5524	2025-08-20 06:48:31 +02:00
Lukasz Lenart	036c4ddb74	Merge pull request #1306 from apache/fix/clean-uploaded-files Cleans up all uploaded files	2025-08-18 16:55:41 +02:00
Lukasz Lenart	831568929c	Cleans up all uploaded files	2025-08-06 13:46:15 +02:00
Lukasz Lenart	84a51cce0e	WW-5546 Fixes NPE when uploaded file is empty (#1262 )	2025-05-06 20:48:24 +02:00
Lukasz Lenart	0f61944d64	WW-5544 Marks ReflectionContextFactory as deprecated and uses ActionContext instead (#1254 )	2025-04-27 15:59:19 +02:00
Lukasz Lenart	ca4e07cead	[maven-release-plugin] prepare for next development iteration	2025-02-20 13:20:56 +01:00
Lukasz Lenart	8fb9aba74b	[maven-release-plugin] prepare release STRUTS_6_7_4	2025-02-20 13:20:46 +01:00
Lukasz Lenart	c45664a330	Merge pull request #1226 from apache/fix/WW-5529-maxlength-s6 WW-5529 Adds autogenerated files with updated desc	2025-02-20 13:05:57 +01:00
Lukasz Lenart	91c9314176	WW-5529 Adds autogenerated files with updated desc	2025-02-20 12:21:58 +01:00
Kusal Kithul-Godage	a4e9902d94	Merge pull request #1225 from apache/WW-5531-jre8-compat WW-5531 Enforce JRE8 compatibility (when compiled on JDK9+)	2025-02-20 17:22:42 +11:00
Kusal Kithul-Godage	fe5b197738	WW-5531 Enforce JRE8 compatibility (when compiled on JDK9+)	2025-02-20 16:23:10 +11:00
Lukasz Lenart	87e322dbe2	[maven-release-plugin] prepare for next development iteration	2025-02-17 11:34:19 +01:00
Lukasz Lenart	7909f43237	[maven-release-plugin] prepare release STRUTS_6_7_3	2025-02-17 11:34:11 +01:00
Lukasz Lenart	1fe822cca0	WW-5529 Drops unused misleading setter setMaxLength in favour of setMaxlength (#1221 ) (#1222 )	2025-02-17 10:27:04 +01:00
Kusal Kithul-Godage	ef90b3ba3c	Merge pull request #1220 from apache/WW-5525-proxyutil-npe-67 6.7: WW-5525 Fix NPE in ProxyUtil for SecurityMemberAccess originating static members	2025-02-17 19:11:21 +11:00
Lukasz Lenart	d35ec15c76	WW-5525 Fixes NPE when checking if expressions is acceptable (cherry picked from commit `9fee06cea0`)	2025-02-17 18:57:27 +11:00
Kusal Kithul-Godage	583b174fe6	WW-5525 Fix NPE in ProxyUtil for SecurityMemberAccess originating static members	2025-02-17 18:57:27 +11:00
Lukasz Lenart	9b044377ac	WW-5501 Reverts all changes related to WW-5501 (#1218 ) * Reverts all changes related to WW-5501 * Fixes CodeQL scan by using proper versions of actions * WW-5501 Uses FilenameUtils instead of a custom code	2025-02-16 12:05:49 +01:00
Kusal Kithul-Godage	58f37babbf	Merge pull request #1215 from apache/WW-5528-multipart-illegal-char-errors-67	2025-02-09 23:44:10 +11:00
Kusal Kithul-Godage	fe3dd6ba9f	WW-5528 Ensure multipart upload illegal characters reported as error	2025-02-07 12:40:42 +11:00
Lukasz Lenart	7a77c7a82c	[maven-release-plugin] prepare for next development iteration	2025-02-04 07:39:44 +01:00
Lukasz Lenart	5038a9209f	[maven-release-plugin] prepare release STRUTS_6_7_2	2025-02-04 07:39:35 +01:00
Lukasz Lenart	2135ebf651	WW-5501 Ignores DMI related action field (#1211 )	2025-02-04 06:47:43 +01:00
Kusal Kithul-Godage	c0dd8dd80c	Merge pull request #1210 from apache/WW-5516-attrmap-npe-67	2025-02-04 01:19:16 +11:00
Kusal Kithul-Godage	c36eafa37a	WW-5516 Fix AttributeMap NPE when PageContext has no request	2025-02-04 01:00:36 +11:00
Lukasz Lenart	07603b9591	[maven-release-plugin] prepare for next development iteration	2025-02-02 10:16:30 +01:00
Lukasz Lenart	3227d5929a	[maven-release-plugin] prepare release STRUTS_6_7_1	2025-02-02 10:16:20 +01:00
Lukasz Lenart	4a8ddbb274	Merge pull request #1202 from apache/fix/bom-version Defines proper snapshot version for BOM	2025-02-02 10:10:35 +01:00
Lukasz Lenart	67ba458d03	Defines proper snapshot version for BOM	2025-02-02 10:00:09 +01:00
Lukasz Lenart	959b2182b2	Merge pull request #1195 from apache/fix/proper-version Defines proper snapshot version	2025-01-24 08:28:32 +01:00
Lukasz Lenart	6de93e77db	Defines proper snapshot version	2025-01-24 07:58:39 +01:00
Lukasz Lenart	59dc9301e0	Merge pull request #1194 from apache/fix/jenkinsfile-67x Simplifies Jenkinsfile to build Struts 6.x	2025-01-22 08:18:56 +01:00
Lukasz Lenart	2fc4a822a4	Simplifies Jenkinsfile to build Struts 6.x	2025-01-22 07:52:34 +01:00
Kusal Kithul-Godage	6a6270f62a	Merge pull request #1190 from apache/WW-5516-fix-temp-theme-fallback WW-5516 Fix TemplateDir and Theme fallback to Request/Session/Application attributes	2025-01-22 13:24:09 +11:00
Lukasz Lenart	9153228b6a	Merge pull request #1192 from apache/fix/nightlies-67x Fixes nightlies builds	2025-01-21 20:31:59 +01:00
Lukasz Lenart	5713a74edc	Fixes nightlies builds	2025-01-21 18:06:11 +01:00
Kusal Kithul-Godage	32071c71ad	WW-5516 Fix TemplateDir and Theme fallback to Request/Session/Application attributes	2025-01-21 20:05:24 +11:00
Lukasz Lenart	7e4791985b	Merge pull request #1175 from apache/feature/WW-5512-optional-inject WW-5512 Extends the container to support injecting optional parameters into constructor	2025-01-21 07:25:58 +01:00
Lukasz Lenart	3c1e44ca2d	WW-5512 Supports mixing required and optional parameters in any order	2025-01-19 09:53:01 +01:00
Lukasz Lenart	2ba8d97ad0	WW-5512 Supports mixing required and optional parameters	2025-01-19 09:36:27 +01:00
Lukasz Lenart	cba0db0b07	Merge pull request #1181 from apache/fix/WW-5501-exclude WW-5501 Only exclude malicious file names	2025-01-16 07:28:46 +01:00
Lukasz Lenart	688162cae2	WW-5501 Only exclude malicious file names	2025-01-14 07:47:39 +01:00
Lukasz Lenart	a33c162f53	WW-5512 Extends the container to support injecting optional parameters into constructor	2025-01-05 17:45:11 +01:00
Lukasz Lenart	c7a6daf5ce	Merge pull request #1169 from apache/fix/WW-5500 WW-5500 Extends pattern to validate multipart uploads	2025-01-05 09:20:33 +01:00
Lukasz Lenart	370c7ce17a	Merge pull request #1168 from apache/fix/WW-5498 WW-5498 Adds devMode errors as action messages to avoid breaking validation logic	2025-01-05 09:16:44 +01:00
Lukasz Lenart	55989befce	Merge pull request #1167 from apache/fix/excluded-packages Excludes new & old packages	2025-01-04 14:37:47 +01:00
Lukasz Lenart	2e4a4b5e36	Excludes new & old packages	2025-01-04 13:56:31 +01:00
Lukasz Lenart	9d07c3b4c3	WW-5498 Adds devMode errors as action messages to avoid breaking validation logic	2025-01-03 17:14:12 +01:00
Lukasz Lenart	575e4e8c9b	WW-5500 Extends pattern to validate multipart uploads	2025-01-03 17:10:59 +01:00
Lukasz Lenart	74388dfba7	Merge pull request #1158 from apache/fix/updates-asf-yaml Updates .asf.yaml to match main	2024-12-23 16:11:55 +01:00
Lukasz Lenart	4ee8b02262	Updates .asf.yaml to match main	2024-12-23 15:24:10 +01:00
Lukasz Lenart	c8febc2050	Merge pull request #1156 from apache/feature/WW-5501-exclude WW-5501 Exclude malicious names	2024-12-23 15:08:58 +01:00
Lukasz Lenart	3ea126388c	WW-5501 Uses StringUtils.normalizeSpace instead of sanitizeNewlines	2024-12-23 14:13:26 +01:00
Lukasz Lenart	09993e3476	WW-5501 Exclude malicious names	2024-12-23 12:05:15 +01:00
Lukasz Lenart	f5688e680b	Merge pull request #1150 from apache/feature/prepare-development Sets version to 6.7.1-SNAPSHOT to prepare for another development cycle	2024-12-18 15:42:21 +01:00
Lukasz Lenart	60a3db0a63	Sets version to 6.7.1-SNAPSHOT to prepare for another development cycle	2024-12-18 14:43:29 +01:00
Lukasz Lenart	4714d27678	Merge pull request #1141 from apache/fix/WW-5493-parameters WW-5493 Restores parameters and uses getAttributes()	2024-12-18 07:42:47 +01:00
Lukasz Lenart	4feceee5f1	WW-5493 Restores parameters and uses getAttributes() Instead of using parameters field directly, this PR uses getAttributes() instead to avoid coupling with internal Component state	2024-12-04 08:19:34 +01:00