From 253a2f6f09d5120a25b5c16ef912bfab85d34097 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 29 Jan 2014 12:48:33 +0000
Subject: [PATCH] ivy.xml: used global excludes
---
opendj3-server-dev/ivy.xml | 22 ++++++++--------------
1 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/opendj3-server-dev/ivy.xml b/opendj3-server-dev/ivy.xml
index e21db72..2e34a1f 100644
--- a/opendj3-server-dev/ivy.xml
+++ b/opendj3-server-dev/ivy.xml
@@ -50,21 +50,11 @@
<!-- subsequent versions are not compatible with java 6, so force to use this version only -->
<dependency org="javax.servlet" name="javax.servlet-api" rev="[3.1-b02]" />
<dependency org="com.sleepycat" name="je" rev="5.0.97" />
- <dependency org="org.forgerock.opendj" name="opendj-rest2ldap-servlet" rev="&opendj.sdk.version;" conf="default->master,compile">
- <exclude module="slf4j-jdk14"/>
- </dependency>
- <dependency org="org.forgerock.opendj" name="opendj-slf4j-adapter" rev="&opendj.sdk.version;">
- <exclude module="opendj3-server-dev"/>
- </dependency>
+ <dependency org="org.forgerock.opendj" name="opendj-rest2ldap-servlet" rev="&opendj.sdk.version;" conf="default->master,compile" />
+ <dependency org="org.forgerock.opendj" name="opendj-slf4j-adapter" rev="&opendj.sdk.version;" />
<dependency org="org.forgerock.commons" name="i18n-slf4j" rev="&i18n.version;" />
- <dependency org="org.forgerock.opendj" name="opendj-server2x-adapter" rev="&opendj.sdk.version;">
- <!-- This is the OpenDJ server module :) -->
- <exclude module="opendj-server"/>
- <exclude module="slf4j-jdk14"/>
- </dependency>
- <dependency org="org.glassfish.grizzly" name="grizzly-http-servlet" rev="&grizzly.version;">
- <exclude module="javax.servlet-api" />
- </dependency>
+ <dependency org="org.forgerock.opendj" name="opendj-server2x-adapter" rev="&opendj.sdk.version;" />
+ <dependency org="org.glassfish.grizzly" name="grizzly-http-servlet" rev="&grizzly.version;" />
<!-- Test libs -->
<!--dependency org="org.testng" name="testng" rev="6.8.1" /-->
@@ -92,6 +82,10 @@
-->
<exclude org="javax.activation" artifact="activation" />
+ <exclude module="slf4j-jdk14"/>
+ <!-- This is already the OpenDJ server module :) -->
+ <exclude module="opendj-server"/>
+ <exclude module="opendj3-server-dev"/>
</dependencies>
</ivy-module>
--
Gitblit v1.10.0