From a06fd90c9b6bfb5f9130146373ba18e5769593b6 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Wed, 29 Jan 2014 11:30:37 +0000
Subject: [PATCH] Checkpoint commit for OPENDJ-1288 : Migrate I18n and logging support to i18n framework and SLF4J
---
opendj3-server-dev/ivy.xml | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/opendj3-server-dev/ivy.xml b/opendj3-server-dev/ivy.xml
index 0d7f620..e21db72 100644
--- a/opendj3-server-dev/ivy.xml
+++ b/opendj3-server-dev/ivy.xml
@@ -50,11 +50,17 @@
<!-- 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"/>
+ <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.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" />
--
Gitblit v1.10.0