Fix Tomcat 6 issues (#4478)

* Fix Tomcat test failures due to dependency conflicts

* Added proxy and tomcat6 to old tests to run on Travis
This commit is contained in:
Stian Thorgersen 2017-09-15 09:55:42 +02:00 committed by GitHub
parent c597123d1a
commit a6b9e5604c
2 changed files with 8 additions and 0 deletions

View file

@ -597,6 +597,12 @@
<artifactId>wildfly-undertow</artifactId> <artifactId>wildfly-undertow</artifactId>
<version>${wildfly.version}</version> <version>${wildfly.version}</version>
<scope>test</scope> <scope>test</scope>
<exclusions>
<exclusion>
<groupId>io.undertow.jastow</groupId>
<artifactId>jastow</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wildfly.core</groupId> <groupId>org.wildfly.core</groupId>

View file

@ -15,6 +15,8 @@ if [ $1 == "old" ]; then
cd testsuite cd testsuite
mvn test -B -nsu -f integration-deprecated mvn test -B -nsu -f integration-deprecated
mvn test -B -nsu -f jetty mvn test -B -nsu -f jetty
mvn test -B -nsu -f proxy
mvn test -B -nsu -f tomcat6
mvn test -B -nsu -f tomcat7 mvn test -B -nsu -f tomcat7
mvn test -B -nsu -f tomcat8 mvn test -B -nsu -f tomcat8
fi fi