From 97589bbba956ddf05078ed81e311ca9ba26a70f4 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Tue, 14 May 2013 10:30:53 +0000
Subject: [PATCH] Partial fix for OPENDJ-898: Rename OpenDJ SDK 3.0 to 2.6 in order to align versions across the product
---
opendj-sdk/opends/ivy.xml | 2 +-
opendj-sdk/opends/pom.xml | 3 +--
opendj-sdk/opends/pom-maven.xml | 13 ++++---------
3 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/opendj-sdk/opends/ivy.xml b/opendj-sdk/opends/ivy.xml
index 9fc1088..d2bb800 100644
--- a/opendj-sdk/opends/ivy.xml
+++ b/opendj-sdk/opends/ivy.xml
@@ -28,7 +28,7 @@
<!-- Using entities prevent constantly declaring the same versions -->
<!DOCTYPE ivy-module [
<!ENTITY grizzly.version "2.3">
- <!ENTITY opendj.sdk.version "3.0.0-SNAPSHOT">
+ <!ENTITY opendj.sdk.version "2.5.0-SNAPSHOT">
<!ENTITY crest.version "2.0.0-SNAPSHOT">
]>
<ivy-module version="2.0"
diff --git a/opendj-sdk/opends/pom-maven.xml b/opendj-sdk/opends/pom-maven.xml
index dec04a6..463dedc 100644
--- a/opendj-sdk/opends/pom-maven.xml
+++ b/opendj-sdk/opends/pom-maven.xml
@@ -32,10 +32,9 @@
<parent>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-project</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>2.5.0-SNAPSHOT</version>
</parent>
<artifactId>opendj-server</artifactId>
- <version>2.5.0-SNAPSHOT</version>
<name>OpenDJ Directory Server</name>
<description>
OpenDJ is a new LDAPv3 compliant directory service, developed for the Java
@@ -92,10 +91,6 @@
</repositories>
<properties>
- <grizzly.version>2.3</grizzly.version>
- <opendj.sdk.version>3.0.0-SNAPSHOT</opendj.sdk.version>
- <crest.version>2.0.0-SNAPSHOT</crest.version>
-
<ant.home>ext/ant</ant.home>
<generatedSourcesDirectory>target/generated-sources</generatedSourcesDirectory>
</properties>
@@ -119,18 +114,18 @@
<dependency>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-rest2ldap-servlet</artifactId>
- <version>${opendj.sdk.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-server2x-adapter</artifactId>
- <version>${opendj.sdk.version}</version>
+ <version>${project.version}</version>
<!--exclude module="opendj-server"/-->
</dependency>
<dependency>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-http-servlet</artifactId>
- <version>${grizzly.version}</version>
+ <version>${grizzlyFrameworkVersion}</version>
<!--exclude module="javax.servlet-api" /-->
</dependency>
diff --git a/opendj-sdk/opends/pom.xml b/opendj-sdk/opends/pom.xml
index c0f5f28..aab40af 100644
--- a/opendj-sdk/opends/pom.xml
+++ b/opendj-sdk/opends/pom.xml
@@ -37,10 +37,9 @@
<parent>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-project</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>2.5.0-SNAPSHOT</version>
</parent>
<artifactId>opendj-server</artifactId>
- <version>2.5.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>OpenDJ Directory Server</name>
<description>
--
Gitblit v1.10.0