From ebc033e1982ddad8c069e9ca9563a95a83003552 Mon Sep 17 00:00:00 2001
From: Ray Lee <ray.lee@lyrasis.org>
Date: Wed, 8 May 2019 23:18:54 -0700
Subject: [PATCH] DRYD-630: Remove conflicting xml-apis dependency.

---
 services/config/pom.xml | 11 ++++++++---
 services/report/pom.xml |  9 +++------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/services/config/pom.xml b/services/config/pom.xml
index 1e9624432..acbace95f 100644
--- a/services/config/pom.xml
+++ b/services/config/pom.xml
@@ -10,7 +10,7 @@
     <artifactId>org.collectionspace.services.config</artifactId>
     <name>services.config</name>
     <packaging>jar</packaging>
-    
+
     <dependencies>
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -29,6 +29,12 @@
             <artifactId>module-xml_merge-common</artifactId>
             <version>3.1</version>
             <scope>provided</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>xml-apis</groupId>
+                    <artifactId>xml-apis</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -40,7 +46,7 @@
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
         </dependency>
-        
+
 		<dependency>
 			<groupId>org.jvnet.jaxb2_commons</groupId>
 			<artifactId>jaxb2-basics</artifactId>
@@ -72,4 +78,3 @@
     </build>
 
 </project>
-
diff --git a/services/report/pom.xml b/services/report/pom.xml
index d81e56744..69a23bb78 100644
--- a/services/report/pom.xml
+++ b/services/report/pom.xml
@@ -18,7 +18,7 @@
 		<dependency>
 			<groupId>net.sf.jasperreports</groupId>
 			<artifactId>jasperreports</artifactId>
-			<version>6.1.1</version>
+			<version>6.3.1</version>
 			<exclusions>
 				<exclusion>
 					<artifactId>itext</artifactId>
@@ -31,16 +31,13 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
-		<!-- Jasper Reports fonts are still at 4.0.0, but are compatible with later
-			software releases - ADR 2012-06-05 -->
-		<!-- http://jasperforge.org/plugins/espforum/view.php?group_id=102&forumid=103&topicid=97145 -->
 		<dependency>
 			<groupId>net.sf.jasperreports</groupId>
 			<artifactId>jasperreports-fonts</artifactId>
-			<version>4.0.0</version>
+			<version>6.0.0</version>
 		</dependency>
 		<!-- For some reason, have to declare this dependency explicitly, ot it does not find it.
-			It is a dependency of jasperreports 5.0.1
+			It is a dependency of jasperreports
 			-->
 		<dependency>
 			<groupId>com.lowagie</groupId>
-- 
2.47.3