From c6996e33e987657c0ca710e8d0d042e2bcceb675 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Mon, 26 Oct 2015 09:52:08 +0000
Subject: [PATCH] OPENDJ-2275 Use FR Bom in SDK
---
opendj-sdk/opendj-rest2ldap/pom.xml | 2 --
opendj-sdk/pom.xml | 32 ++++++++------------------------
2 files changed, 8 insertions(+), 26 deletions(-)
diff --git a/opendj-sdk/opendj-rest2ldap/pom.xml b/opendj-sdk/opendj-rest2ldap/pom.xml
index bef9dd9..611510d 100644
--- a/opendj-sdk/opendj-rest2ldap/pom.xml
+++ b/opendj-sdk/opendj-rest2ldap/pom.xml
@@ -51,13 +51,11 @@
<dependency>
<groupId>org.forgerock.commons</groupId>
<artifactId>json-resource</artifactId>
- <version>${forgerock-rest.version}</version>
</dependency>
<dependency>
<groupId>org.forgerock.commons</groupId>
<artifactId>json-resource-http</artifactId>
- <version>${forgerock-rest.version}</version>
</dependency>
<dependency>
diff --git a/opendj-sdk/pom.xml b/opendj-sdk/pom.xml
index 03689b0..5748c8f 100644
--- a/opendj-sdk/pom.xml
+++ b/opendj-sdk/pom.xml
@@ -118,9 +118,6 @@
<forgerock-build-tools.version>1.0.2</forgerock-build-tools.version>
<i18n-framework.version>1.4.2-SNAPSHOT</i18n-framework.version>
<grizzly-framework.version>2.3.14</grizzly-framework.version>
- <slf4j.version>1.7.5</slf4j.version>
- <forgerock-rest.version>3.0.0-SNAPSHOT</forgerock-rest.version>
- <forgerock-http.version>0.0.1-SNAPSHOT</forgerock-http.version>
<forgerock-doc-plugin.version>3.1.0-SNAPSHOT</forgerock-doc-plugin.version>
<!-- OSGi bundles properties -->
@@ -359,6 +356,14 @@
<dependencies>
<dependency>
<groupId>org.forgerock.commons</groupId>
+ <artifactId>forgerock-bom</artifactId>
+ <version>1.0.0</version>
+ <scope>import</scope>
+ <type>pom</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.forgerock.commons</groupId>
<artifactId>i18n-core</artifactId>
<version>${i18n-framework.version}</version>
<scope>compile</scope>
@@ -370,24 +375,6 @@
<version>${i18n-framework.version}</version>
<scope>compile</scope>
</dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.forgerock.commons</groupId>
- <artifactId>forgerock-util</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- </dependency>
</dependencies>
</dependencyManagement>
@@ -396,21 +383,18 @@
<dependency>
<groupId>org.easytesting</groupId>
<artifactId>fest-assert</artifactId>
- <version>1.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
- <version>1.8.5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
- <version>6.0.1</version>
<scope>test</scope>
</dependency>
--
Gitblit v1.10.0