ACS-5371 Exclude xpp3 dependency

Alfresco · Nov 21, 2024 · 01ccd72 · 01ccd72
1 parent 70dd764
commit 01ccd72
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/data-model/pom.xml b/data-model/pom.xml
@@ -118,6 +118,18 @@
             <groupId>org.jibx</groupId>
             <artifactId>jibx-run</artifactId>
             <version>1.4.2</version>
+            <exclusions>
+                <!-- [ACS-5371] Excluded to avoid conflict in JDK9+ as it includes javax.xml-->
+                <exclusion>
+                    <groupId>xpp3</groupId>
+                    <artifactId>xpp3</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>xmlpull</groupId>
+            <artifactId>xmlpull</artifactId>
+            <version>${dependency.xmlpull.version}</version>
         </dependency>
         <dependency> 
             <groupId>com.fasterxml.jackson.core</groupId> 

diff --git a/packaging/distribution/src/main/resources/licenses/notice.txt b/packaging/distribution/src/main/resources/licenses/notice.txt
@@ -238,6 +238,7 @@ Java Runtime Env + redistributable components   http://java.oracle.com/
 === Public Domain License ===
 AOP Alliance    http://aopalliance.sourceforge.net/
 XZ  http://tukaani.org/xz/
+XMLPULL http://www.xmlpull.org/
 
 
 === Sun Public License ===

diff --git a/pom.xml b/pom.xml
@@ -96,6 +96,7 @@
         <dependency.maven-artifact.version>3.8.6</dependency.maven-artifact.version>
         <dependency.jdom2.version>2.0.6.1</dependency.jdom2.version>
         <dependency.pooled-jms.version>3.1.6</dependency.pooled-jms.version>
+        <dependency.xmlpull.version>1.1.3.1</dependency.xmlpull.version>
 
         <dependency.jakarta-ee-jaxb-api.version>4.0.2</dependency.jakarta-ee-jaxb-api.version>
         <dependency.jakarta-ee-jaxb-impl.version>4.0.5</dependency.jakarta-ee-jaxb-impl.version>