From 3e7710c58381e7e085cce7ff7577564b3604e2e9 Mon Sep 17 00:00:00 2001
From: Lukasz Lenart <lukaszlenart@apache.org>
Date: Mon, 17 Nov 2025 14:42:14 +0100
Subject: [PATCH] WW-5576 Java 25 build (#1415)

* WW-5576 Upgrades commons-lang to version 3.20.0 which is Java 25 compatible

* WW-5576 Defines a new build on Java 25

* WW-5576 Fixes generating TLD file when building on Java 25

* WW-5576 Moves version property to the root pom.xml
---
 .github/workflows/maven.yml |  2 ++
 core/pom.xml                | 11 +++++++++--
 parent/pom.xml              |  4 ++--
 pom.xml                     |  1 +
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 58bb6f354..fa0333382 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -41,6 +41,8 @@ jobs:
             profile: ''
           - java: '21'
             profile: '-Pjakartaee11'
+          - java: '25'
+            profile: ''
     steps:
       - name: Checkout code
         uses: actions/checkout@v5
diff --git a/core/pom.xml b/core/pom.xml
index 886ba45ed..9bb3afbec 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -110,7 +110,7 @@
                                 <arg>-AjspVersion=2.0</arg>
                                 <arg>-AshortName=s</arg>
                                 <arg>-AdisplayName=Struts Tags</arg>
-                                <arg>-AoutFile=${basedir}/target/classes/META-INF/struts-tags.tld</arg>
+                                <arg>-AoutFile=${project.build.outputDirectory}/META-INF/struts-tags.tld</arg>
                                 <arg>-Adescription="To make it easier to access dynamic data;
                                     the Apache Struts framework includes a library of custom tags.
                                     The tags interact with the framework's validation and
@@ -118,8 +118,15 @@
                                     to ensure that input is correct and output is localized.
                                     The Struts Tags can be used with JSP FreeMarker or Velocity."
                                 </arg>
-                                <arg>-AoutTemplatesDir=${basedir}/src/site/resources/tags</arg>
+                                <arg>-AoutTemplatesDir=${project.basedir}/src/site/resources/tags</arg>
                             </compilerArgs>
+                            <annotationProcessorPaths>
+                                <path>
+                                    <groupId>org.apache.struts</groupId>
+                                    <artifactId>struts-annotations</artifactId>
+                                    <version>${struts-annotations.version}</version>
+                                </path>
+                            </annotationProcessorPaths>
                         </configuration>
                         <executions>
                             <execution>
diff --git a/parent/pom.xml b/parent/pom.xml
index 7a80d7b41..262d556d1 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -44,7 +44,7 @@
             <dependency>
                 <groupId>org.apache.struts</groupId>
                 <artifactId>struts-annotations</artifactId>
-                <version>2.0</version>
+                <version>${struts-annotations.version}</version>
             </dependency>
 
             <dependency>
@@ -143,7 +143,7 @@
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-lang3</artifactId>
-                <version>3.19.0</version>
+                <version>3.20.0</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.commons</groupId>
diff --git a/pom.xml b/pom.xml
index a20bd1fd2..4e8fdd104 100644
--- a/pom.xml
+++ b/pom.xml
@@ -123,6 +123,7 @@
         <ognl.version>3.3.5</ognl.version>
         <slf4j.version>2.0.17</slf4j.version>
         <spring.version>6.2.12</spring.version>
+        <struts-annotations.version>2.0</struts-annotations.version>
         <velocity-tools.version>3.1</velocity-tools.version>
         <weld.version>6.0.3.Final</weld.version>