From: Ray Lee <ray.lee@lyrasis.org>
Date: Mon, 17 Apr 2023 19:33:55 +0000 (-0400)
Subject: Upgrade dom4j to 2.1.4. (#334)
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=15d629c53bd037ee796478c6d9db483c3a34a01a;p=tmp%2Fjakarta-migration.git

Upgrade dom4j to 2.1.4. (#334)
---

diff --git a/3rdparty/nuxeo/nuxeo-platform-elasticsearch/pom.xml b/3rdparty/nuxeo/nuxeo-platform-elasticsearch/pom.xml
index d6cb6e71a..0db70f89f 100644
--- a/3rdparty/nuxeo/nuxeo-platform-elasticsearch/pom.xml
+++ b/3rdparty/nuxeo/nuxeo-platform-elasticsearch/pom.xml
@@ -25,6 +25,11 @@
             <groupId>org.nuxeo.ecm.automation</groupId>
             <artifactId>nuxeo-automation-io</artifactId>
         </dependency>
+        <!-- Needed by nuxeo-automation-io, since we excluded dom4j:dom4j in order to upgrade to org.dom4j:dom4j -->
+        <dependency>
+            <groupId>org.dom4j</groupId>
+            <artifactId>dom4j</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.common</artifactId>
diff --git a/3rdparty/nuxeo/nuxeo-platform-thumbnail/pom.xml b/3rdparty/nuxeo/nuxeo-platform-thumbnail/pom.xml
index d789ae67a..78b13e4d4 100644
--- a/3rdparty/nuxeo/nuxeo-platform-thumbnail/pom.xml
+++ b/3rdparty/nuxeo/nuxeo-platform-thumbnail/pom.xml
@@ -32,7 +32,11 @@
         <dependency>
           <groupId>org.nuxeo.ecm.platform</groupId>
           <artifactId>nuxeo-platform-imaging-core</artifactId>
-          <scope>provided</scope>
+        </dependency>
+        <!-- Needed by nuxeo-platform-imaging-core, since we excluded dom4j:dom4j in order to upgrade to org.dom4j:dom4j -->
+        <dependency>
+            <groupId>org.dom4j</groupId>
+            <artifactId>dom4j</artifactId>
         </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
diff --git a/pom.xml b/pom.xml
index 0643a0f1d..358c6dfc3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -512,6 +512,12 @@
 				<scope>provided</scope>
 			</dependency>
 
+			<dependency>
+				<groupId>org.dom4j</groupId>
+				<artifactId>dom4j</artifactId>
+				<version>2.1.4</version>
+			</dependency>
+
 			<!-- Start of Nuxeo dependencies -->
 
 			<dependency>
@@ -535,6 +541,11 @@
 						<groupId>org.slf4j</groupId>
 						<artifactId>slf4j-log4j12</artifactId>
 					</exclusion>
+					<exclusion>
+						<!-- Exclude dom4j:dom4j so we can upgrade to org.dom4j:dom4j. -->
+						<groupId>dom4j</groupId>
+						<artifactId>dom4j</artifactId>
+					</exclusion>
 				</exclusions>
 			</dependency>
 			<dependency>
@@ -550,6 +561,11 @@
 						<groupId>xerces</groupId>
 						<artifactId>xercesImpl</artifactId>
 					</exclusion>
+					<!-- Exclude dom4j:dom4j so we can upgrade to org.dom4j:dom4j. -->
+					<exclusion>
+						<groupId>dom4j</groupId>
+						<artifactId>dom4j</artifactId>
+					</exclusion>
 				</exclusions>
 			</dependency>
 			<dependency>
@@ -586,6 +602,11 @@
 						<groupId>com.sun.jersey</groupId>
 						<artifactId>jersey-servlet</artifactId>
 					</exclusion>
+					<!-- Exclude dom4j:dom4j so we can upgrade to org.dom4j:dom4j. -->
+					<exclusion>
+						<groupId>dom4j</groupId>
+						<artifactId>dom4j</artifactId>
+					</exclusion>
 				</exclusions>
 			</dependency>
 			<dependency>
@@ -618,6 +639,13 @@
 				<groupId>org.nuxeo.ecm.core</groupId>
 				<artifactId>nuxeo-core-io</artifactId>
 				<version>${nuxeo.core.version}</version>
+				<exclusions>
+					<!-- Exclude dom4j:dom4j so we can upgrade to org.dom4j:dom4j. -->
+					<exclusion>
+						<groupId>dom4j</groupId>
+						<artifactId>dom4j</artifactId>
+					</exclusion>
+				</exclusions>
 			</dependency>
 			<dependency>
 				<groupId>org.nuxeo.ecm.core</groupId>
@@ -651,6 +679,11 @@
 						<groupId>org.slf4j</groupId>
 						<artifactId>slf4j-log4j12</artifactId>
 					</exclusion>
+					<!-- Exclude dom4j:dom4j so we can upgrade to org.dom4j:dom4j. -->
+					<exclusion>
+						<groupId>dom4j</groupId>
+						<artifactId>dom4j</artifactId>
+					</exclusion>
 				</exclusions>
 			</dependency>
 			<dependency>
@@ -662,6 +695,11 @@
 						<groupId>com.sun.jersey</groupId>
 						<artifactId>jersey-core</artifactId>
 					</exclusion>
+					<!-- Exclude dom4j:dom4j so we can upgrade to org.dom4j:dom4j. -->
+					<exclusion>
+						<groupId>dom4j</groupId>
+						<artifactId>dom4j</artifactId>
+					</exclusion>
 				</exclusions>
 			</dependency>
 			<dependency>
diff --git a/services/JaxRsServiceProvider/pom.xml b/services/JaxRsServiceProvider/pom.xml
index 79478c551..2f45fcb8a 100644
--- a/services/JaxRsServiceProvider/pom.xml
+++ b/services/JaxRsServiceProvider/pom.xml
@@ -678,7 +678,6 @@
 			<groupId>org.nuxeo.ecm.platform</groupId>
 			<artifactId>nuxeo-platform-imaging-core</artifactId>
 			<version>${nuxeo.platform.version}</version>
-            <scope>provided</scope>
         </dependency>
         <dependency>
 			<groupId>org.nuxeo.ecm.platform</groupId>
@@ -690,6 +689,11 @@
             <artifactId>nuxeo-runtime-osgi</artifactId>
 			<version>${nuxeo.core.version}</version>
         </dependency>
+        <!-- Needed by nuxeo-core and nuxeo-platform-imaging-core, since we excluded dom4j:dom4j in order to upgrade to org.dom4j:dom4j -->
+        <dependency>
+            <groupId>org.dom4j</groupId>
+            <artifactId>dom4j</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>org.osgi</groupId>
diff --git a/services/account/jaxb/pom.xml b/services/account/jaxb/pom.xml
index b45b0cbaa..9e5bcc4d4 100644
--- a/services/account/jaxb/pom.xml
+++ b/services/account/jaxb/pom.xml
@@ -30,6 +30,11 @@
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-entitymanager</artifactId>
         </dependency>
+        <!-- Needed by hibernate-entitymanager, since we excluded dom4j:dom4j in order to upgrade to org.dom4j:dom4j -->
+        <dependency>
+            <groupId>org.dom4j</groupId>
+            <artifactId>dom4j</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.jvnet.hyperjaxb3</groupId>
             <artifactId>hyperjaxb3-ejb-runtime</artifactId>
@@ -43,7 +48,7 @@
 			<groupId>org.collectionspace.services</groupId>
 			<artifactId>org.collectionspace.services.hyperjaxb</artifactId>
 			<version>${project.version}</version>
-        </dependency>        
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/services/authentication/jaxb/pom.xml b/services/authentication/jaxb/pom.xml
index beb995144..0bb200657 100644
--- a/services/authentication/jaxb/pom.xml
+++ b/services/authentication/jaxb/pom.xml
@@ -12,12 +12,12 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.collectionspace.services.authentication.jaxb</artifactId>
     <name>services.authentication.jaxb</name>
-    
+
     <properties>
         <sql.file>authentication.sql</sql.file>
         <sql.dir>src/main/resources/db/mysql</sql.dir>
     </properties>
-    
+
     <dependencies>
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
@@ -35,6 +35,11 @@
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-entitymanager</artifactId>
         </dependency>
+        <!-- Needed by hibernate-entitymanager, since we excluded dom4j:dom4j in order to upgrade to org.dom4j:dom4j -->
+        <dependency>
+            <groupId>org.dom4j</groupId>
+            <artifactId>dom4j</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.jvnet.hyperjaxb3</groupId>
             <artifactId>hyperjaxb3-ejb-runtime</artifactId>
diff --git a/services/authority/pom.xml b/services/authority/pom.xml
index d2a9c59d1..0b8aca118 100644
--- a/services/authority/pom.xml
+++ b/services/authority/pom.xml
@@ -76,6 +76,11 @@
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-entitymanager</artifactId>
         </dependency>
+        <!-- Needed by hibernate-entitymanager, since we excluded dom4j:dom4j in order to upgrade to org.dom4j:dom4j -->
+        <dependency>
+            <groupId>org.dom4j</groupId>
+            <artifactId>dom4j</artifactId>
+        </dependency>
         <!-- jboss -->
         <dependency>
             <groupId>jboss</groupId>
diff --git a/services/authority/service/pom.xml b/services/authority/service/pom.xml
index 8bb804989..6fc97ecfb 100644
--- a/services/authority/service/pom.xml
+++ b/services/authority/service/pom.xml
@@ -176,6 +176,11 @@
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-entitymanager</artifactId>
 		</dependency>
+		<!-- Needed by hibernate-entitymanager and nuxeo-platform-imaging-core, since we excluded dom4j:dom4j in order to upgrade to org.dom4j:dom4j -->
+		<dependency>
+			<groupId>org.dom4j</groupId>
+			<artifactId>dom4j</artifactId>
+		</dependency>
 		<!-- jboss -->
 		<dependency>
 			<groupId>jboss</groupId>
@@ -194,7 +199,6 @@
 			<groupId>org.nuxeo.ecm.platform</groupId>
 			<artifactId>nuxeo-platform-imaging-core</artifactId>
 			<version>${nuxeo.platform.version}</version>
-			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.nuxeo.ecm.platform</groupId>
diff --git a/services/authorization-mgt/jaxb/pom.xml b/services/authorization-mgt/jaxb/pom.xml
index 083743979..866b1c95c 100644
--- a/services/authorization-mgt/jaxb/pom.xml
+++ b/services/authorization-mgt/jaxb/pom.xml
@@ -30,6 +30,11 @@
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-entitymanager</artifactId>
         </dependency>
+        <!-- Needed by hibernate-entitymanager, since we excluded dom4j:dom4j in order to upgrade to org.dom4j:dom4j -->
+        <dependency>
+            <groupId>org.dom4j</groupId>
+            <artifactId>dom4j</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.jvnet.hyperjaxb3</groupId>
             <artifactId>hyperjaxb3-ejb-runtime</artifactId>
@@ -43,7 +48,7 @@
 			<groupId>org.collectionspace.services</groupId>
 			<artifactId>org.collectionspace.services.hyperjaxb</artifactId>
 			<version>${project.version}</version>
-        </dependency>        
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/services/authorization/jaxb/pom.xml b/services/authorization/jaxb/pom.xml
index 41cee3e5f..a3efdfa5a 100644
--- a/services/authorization/jaxb/pom.xml
+++ b/services/authorization/jaxb/pom.xml
@@ -33,6 +33,11 @@
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-entitymanager</artifactId>
         </dependency>
+        <!-- Needed by hibernate-entitymanager, since we excluded dom4j:dom4j in order to upgrade to org.dom4j:dom4j -->
+        <dependency>
+            <groupId>org.dom4j</groupId>
+            <artifactId>dom4j</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-c3p0</artifactId>
@@ -45,8 +50,8 @@
 			<groupId>org.collectionspace.services</groupId>
 			<artifactId>org.collectionspace.services.hyperjaxb</artifactId>
 			<version>${project.version}</version>
-        </dependency>        
-<!--     
+        </dependency>
+<!--
         <dependency>
             <groupId>javax.persistence</groupId>
             <artifactId>persistence-api</artifactId>
diff --git a/services/common/pom.xml b/services/common/pom.xml
index 95e46ec06..93660cc75 100644
--- a/services/common/pom.xml
+++ b/services/common/pom.xml
@@ -208,6 +208,11 @@
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-entitymanager</artifactId>
 		</dependency>
+		<!-- Needed by hibernate-entitymanager, nuxeo-opencmis-bindings, nuxeo-opencmis-impl, and nuxeo-platform-imaging-core, since we excluded dom4j:dom4j in order to upgrade to org.dom4j:dom4j -->
+		<dependency>
+			<groupId>org.dom4j</groupId>
+			<artifactId>dom4j</artifactId>
+		</dependency>
 		<!-- jboss -->
 		<dependency>
 			<groupId>org.jboss.security</groupId>
@@ -235,7 +240,6 @@
 			<groupId>org.nuxeo.ecm.platform</groupId>
 			<artifactId>nuxeo-platform-imaging-core</artifactId>
 			<version>${nuxeo.platform.version}</version>
-			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.nuxeo.ecm.platform</groupId>
diff --git a/services/hyperjaxb/pom.xml b/services/hyperjaxb/pom.xml
index 442934e95..0c285d843 100644
--- a/services/hyperjaxb/pom.xml
+++ b/services/hyperjaxb/pom.xml
@@ -2,16 +2,16 @@
 
 <!--
  pom.xml
- 
+
  A Maven 2 project file for the 'jaxb' module of the ID Service project.
 
  This document is a part of the source code and related artifacts
  for CollectionSpace, an open source collections management system
  for museums and related institutions:
- 
+
  http://www.collectionspace.org
  http://wiki.collectionspace.org
- 
+
  Based on work by Sanjay Dalal and Richard Millet.
 
  $LastChangedBy: aron $
@@ -28,21 +28,21 @@
     <artifactId>org.collectionspace.services.main</artifactId>
     <version>${revision}</version>
   </parent>
-  
+
   <modelVersion>4.0.0</modelVersion>
   <artifactId>org.collectionspace.services.hyperjaxb</artifactId>
   <name>services.hyperjaxb</name>
-  
+
   <dependencies>
-  <!-- 
+  <!--
 		<dependency>
 		  <groupId>com.sun.xml.bind</groupId>
 		  <artifactId>jaxb-impl</artifactId>
-		</dependency>    
+		</dependency>
 		<dependency>
 		  <groupId>org.jvnet.jaxb2-commons</groupId>
 		  <artifactId>property-listener-injector</artifactId>
-		</dependency>   
+		</dependency>
 		<dependency>
 			<groupId>org.jvnet.jaxb2_commons</groupId>
 			<artifactId>jaxb2-basics-runtime</artifactId>
@@ -57,12 +57,17 @@
 		    <groupId>org.hibernate</groupId>
 		    <artifactId>hibernate-entitymanager</artifactId>
 		</dependency>
+		<!-- Needed by hibernate-entitymanager, since we excluded dom4j:dom4j in order to upgrade to org.dom4j:dom4j -->
+		<dependency>
+			<groupId>org.dom4j</groupId>
+			<artifactId>dom4j</artifactId>
+		</dependency>
 		<dependency>
 		    <groupId>org.jvnet.hyperjaxb3</groupId>
 		    <artifactId>hyperjaxb3-ejb-runtime</artifactId>
-		</dependency>    
+		</dependency>
   </dependencies>
-  
+
   <build>
     <finalName>collectionspace-services-hyperjaxb</finalName>
     <defaultGoal>install</defaultGoal>
diff --git a/services/imports/service/pom.xml b/services/imports/service/pom.xml
index e0dba3e2d..70072b3c9 100644
--- a/services/imports/service/pom.xml
+++ b/services/imports/service/pom.xml
@@ -100,12 +100,22 @@
                     <groupId>org.slf4j</groupId>
                     <artifactId>slf4j-log4j12</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>dom4j</groupId>
+                    <artifactId>dom4j</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
         	<groupId>org.nuxeo.ecm.platform</groupId>
 	  		<artifactId>nuxeo-importer-xml-parser</artifactId>
 	  		<version>${nuxeo.platform.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>dom4j</groupId>
+                    <artifactId>dom4j</artifactId>
+                </exclusion>
+            </exclusions>
   		</dependency>
 
         <dependency>
diff --git a/services/pom.xml b/services/pom.xml
index 2fd469d52..e5462fa7b 100644
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -420,6 +420,13 @@
 				<groupId>org.hibernate</groupId>
 				<artifactId>hibernate-entitymanager</artifactId>
 				<version>3.4.0.GA</version>
+				<exclusions>
+					<!-- Exclude dom4j:dom4j so we can upgrade to org.dom4j:dom4j. -->
+					<exclusion>
+						<groupId>dom4j</groupId>
+						<artifactId>dom4j</artifactId>
+					</exclusion>
+				</exclusions>
 			</dependency>
 			<dependency>
 				<groupId>org.hibernate</groupId>
@@ -442,18 +449,6 @@
 				<artifactId>postgresql</artifactId>
 				<version>${postgres.driver.version}</version>
 			</dependency>
-			<dependency>
-				<groupId>org.dom4j</groupId>
-				<artifactId>dom4j</artifactId>
-				<version>2.1.4</version>
-				<scope>compile</scope>
-			</dependency>
-			<dependency>
-				<groupId>xml-apis</groupId>
-				<artifactId>xml-apis</artifactId>
-				<version>1.4.01</version>
-				<scope>compile</scope>
-			</dependency>
 		</dependencies>
 	</dependencyManagement>
 </project>