From df56821abb1d7394f17ed162b0616953f21c1ff9 Mon Sep 17 00:00:00 2001
From: jdyer1 <jdyer@apache.org>
Date: Wed, 15 Nov 2023 12:25:34 -0600
Subject: [PATCH] WN-5141

- fix things broken with rebase
---
 .../struts2/dispatcher/mapper/DefaultActionMapperTest.java    | 4 ++--
 freemarker-jakarta/pom.xml                                    | 2 +-
 sitemesh2-jakarta/pom.xml                                     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java b/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java
index 81666df85..c60a8905f 100644
--- a/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java
+++ b/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java
@@ -41,7 +41,7 @@ import com.opensymphony.xwork2.inject.Container;
  * DefaultActionMapper test case.
  */
 public class DefaultActionMapperTest extends StrutsInternalTestCase {
-/*
+
     private MockHttpServletRequest req;
     private ConfigurationManager configManager;
     private Configuration config;
@@ -979,5 +979,5 @@ public class DefaultActionMapperTest extends StrutsInternalTestCase {
         // then
         assertEquals("error", result);
     }
-    */
+    
 }
diff --git a/freemarker-jakarta/pom.xml b/freemarker-jakarta/pom.xml
index 60839c221..0f2db1842 100644
--- a/freemarker-jakarta/pom.xml
+++ b/freemarker-jakarta/pom.xml
@@ -36,7 +36,7 @@ governing permissions and limitations
 	<parent>
 		<groupId>org.apache.struts</groupId>
 		<artifactId>struts2-parent</artifactId>
-		<version>6.4.0-SNAPSHOT</version>
+		<version>7.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>struts2-freemarker-jakarta</artifactId>
 	<packaging>jar</packaging>
diff --git a/sitemesh2-jakarta/pom.xml b/sitemesh2-jakarta/pom.xml
index 3a13dd18c..f3ac3a95f 100644
--- a/sitemesh2-jakarta/pom.xml
+++ b/sitemesh2-jakarta/pom.xml
@@ -26,7 +26,7 @@
 	<parent>
 		<groupId>org.apache.struts</groupId>
 		<artifactId>struts2-parent</artifactId>
-		<version>6.4.0-SNAPSHOT</version>
+		<version>7.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>struts2-sitemesh2-jakarta</artifactId>
 	<packaging>jar</packaging>