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 d6cb6e71a6898e4b9f6861064c2d12a8b443a681..0db70f89fcdd6e87c4ad49f603332dd42cf46dba 100644 (file)
--- 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 d789ae67a69d5b47ac7e71d0c57a08434492ae3b..78b13e4d4aff0951a84a469c44ce3de35994dd36 100644 (file)
--- 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 0643a0f1d05f93e76ca824e3a8f88682b3131563..358c6dfc333766970734fd7b558f23b70edcb174 100644 (file)
--- 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 79478c551dab736b91c4776fe8110358adc823c3..2f45fcb8adbcc08cfcea7da3a33db244796c2bb4 100644 (file)
--- 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 b45b0cbaab3ed415607e932c4567d762e3353e4b..9e5bcc4d40481104bed6458cfa9fc877e1a17139 100644 (file)
--- 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 beb9951443f61cb67ee8b4a70d88786f13ea9fb4..0bb200657ec05937066dddf1dd6ec3c32f330f0d 100644 (file)
--- 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 d2a9c59d14215b0f432089020ba4480b071aea94..0b8aca118d2f7e181bb791e89d6864bd7d648c54 100644 (file)
--- 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 8bb8049894c68579f54195b813e4b627642ae7ae..6fc97ecfb11b6fed8ac2bc4ac9220c4e735906d0 100644 (file)
--- 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 0837439792ca3243a6dfbfd060c761c15e0d8e62..866b1c95c80e71650ab27eda39396d7c13368deb 100644 (file)
--- 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 41cee3e5f890706d5bef59b33bb277e32db66bad..a3efdfa5a2b1e4cee87fafeaba2b0f6dc04740a7 100644 (file)
--- 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 95e46ec0679fbceeef391cfc831ae1a641f5588b..93660cc756fd0509263ff7af80db23d671e62e01 100644 (file)
--- 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 442934e951b0ab6ccd9054c2660888164ee50a38..0c285d8431cafc223b34dea230c4695f03765489 100644 (file)
--- 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 e0dba3e2df7dd0686f70c2ac38512b0c267c7ee2..70072b3c9712e430a40126d5e4832b7a29d1310b 100644 (file)
--- 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 2fd469d52f84da4863b5dc89f779d74d02fac421..e5462fa7b0063104974b06033c5f9c252f49f3c1 100644 (file)
--- 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>