commit cffa7975618365e06fdbe3cb904d752eb25bbe4a
author Lukasz Lenart <lukaszlenart@apache.org> Sun Oct 29 15:08:03 2023 +0100
committer GitHub <noreply@github.com> Sun Oct 29 15:08:03 2023 +0100
tree 9c6d48b003d2f74bb1f4ac75c1ce519d2603354b
parent fa8a503d5e445a9609ec4b813b41b4b826baf053
parent 31b488a834a43b6944f6dffa51d67a580c91d6b2

Merge pull request #277 from apache/feature/upgrade-struts

Upgrade Struts to ver. 6.3.0.1

pom.xml

diff --git a/pom.xml b/pom.xml
index ae84784..631c637 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,7 +43,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
-        <struts2.version>6.2.0</struts2.version>
+        <struts2.version>6.3.0.1</struts2.version>
         <log4j2.version>2.21.0</log4j2.version>
         <jetty-plugin.version>9.4.46.v20220331</jetty-plugin.version>
         <maven.javadoc.skip>true</maven.javadoc.skip>

unknown-handler/src/main/java/org/apache/strutsexamples/web/TilesUnknownHandler.java

diff --git a/unknown-handler/src/main/java/org/apache/strutsexamples/web/TilesUnknownHandler.java b/unknown-handler/src/main/java/org/apache/strutsexamples/web/TilesUnknownHandler.java
index 2930e8e..5167cf9 100644
--- a/unknown-handler/src/main/java/org/apache/strutsexamples/web/TilesUnknownHandler.java
+++ b/unknown-handler/src/main/java/org/apache/strutsexamples/web/TilesUnknownHandler.java
@@ -9,8 +9,8 @@
 import org.apache.struts2.ServletActionContext;
 import org.apache.struts2.StrutsException;
 import org.apache.struts2.views.tiles.TilesResult;
-import org.apache.tiles.TilesContainer;
-import org.apache.tiles.access.TilesAccess;
+import org.apache.tiles.api.TilesContainer;
+import org.apache.tiles.api.access.TilesAccess;
 import org.apache.tiles.request.servlet.ServletApplicationContext;
 import org.apache.tiles.request.servlet.ServletRequest;