SAK-40794 cleanup dom4j dependencies (sakaiproject#6154)

* SAK-40794 cleanup dom4j dependencies * SAK-40794 add jaxen for tests
BruceMcl · Oct 17, 2018 · cfd66de · cfd66de
1 parent 3b6ab64
commit cfd66de
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 15 deletions.
diff --git a/edu-services/cm-service/cm-impl/hibernate-impl/impl/pom.xml b/edu-services/cm-service/cm-impl/hibernate-impl/impl/pom.xml
@@ -41,7 +41,6 @@
 		<dependency>
 			<groupId>jdom</groupId>
 			<artifactId>jdom</artifactId>
-			<version>1.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.hibernate</groupId>
@@ -96,9 +95,13 @@
 			<artifactId>hsqldb</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>dom4j</groupId>
+			<groupId>org.dom4j</groupId>
 			<artifactId>dom4j</artifactId>
-			<version>1.4</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>jaxen</groupId>
+			<artifactId>jaxen</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

diff --git a/edu-services/gradebook-service/impl/pom.xml b/edu-services/gradebook-service/impl/pom.xml
@@ -111,9 +111,8 @@
             <artifactId>commons-beanutils</artifactId>
         </dependency>
         <dependency>
-            <groupId>dom4j</groupId>
+            <groupId>org.dom4j</groupId>
             <artifactId>dom4j</artifactId>
-            <version>1.4</version>
         </dependency>
         <dependency>
             <groupId>com.thoughtworks.xstream</groupId>

diff --git a/hierarchy/impl/pom.xml b/hierarchy/impl/pom.xml
@@ -112,9 +112,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>dom4j</groupId>
+            <groupId>org.dom4j</groupId>
             <artifactId>dom4j</artifactId>
-            <version>1.6.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/master/pom.xml b/master/pom.xml
@@ -664,7 +664,7 @@
       <dependency>
         <groupId>org.dom4j</groupId>
         <artifactId>dom4j</artifactId>
-        <version>2.1.0</version>
+        <version>2.1.1</version>
         <scope>provided</scope>
       </dependency>
       <dependency>

diff --git a/polls/impl/pom.xml b/polls/impl/pom.xml
@@ -59,9 +59,8 @@
            <artifactId>commons-lang3</artifactId>
        </dependency>
         <dependency>
-            <groupId>dom4j</groupId>
+            <groupId>org.dom4j</groupId>
             <artifactId>dom4j</artifactId>
-            <version>1.6.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

diff --git a/reset-pass/account-validator-impl/pom.xml b/reset-pass/account-validator-impl/pom.xml
@@ -119,10 +119,8 @@
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
-			<groupId>dom4j</groupId>
+			<groupId>org.dom4j</groupId>
 			<artifactId>dom4j</artifactId>
-			<version>1.6.1</version>
-			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>javax.transaction</groupId>

diff --git a/samigo/samigo-app/pom.xml b/samigo/samigo-app/pom.xml
@@ -137,9 +137,8 @@
             <artifactId>commons-math3</artifactId>
         </dependency>
         <dependency>
-            <groupId>dom4j</groupId>
+            <groupId>org.dom4j</groupId>
             <artifactId>dom4j</artifactId>
-            <version>1.6.1</version>
         </dependency>
 		<dependency>
             <groupId>javax.activation</groupId>