Skip to content

Commit

Permalink
General cleanup of Servlet tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@pmuir
pmuir committed Aug 18, 2010
1 parent eaf5172 commit 454cc3b
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 63 deletions.
1 change: 0 additions & 1 deletion environments/servlet/build/pom.xml
View file
Expand Up @@ -78,7 +78,6 @@
<exclude>org.apache.tomcat:juli</exclude>
<exclude>org.apache.tomcat:annotations-api</exclude>
<exclude>javax.faces:jsf-api</exclude>
<exclude>javax.el:el-api</exclude>
<exclude>org.mortbay.jetty:jetty</exclude>
</excludes>
</artifactSet>
Expand Down
1 change: 1 addition & 0 deletions environments/servlet/core/pom.xml
View file
Expand Up @@ -58,6 +58,7 @@
<dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-api</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
Expand Down
15 changes: 1 addition & 14 deletions environments/servlet/tests/jetty/pom.xml
View file
Expand Up @@ -95,20 +95,7 @@
http://old.nabble.com/Maven-Surefire-and-newer-junit-features-td28539796.html
-->
<parallel>none</parallel>
<skip>true</skip>
</configuration>
<executions>
<execution>
<id>surefire-it</id>
<phase>integration-test</phase>
<goals>
<goal>test</goal>
</goals>
<configuration>
<skip>false</skip>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
Expand Down Expand Up @@ -184,7 +171,7 @@

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<artifactId>slf4j-jdk14</artifactId>
<scope>test</scope>
</dependency>

Expand Down
52 changes: 11 additions & 41 deletions environments/servlet/tests/tomcat/pom.xml
View file
Expand Up @@ -15,12 +15,6 @@

<dependencies>

<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-api</artifactId>
Expand All @@ -41,18 +35,6 @@
</exclusions>
</dependency>

<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>catalina</artifactId>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>org.apache.tomcat</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
Expand Down Expand Up @@ -114,20 +96,7 @@
http://old.nabble.com/Maven-Surefire-and-newer-junit-features-td28539796.html
-->
<parallel>none</parallel>
<skip>true</skip>
</configuration>
<executions>
<execution>
<id>surefire-it</id>
<phase>integration-test</phase>
<goals>
<goal>test</goal>
</goals>
<configuration>
<skip>false</skip>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
Expand Down Expand Up @@ -179,23 +148,24 @@
<artifactId>coyote</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>jasper</artifactId>
<scope>provided</scope>
</dependency>


<!-- Make sure this comes before Tomcat's EL on the classpath -->
<dependency>
<groupId>org.glassfish.web</groupId>
<artifactId>el-impl</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
<scope>test</scope>
<groupId>org.apache.tomcat</groupId>
<artifactId>jasper</artifactId>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>org.apache.tomcat</groupId>
<artifactId>el-api</artifactId>
</exclusion>
</exclusions>
</dependency>

</dependencies>
Expand Down
7 changes: 0 additions & 7 deletions ...ents/servlet/tests/tomcat/src/test/debug-resources/META-INF/jboss-test-harness.properties
View file

This file was deleted.

0 comments on commit 454cc3b

Please sign in to comment.