dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 1693
committer: Lars Helge Oeverland <larshelge@xxxxxxxxx>
branch nick: trunk
timestamp: Thu 2010-03-25 09:25:46 +0100
message:
  Added exclusions of xalan and xercesImpl for jasperreports and mapfish printlib. Will fallback and use the ones provided by JRE. Caused conflicts when rendering jasper designs.
modified:
  dhis-2/dhis-web/dhis-web-mapping/pom.xml
  dhis-2/pom.xml


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription.

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/pom.xml'
--- dhis-2/dhis-web/dhis-web-mapping/pom.xml	2010-03-24 10:56:30 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/pom.xml	2010-03-25 08:25:46 +0000
@@ -65,6 +65,16 @@
       <groupId>org.mapfish.print</groupId>
       <artifactId>print-lib</artifactId>
       <version>1.2-SNAPSHOT</version>
+	  <exclusions>
+        <exclusion>
+          <groupId>xalan</groupId>
+          <artifactId>xalan</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>xerces</groupId>
+          <artifactId>xercesImpl</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 	
 	

=== modified file 'dhis-2/pom.xml'
--- dhis-2/pom.xml	2010-03-22 09:59:24 +0000
+++ dhis-2/pom.xml	2010-03-25 08:25:46 +0000
@@ -505,17 +505,17 @@
         <groupId>jasperreports</groupId>
         <artifactId>jasperreports</artifactId>
         <version>3.7.0</version>
-      </dependency>	  
-	  <dependency>
-        <groupId>xerces</groupId>
-	    <artifactId>xercesImpl</artifactId>
-	    <version>2.7.1</version>
+		<exclusions>
+          <exclusion>
+            <groupId>xalan</groupId>
+            <artifactId>xalan</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>xerces</groupId>
+            <artifactId>xercesImpl</artifactId>
+          </exclusion>
+        </exclusions>      
       </dependency>
-	  <dependency>
-        <groupId>xalan</groupId>
-	    <artifactId>xalan</artifactId>
-	    <version>2.6.0</version>
-	  </dependency>
       <dependency>
         <groupId>jfree</groupId>
         <artifactId>jfreechart</artifactId>