From: Olivier Lamy <olamy@apache.org>
Date: Thu, 6 Mar 2014 04:28:00 +0000 (+0000)
Subject: [MRM-1803] force xalan version in the webapp
X-Git-Tag: archiva-2.0.1~13
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=0e75b8fd669f04996af282ac003d15991411e246;p=archiva.git

[MRM-1803] force xalan version in the webapp

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1574764 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml
index d1723ecb7..986d8cc10 100644
--- a/archiva-modules/archiva-web/archiva-webapp/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml
@@ -841,6 +841,11 @@
       <artifactId>jsoup</artifactId>
     </dependency>
 
+    <!-- we need to force xalan version for IBM servers.. MRM-1803 ->
+    <dependency>
+      <groupId>xalan</groupId>
+      <artifactId>xalan</artifactId>
+    </dependency>
 
     <dependency>
       <groupId>org.apache.archiva</groupId>
diff --git a/pom.xml b/pom.xml
index 0827665af..ecc340e3c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -109,6 +109,11 @@
 
   <dependencyManagement>
     <dependencies>
+      <dependency>
+        <groupId>xalan</groupId>
+        <artifactId>xalan</artifactId>
+        <version>2.7.1</version>
+      </dependency>
       <dependency>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
@@ -627,10 +632,6 @@
             <groupId>xerces</groupId>
             <artifactId>xercesImpl</artifactId>
           </exclusion>
-          <exclusion>
-            <groupId>xalan</groupId>
-            <artifactId>xalan</artifactId>
-          </exclusion>
           <exclusion>
             <groupId>xml-apis</groupId>
             <artifactId>xml-apis</artifactId>