Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-07 07:37:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

WN-5141

Browse Source 
- fix things broken with rebase
This commit is contained in:
jdyer1
2023-11-15 12:25:34 -06:00
committed by Lukasz Lenart
parent baddd368c4
commit df56821abb
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java
+2 -2
View File
@@ -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);
}
*/
}
freemarker-jakarta/pom.xml
+1 -1
View File
@@ -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>
sitemesh2-jakarta/pom.xml
+1 -1
View File
@@ -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>