Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fix servlet API dependency issue

  • Loading branch information...
commit ca7ea7f979dc5fb2100abe4d792e001708ae9281 1 parent b03226a
Rossen Stoyanchev authored
29 pom.xml
View
@@ -87,11 +87,23 @@
<groupId>javax.servlet.jsp.jstl</groupId>
<artifactId>jstl-api</artifactId>
<version>1.2</version>
- </dependency>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.glassfish.web</groupId>
<artifactId>jstl-impl</artifactId>
<version>1.2</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- Jackson JSON Processor -->
@@ -193,6 +205,21 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.12</version>
+ <configuration>
+ <includes>
+ <include>**/*Tests.java</include>
+ </includes>
+ <excludes>
+ <exclude>**/Abstract*.java</exclude>
+ </excludes>
+ <junitArtifactName>junit:junit</junitArtifactName>
+ <argLine>-Xmx512m</argLine>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
2  src/test/java/org/springframework/samples/mvc/data/StandardArgumentsControllerTests.java
View
@@ -40,7 +40,7 @@ public void setup() throws Exception {
public void request() throws Exception {
this.mockMvc.perform(get("/data/standard/request"))
.andExpect(content().string(startsWith(
- "request = org.springframework.mock.web.MockHttpServletRequest@")));
+ "request = org.springframework.test.web.mock.servlet.request.Servlet3MockHttpServletRequest@")));
}
@Test
Please sign in to comment.
Something went wrong with that request. Please try again.