Fixing dependency convergence

Evolveum · Sep 18, 2015 · a2e36a8 · a2e36a8
1 parent b1366c3
commit a2e36a8
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/build-system/pom.xml b/build-system/pom.xml
@@ -845,6 +845,21 @@
 				<artifactId>joda-time</artifactId>
 				<version>2.6</version>
 			</dependency>
+			<dependency>
+				<groupId>org.apache.directory.api</groupId>
+				<artifactId>api-all</artifactId>
+				<version>1.0.0-M32-SNAPSHOT</version>
+				<exclusions>
+	                <exclusion>
+	                    <artifactId>slf4j-api</artifactId>
+	                    <groupId>org.slf4j</groupId>
+	                </exclusion>
+	                <exclusion> <!-- Version conflict with xalan -->
+					    <groupId>xml-apis</groupId>
+	    				<artifactId>xml-apis</artifactId>
+	                </exclusion>
+	            </exclusions>
+			</dependency>
         </dependencies>
     </dependencyManagement>
 

diff --git a/testing/conntest/pom.xml b/testing/conntest/pom.xml
@@ -110,7 +110,6 @@
 		<dependency>
 			<groupId>org.apache.directory.api</groupId>
 			<artifactId>api-all</artifactId>
-			<version>1.0.0-M31-e1</version>
 		</dependency>
 
 		<!-- TEST dependency -->