From a6b9e5604c8d4562d59686f422acd9bf98cdc8a6 Mon Sep 17 00:00:00 2001
From: Stian Thorgersen <stian@redhat.com>
Date: Fri, 15 Sep 2017 09:55:42 +0200
Subject: [PATCH] Fix Tomcat 6 issues (#4478)

* Fix Tomcat test failures due to dependency conflicts

* Added proxy and tomcat6 to old tests to run on Travis
---
 pom.xml             | 6 ++++++
 travis-run-tests.sh | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/pom.xml b/pom.xml
index 337c568076..9beb5518c8 100755
--- a/pom.xml
+++ b/pom.xml
@@ -597,6 +597,12 @@
                 <artifactId>wildfly-undertow</artifactId>
                 <version>${wildfly.version}</version>
                 <scope>test</scope>
+                <exclusions>
+                    <exclusion>
+                        <groupId>io.undertow.jastow</groupId>
+                        <artifactId>jastow</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>org.wildfly.core</groupId>
diff --git a/travis-run-tests.sh b/travis-run-tests.sh
index e3506cf2d1..7776f57f18 100755
--- a/travis-run-tests.sh
+++ b/travis-run-tests.sh
@@ -15,6 +15,8 @@ if [ $1 == "old" ]; then
     cd testsuite
     mvn test -B -nsu -f integration-deprecated
     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 tomcat8
 fi