diff --git a/.github/workflows/license-check/license-special-cases.txt b/.github/workflows/license-check/license-special-cases.txt
index becde7051..808275ef0 100644
--- a/.github/workflows/license-check/license-special-cases.txt
+++ b/.github/workflows/license-check/license-special-cases.txt
@@ -16,6 +16,4 @@
 # Actually a BSD license https://mvnrepository.com/artifact/org.antlr/ST4/4.1
 (Unknown license) StringTemplate 4 (org.antlr:ST4:4.1 - http://nexus.sonatype.org/oss-repository-hosting.html/ST4)
 # without dependencies is incorrectly intepreted as a license name
-(Apache License, Version 2.0) Byte Buddy (without dependencies) (net.bytebuddy:byte-buddy:1.12.14 - https://bytebuddy.net/byte-buddy)
-# Appears to be Apache 2.0: https://github.com/NCIP/lexevs/blob/master/lgSharedLibraries/apache/commons/jakarta-regexp-1.4.license.txt
-(Unknown license) jakarta-regexp (jakarta-regexp:jakarta-regexp:1.4 - no url defined)
\ No newline at end of file
+(Apache License, Version 2.0) Byte Buddy (without dependencies) (net.bytebuddy:byte-buddy:1.12.14 - https://bytebuddy.net/byte-buddy)
\ No newline at end of file
diff --git a/org.hl7.fhir.convertors/pom.xml b/org.hl7.fhir.convertors/pom.xml
index 9e979dc47..4256a48c5 100644
--- a/org.hl7.fhir.convertors/pom.xml
+++ b/org.hl7.fhir.convertors/pom.xml
@@ -82,10 +82,15 @@
         </dependency>
 
         <dependency>
-            <groupId>org.ogce</groupId>
+            <groupId>xpp3</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 d8ecd7ea9..89401a305 100644
--- a/org.hl7.fhir.dstu2/pom.xml
+++ b/org.hl7.fhir.dstu2/pom.xml
@@ -37,10 +37,15 @@
 
         <!-- XML Parsers -->
         <dependency>
-            <groupId>org.ogce</groupId>
+            <groupId>xpp3</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 624333a9d..b8b7b6e9e 100644
--- a/org.hl7.fhir.dstu2016may/pom.xml
+++ b/org.hl7.fhir.dstu2016may/pom.xml
@@ -37,8 +37,14 @@
 
         <!-- XML Parsers -->
         <dependency>
-            <groupId>org.ogce</groupId>
+            <groupId>xpp3</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 b0c294ad0..70fdca3af 100644
--- a/org.hl7.fhir.dstu3/pom.xml
+++ b/org.hl7.fhir.dstu3/pom.xml
@@ -37,11 +37,15 @@
 
         <!-- XML Parsers -->
         <dependency>
-            <groupId>org.ogce</groupId>
+            <groupId>xpp3</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 9ea76e504..140359a01 100644
--- a/org.hl7.fhir.r4/pom.xml
+++ b/org.hl7.fhir.r4/pom.xml
@@ -44,10 +44,15 @@
 
 		<!-- XML Parsers -->
 		<dependency>
-			<groupId>org.ogce</groupId>
+			<groupId>xpp3</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 c31a4503b..6ad4d6fb5 100644
--- a/org.hl7.fhir.r4b/pom.xml
+++ b/org.hl7.fhir.r4b/pom.xml
@@ -43,10 +43,15 @@
 
 		<!-- XML Parsers -->
 		<dependency>
-			<groupId>org.ogce</groupId>
+			<groupId>xpp3</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 b92f3224b..d7347eed0 100644
--- a/org.hl7.fhir.r5/pom.xml
+++ b/org.hl7.fhir.r5/pom.xml
@@ -44,11 +44,15 @@
 
 		<!-- XML Parsers -->
 		<dependency>
-			<groupId>org.ogce</groupId>
+			<groupId>xpp3</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 7faa28821..f0d8d3f15 100644
--- a/org.hl7.fhir.utilities/pom.xml
+++ b/org.hl7.fhir.utilities/pom.xml
@@ -84,11 +84,15 @@
             <optional>true</optional>
         </dependency>
         <dependency>
-            <groupId>org.ogce</groupId>
+            <groupId>xpp3</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 53c3db076..c9372b39d 100644
--- a/org.hl7.fhir.validation.cli/pom.xml
+++ b/org.hl7.fhir.validation.cli/pom.xml
@@ -288,10 +288,13 @@
             <artifactId>ucum</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.ogce</groupId>
+            <groupId>xpp3</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 6f4eabbb2..cca41c5e8 100644
--- a/org.hl7.fhir.validation/pom.xml
+++ b/org.hl7.fhir.validation/pom.xml
@@ -82,9 +82,13 @@
             <artifactId>Saxon-HE</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.ogce</groupId>
+            <groupId>xpp3</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 e6c49cd5b..b5bf04abd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -278,11 +278,6 @@
                 <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>