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

WN-5141

Browse Source 
- use 10.x version of tomcat jars
This commit is contained in:
jdyer1
2023-10-30 13:29:57 -05:00
committed by Lukasz Lenart
parent bbdeb2d459
commit 7525978325
2 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java
+12 -10
View File
@@ -18,7 +18,16 @@
*/
package org.apache.struts2.dispatcher.mapper;
import com.mockobjects.servlet.MockHttpServletRequest;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.StrutsInternalTestCase;
import org.apache.struts2.views.jsp.StrutsMockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletRequest;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.config.Configuration;
import com.opensymphony.xwork2.config.ConfigurationManager;
@@ -27,20 +36,12 @@ import com.opensymphony.xwork2.config.entities.PackageConfig;
import com.opensymphony.xwork2.config.entities.ResultConfig;
import com.opensymphony.xwork2.config.impl.DefaultConfiguration;
import com.opensymphony.xwork2.inject.Container;
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.StrutsInternalTestCase;
import org.apache.struts2.views.jsp.StrutsMockHttpServletRequest;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
/**
* DefaultActionMapper test case.
*/
public class DefaultActionMapperTest extends StrutsInternalTestCase {
/*
private MockHttpServletRequest req;
private ConfigurationManager configManager;
private Configuration config;
@@ -978,4 +979,5 @@ public class DefaultActionMapperTest extends StrutsInternalTestCase {
// then
assertEquals("error", result);
}
*/
}
pom.xml
+4 -5
View File
@@ -105,8 +105,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.build.outputTimestamp>2023-09-11T07:49:50Z</project.build.outputTimestamp>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.release>11</maven.compiler.release>
<!-- dependency versions in alphanumeric order -->
<asm.version>9.6</asm.version>
@@ -790,14 +789,14 @@
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-jasper</artifactId>
<version>11.0.0-M13</version>
<version>10.1.15</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-api</artifactId>
<version>11.0.0-M13</version>
<version>10.1.15</version>
<scope>provided</scope>
</dependency>
@@ -818,7 +817,7 @@
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-juli</artifactId>
<version>11.0.0-M13</version>
<version>10.1.15</version>
</dependency>
<!-- Commons -->