From bcc49ce8d0737526465a17206298007ff57fbf80 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Thu, 03 Oct 2013 15:36:32 +0000
Subject: [PATCH] Additional fix for OPENDJ-176: Use SLF4J for logging in the SDK
---
opendj3/opendj-ldap-sdk-examples/pom.xml | 9 ++++
opendj3/opendj-rest2ldap-servlet/pom.xml | 8 ++++
opendj3/opendj-ldap-sdk/pom.xml | 16 ++------
opendj3/opendj-ldap-toolkit/pom.xml | 17 ++++++--
opendj3/pom.xml | 16 ++++++++
5 files changed, 48 insertions(+), 18 deletions(-)
diff --git a/opendj3/opendj-ldap-sdk-examples/pom.xml b/opendj3/opendj-ldap-sdk-examples/pom.xml
index aaf0d6b..d2da95c 100644
--- a/opendj3/opendj-ldap-sdk-examples/pom.xml
+++ b/opendj3/opendj-ldap-sdk-examples/pom.xml
@@ -39,7 +39,14 @@
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-ldap-sdk</artifactId>
<version>${project.version}</version>
- <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
</dependency>
</dependencies>
<build>
diff --git a/opendj3/opendj-ldap-sdk/pom.xml b/opendj3/opendj-ldap-sdk/pom.xml
index 46065f5..71a8e6c 100644
--- a/opendj3/opendj-ldap-sdk/pom.xml
+++ b/opendj3/opendj-ldap-sdk/pom.xml
@@ -47,7 +47,10 @@
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-framework</artifactId>
<version>${grizzlyFrameworkVersion}</version>
- <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.forgerock</groupId>
@@ -55,17 +58,6 @@
<version>${forgerockBuildToolsVersion}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.7.5</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- <version>1.7.5</version>
- <scope>test</scope>
- </dependency>
</dependencies>
<properties>
<opendj.osgi.import>
diff --git a/opendj3/opendj-ldap-toolkit/pom.xml b/opendj3/opendj-ldap-toolkit/pom.xml
index 834d7f7..b977744 100644
--- a/opendj3/opendj-ldap-toolkit/pom.xml
+++ b/opendj3/opendj-ldap-toolkit/pom.xml
@@ -42,7 +42,18 @@
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-ldap-sdk</artifactId>
<version>${project.version}</version>
- <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.forgerock.commons</groupId>
+ <artifactId>i18n-core</artifactId>
</dependency>
<dependency>
<groupId>org.forgerock</groupId>
@@ -50,10 +61,6 @@
<version>${forgerockBuildToolsVersion}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.forgerock.commons</groupId>
- <artifactId>i18n-core</artifactId>
- </dependency>
</dependencies>
<build>
<plugins>
diff --git a/opendj3/opendj-rest2ldap-servlet/pom.xml b/opendj3/opendj-rest2ldap-servlet/pom.xml
index d251a2c..ed3db40 100644
--- a/opendj3/opendj-rest2ldap-servlet/pom.xml
+++ b/opendj3/opendj-rest2ldap-servlet/pom.xml
@@ -53,6 +53,14 @@
<scope>runtime</scope>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ </dependency>
+ <dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.0.1</version>
diff --git a/opendj3/pom.xml b/opendj3/pom.xml
index 051f0f4..c32e4af 100644
--- a/opendj3/pom.xml
+++ b/opendj3/pom.xml
@@ -106,6 +106,7 @@
<siteDistributionURL>scp://forgerock.org/var/www/vhosts/opendj.forgerock.org/httpdocs</siteDistributionURL>
<i18nFrameworkVersion>1.4.0</i18nFrameworkVersion>
<grizzlyFrameworkVersion>2.3.6</grizzlyFrameworkVersion>
+ <slf4jVersion>1.7.5</slf4jVersion>
<forgerockRestVersion>2.1.0-SNAPSHOT</forgerockRestVersion>
<gaId>UA-23412190-8</gaId>
<!-- OSGi bundles properties -->
@@ -448,6 +449,16 @@
<version>${i18nFrameworkVersion}</version>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4jVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ <version>${slf4jVersion}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
<dependencies>
@@ -469,6 +480,11 @@
<version>6.0.1</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<licenses>
<license>
--
Gitblit v1.10.0