From 705220d37e93a14fcc11906cd715edd9cb65aec0 Mon Sep 17 00:00:00 2001
From: Kohsuke Kawaguchi <kk@kohsuke.org>
Date: Fri, 23 Sep 2011 21:44:44 -0700
Subject: [PATCH] Better way to fix the test failure.

This reverts commit 5dce36d9972180888f7172da14ff0f25ba6c6b3a
and it adds back xalan as test harness dependency
---
 core/pom.xml | 10 ++++++++++
 test/pom.xml |  5 +++++
 2 files changed, 15 insertions(+)

diff --git a/core/pom.xml b/core/pom.xml
index 24cd01b5a7..170db65d25 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -173,6 +173,16 @@ THE SOFTWARE.
       <groupId>org.jenkins-ci</groupId>
       <artifactId>htmlunit</artifactId>
       <version>2.6-jenkins-6</version>
+      <exclusions>
+        <exclusion>
+          <groupId>xml-apis</groupId>
+          <artifactId>xml-apis</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>xalan</groupId>
+          <artifactId>xalan</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>args4j</groupId>
diff --git a/test/pom.xml b/test/pom.xml
index 30d7ad7f93..ea3279d190 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -109,6 +109,11 @@ THE SOFTWARE.
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency><!-- we exclude this transient dependency from htmlunit, which we actually need in the test -->
+      <groupId>xalan</groupId>
+      <artifactId>xalan</artifactId>
+      <version>2.7.1</version>
+    </dependency>
 
     <dependency>
       <groupId>org.jvnet.hudson</groupId>
-- 
GitLab