From 016d6337fdab033f3aab4442d19cc17428075879 Mon Sep 17 00:00:00 2001
From: dotasek <david.otasek@smilecdr.com>
Date: Wed, 23 Aug 2023 12:05:58 -0400
Subject: [PATCH] Swap out xpp3 dependency

---
 org.hl7.fhir.convertors/pom.xml     | 7 +------
 org.hl7.fhir.dstu2/pom.xml          | 7 +------
 org.hl7.fhir.dstu2016may/pom.xml    | 8 +-------
 org.hl7.fhir.dstu3/pom.xml          | 8 ++------
 org.hl7.fhir.r4/pom.xml             | 7 +------
 org.hl7.fhir.r4b/pom.xml            | 7 +------
 org.hl7.fhir.r5/pom.xml             | 8 ++------
 org.hl7.fhir.utilities/pom.xml      | 8 ++------
 org.hl7.fhir.validation.cli/pom.xml | 7 ++-----
 org.hl7.fhir.validation/pom.xml     | 6 +-----
 pom.xml                             | 5 +++++
 11 files changed, 19 insertions(+), 59 deletions(-)

diff --git a/org.hl7.fhir.convertors/pom.xml b/org.hl7.fhir.convertors/pom.xml
index 4256a48c5..9e979dc47 100644
--- a/org.hl7.fhir.convertors/pom.xml
+++ b/org.hl7.fhir.convertors/pom.xml
@@ -82,15 +82,10 @@
         </dependency>
 
         <dependency>
-            <groupId>xpp3</groupId>
+            <groupId>org.ogce</groupId>
             <artifactId>xpp3</artifactId>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>xpp3</groupId>
-            <artifactId>xpp3_xpath</artifactId>
-            <optional>true</optional>
-        </dependency>
         <!-- HTTP Client -->
         <dependency>
           <groupId>org.apache.httpcomponents</groupId>
diff --git a/org.hl7.fhir.dstu2/pom.xml b/org.hl7.fhir.dstu2/pom.xml
index 89401a305..d8ecd7ea9 100644
--- a/org.hl7.fhir.dstu2/pom.xml
+++ b/org.hl7.fhir.dstu2/pom.xml
@@ -37,15 +37,10 @@
 
         <!-- XML Parsers -->
         <dependency>
-            <groupId>xpp3</groupId>
+            <groupId>org.ogce</groupId>
             <artifactId>xpp3</artifactId>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>xpp3</groupId>
-            <artifactId>xpp3_xpath</artifactId>
-            <optional>true</optional>
-        </dependency>
 
         <!-- JSON Parsers -->
         <dependency>
diff --git a/org.hl7.fhir.dstu2016may/pom.xml b/org.hl7.fhir.dstu2016may/pom.xml
index b8b7b6e9e..624333a9d 100644
--- a/org.hl7.fhir.dstu2016may/pom.xml
+++ b/org.hl7.fhir.dstu2016may/pom.xml
@@ -37,14 +37,8 @@
 
         <!-- XML Parsers -->
         <dependency>
-            <groupId>xpp3</groupId>
+            <groupId>org.ogce</groupId>
             <artifactId>xpp3</artifactId>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>xpp3</groupId>
-            <artifactId>xpp3_xpath</artifactId>
-            <optional>true</optional>
         </dependency>
 
         <!-- JSON Parsers -->
diff --git a/org.hl7.fhir.dstu3/pom.xml b/org.hl7.fhir.dstu3/pom.xml
index 70fdca3af..b0c294ad0 100644
--- a/org.hl7.fhir.dstu3/pom.xml
+++ b/org.hl7.fhir.dstu3/pom.xml
@@ -37,15 +37,11 @@
 
         <!-- XML Parsers -->
         <dependency>
-            <groupId>xpp3</groupId>
+            <groupId>org.ogce</groupId>
             <artifactId>xpp3</artifactId>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>xpp3</groupId>
-            <artifactId>xpp3_xpath</artifactId>
-            <optional>true</optional>
-        </dependency>
+
 
         <!-- JSON Parsers -->
         <dependency>
diff --git a/org.hl7.fhir.r4/pom.xml b/org.hl7.fhir.r4/pom.xml
index 140359a01..9ea76e504 100644
--- a/org.hl7.fhir.r4/pom.xml
+++ b/org.hl7.fhir.r4/pom.xml
@@ -44,15 +44,10 @@
 
 		<!-- XML Parsers -->
 		<dependency>
-			<groupId>xpp3</groupId>
+			<groupId>org.ogce</groupId>
 			<artifactId>xpp3</artifactId>
 			<optional>true</optional>
 		</dependency>
-		<dependency>
-			<groupId>xpp3</groupId>
-			<artifactId>xpp3_xpath</artifactId>
-			<optional>true</optional>
-		</dependency>
 
 		<!-- JSON Parsers -->
 		<dependency>
diff --git a/org.hl7.fhir.r4b/pom.xml b/org.hl7.fhir.r4b/pom.xml
index 6ad4d6fb5..c31a4503b 100644
--- a/org.hl7.fhir.r4b/pom.xml
+++ b/org.hl7.fhir.r4b/pom.xml
@@ -43,15 +43,10 @@
 
 		<!-- XML Parsers -->
 		<dependency>
-			<groupId>xpp3</groupId>
+			<groupId>org.ogce</groupId>
 			<artifactId>xpp3</artifactId>
 			<optional>true</optional>
 		</dependency>
-		<dependency>
-			<groupId>xpp3</groupId>
-			<artifactId>xpp3_xpath</artifactId>
-			<optional>true</optional>
-		</dependency>
 
 		<!-- JSON Parsers -->
 		<dependency>
diff --git a/org.hl7.fhir.r5/pom.xml b/org.hl7.fhir.r5/pom.xml
index d7347eed0..b92f3224b 100644
--- a/org.hl7.fhir.r5/pom.xml
+++ b/org.hl7.fhir.r5/pom.xml
@@ -44,15 +44,11 @@
 
 		<!-- XML Parsers -->
 		<dependency>
-			<groupId>xpp3</groupId>
+			<groupId>org.ogce</groupId>
 			<artifactId>xpp3</artifactId>
 			<optional>true</optional>
 		</dependency>
-		<dependency>
-			<groupId>xpp3</groupId>
-			<artifactId>xpp3_xpath</artifactId>
-			<optional>true</optional>
-		</dependency>
+
 
 		<!-- JSON Parsers -->
 		<dependency>
diff --git a/org.hl7.fhir.utilities/pom.xml b/org.hl7.fhir.utilities/pom.xml
index f0d8d3f15..7faa28821 100644
--- a/org.hl7.fhir.utilities/pom.xml
+++ b/org.hl7.fhir.utilities/pom.xml
@@ -84,15 +84,11 @@
             <optional>true</optional>
         </dependency>
         <dependency>
-            <groupId>xpp3</groupId>
+            <groupId>org.ogce</groupId>
             <artifactId>xpp3</artifactId>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>xpp3</groupId>
-            <artifactId>xpp3_xpath</artifactId>
-            <optional>true</optional>
-        </dependency>
+
 
         <dependency>
             <groupId>com.ibm.icu</groupId>
diff --git a/org.hl7.fhir.validation.cli/pom.xml b/org.hl7.fhir.validation.cli/pom.xml
index c9372b39d..53c3db076 100644
--- a/org.hl7.fhir.validation.cli/pom.xml
+++ b/org.hl7.fhir.validation.cli/pom.xml
@@ -288,13 +288,10 @@
             <artifactId>ucum</artifactId>
         </dependency>
         <dependency>
-            <groupId>xpp3</groupId>
+            <groupId>org.ogce</groupId>
             <artifactId>xpp3</artifactId>
         </dependency>
-        <dependency>
-            <groupId>xpp3</groupId>
-            <artifactId>xpp3_xpath</artifactId>
-        </dependency>
+
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>
diff --git a/org.hl7.fhir.validation/pom.xml b/org.hl7.fhir.validation/pom.xml
index cca41c5e8..6f4eabbb2 100644
--- a/org.hl7.fhir.validation/pom.xml
+++ b/org.hl7.fhir.validation/pom.xml
@@ -82,13 +82,9 @@
             <artifactId>Saxon-HE</artifactId>
         </dependency>
         <dependency>
-            <groupId>xpp3</groupId>
+            <groupId>org.ogce</groupId>
             <artifactId>xpp3</artifactId>
         </dependency>
-        <dependency>
-            <groupId>xpp3</groupId>
-            <artifactId>xpp3_xpath</artifactId>
-        </dependency>
 
         <!-- JSON Utilities -->
         <dependency>
diff --git a/pom.xml b/pom.xml
index b5bf04abd..e6c49cd5b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -278,6 +278,11 @@
                 <artifactId>thymeleaf</artifactId>
                 <version>3.1.2.RELEASE</version>
             </dependency>
+            <dependency>
+                <groupId>org.ogce</groupId>
+                <artifactId>xpp3</artifactId>
+                <version>1.1.6</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>