archiva-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1574764 - in /archiva/trunk: archiva-modules/archiva-web/archiva-webapp/pom.xml pom.xml
Date Thu, 06 Mar 2014 04:28:00 GMT
Author: olamy
Date: Thu Mar  6 04:28:00 2014
New Revision: 1574764

URL: http://svn.apache.org/r1574764
Log:
[MRM-1803] force xalan version in the webapp

Modified:
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
    archiva/trunk/pom.xml

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml?rev=1574764&r1=1574763&r2=1574764&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml Thu Mar  6 04:28:00 2014
@@ -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>

Modified: archiva/trunk/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/pom.xml?rev=1574764&r1=1574763&r2=1574764&view=diff
==============================================================================
--- archiva/trunk/pom.xml (original)
+++ archiva/trunk/pom.xml Thu Mar  6 04:28:00 2014
@@ -110,6 +110,11 @@
   <dependencyManagement>
     <dependencies>
       <dependency>
+        <groupId>xalan</groupId>
+        <artifactId>xalan</artifactId>
+        <version>2.7.1</version>
+      </dependency>
+      <dependency>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
         <version>4.11</version>
@@ -628,10 +633,6 @@
             <artifactId>xercesImpl</artifactId>
           </exclusion>
           <exclusion>
-            <groupId>xalan</groupId>
-            <artifactId>xalan</artifactId>
-          </exclusion>
-          <exclusion>
             <groupId>xml-apis</groupId>
             <artifactId>xml-apis</artifactId>
           </exclusion>



Mime
View raw message