From e1f914766d98ab7ed0e123cefc9c684fc91b3290 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Mon, 22 Oct 2012 14:49:39 +0000
Subject: [PATCH] Re-enable rest-2ldap build and fix clean up rest2ldap dependencies.
---
opendj-sdk/opendj3/pom.xml | 3 ---
opendj-sdk/opendj3/opendj-rest2ldap/pom.xml | 33 +++++++++++++--------------------
2 files changed, 13 insertions(+), 23 deletions(-)
diff --git a/opendj-sdk/opendj3/opendj-rest2ldap/pom.xml b/opendj-sdk/opendj3/opendj-rest2ldap/pom.xml
index 0c5d7ed..b59a57d 100644
--- a/opendj-sdk/opendj3/opendj-rest2ldap/pom.xml
+++ b/opendj-sdk/opendj3/opendj-rest2ldap/pom.xml
@@ -38,48 +38,41 @@
This module includes APIs for implementing REST to LDAP gateways.
</description>
<packaging>jar</packaging>
- <repositories>
- <repository>
- <id>maven-restlet</id>
- <name>Public online Restlet repository</name>
- <url>http://maven.restlet.org</url>
- </repository>
- </repositories>
+ <properties>
+ <forgerockRestVersion>2.0.0-SNAPSHOT</forgerockRestVersion>
+ </properties>
<dependencies>
<dependency>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-ldap-sdk</artifactId>
<version>${project.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.forgerock.opendj</groupId>
- <artifactId>opendj-build-tools</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.forgerock.commons</groupId>
<artifactId>json-fluent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- <scope>compile</scope>
+ <version>${forgerockRestVersion}</version>
</dependency>
<dependency>
<groupId>org.forgerock.commons</groupId>
<artifactId>json-resource</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- <scope>compile</scope>
+ <version>${forgerockRestVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.forgerock</groupId>
+ <artifactId>forgerock-build-tools</artifactId>
+ <version>${forgerockBuildToolsVersion}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.forgerock.commons</groupId>
<artifactId>json-resource-servlet</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>${forgerockRestVersion}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-http-servlet</artifactId>
- <version>2.3-SNAPSHOT</version>
+ <version>${grizzlyFrameworkVersion}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/opendj-sdk/opendj3/pom.xml b/opendj-sdk/opendj3/pom.xml
index 2180110..5b46008 100644
--- a/opendj-sdk/opendj3/pom.xml
+++ b/opendj-sdk/opendj3/pom.xml
@@ -94,10 +94,7 @@
<modules>
<module>opendj-ldap-sdk</module>
<module>opendj-ldap-toolkit</module>
- <!--
- <module>opendj-ldap-sync</module>
<module>opendj-rest2ldap</module>
- -->
<module>opendj-ldap-sdk-examples</module>
</modules>
<properties>
--
Gitblit v1.10.0