From cef460d5e12c8f82a2498553bbfe609cde512336 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Tue, 14 May 2013 09:50:18 +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/opendj3/opendj-ldap-toolkit/pom.xml | 2 +-
opendj-sdk/opendj3/opendj-server2x-adapter/pom.xml | 2 +-
opendj-sdk/opendj3/opendj-virtual/pom.xml | 2 +-
opendj-sdk/opendj3/pom.xml | 11 ++++++-----
opendj-sdk/opendj3/opendj-ldap-sdk/pom.xml | 2 +-
opendj-sdk/opendj3/opendj-ldap-sdk-examples/pom.xml | 2 +-
opendj-sdk/opendj3/opendj-ldap-sync/pom.xml | 2 +-
opendj-sdk/opendj3/opendj-rest2ldap-servlet/pom.xml | 2 +-
opendj-sdk/opendj3/opendj-rest2ldap/pom.xml | 3 +--
9 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk-examples/pom.xml b/opendj-sdk/opendj3/opendj-ldap-sdk-examples/pom.xml
index afbaae7..4409693 100644
--- a/opendj-sdk/opendj3/opendj-ldap-sdk-examples/pom.xml
+++ b/opendj-sdk/opendj3/opendj-ldap-sdk-examples/pom.xml
@@ -29,7 +29,7 @@
<parent>
<artifactId>opendj-project</artifactId>
<groupId>org.forgerock.opendj</groupId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>2.5.0-SNAPSHOT</version>
</parent>
<artifactId>opendj-ldap-sdk-examples</artifactId>
<name>OpenDJ LDAP SDK Examples</name>
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/pom.xml b/opendj-sdk/opendj3/opendj-ldap-sdk/pom.xml
index 3608662..629bca2 100644
--- a/opendj-sdk/opendj3/opendj-ldap-sdk/pom.xml
+++ b/opendj-sdk/opendj3/opendj-ldap-sdk/pom.xml
@@ -30,7 +30,7 @@
<parent>
<artifactId>opendj-project</artifactId>
<groupId>org.forgerock.opendj</groupId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>2.5.0-SNAPSHOT</version>
</parent>
<artifactId>opendj-ldap-sdk</artifactId>
<name>OpenDJ LDAP SDK</name>
diff --git a/opendj-sdk/opendj3/opendj-ldap-sync/pom.xml b/opendj-sdk/opendj3/opendj-ldap-sync/pom.xml
index 192859e..9c00817 100644
--- a/opendj-sdk/opendj3/opendj-ldap-sync/pom.xml
+++ b/opendj-sdk/opendj3/opendj-ldap-sync/pom.xml
@@ -29,7 +29,7 @@
<parent>
<artifactId>opendj-project</artifactId>
<groupId>org.forgerock.opendj</groupId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>2.5.0-SNAPSHOT</version>
</parent>
<artifactId>opendj-ldap-sync</artifactId>
<name>OpenDJ LDAP Synchronization Daemon</name>
diff --git a/opendj-sdk/opendj3/opendj-ldap-toolkit/pom.xml b/opendj-sdk/opendj3/opendj-ldap-toolkit/pom.xml
index c120a3d..f2069c1 100644
--- a/opendj-sdk/opendj3/opendj-ldap-toolkit/pom.xml
+++ b/opendj-sdk/opendj3/opendj-ldap-toolkit/pom.xml
@@ -29,7 +29,7 @@
<parent>
<artifactId>opendj-project</artifactId>
<groupId>org.forgerock.opendj</groupId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>2.5.0-SNAPSHOT</version>
</parent>
<artifactId>opendj-ldap-toolkit</artifactId>
<name>OpenDJ LDAP Toolkit</name>
diff --git a/opendj-sdk/opendj3/opendj-rest2ldap-servlet/pom.xml b/opendj-sdk/opendj3/opendj-rest2ldap-servlet/pom.xml
index cc05569..2553f1c 100644
--- a/opendj-sdk/opendj3/opendj-rest2ldap-servlet/pom.xml
+++ b/opendj-sdk/opendj3/opendj-rest2ldap-servlet/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>opendj-project</artifactId>
<groupId>org.forgerock.opendj</groupId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>2.5.0-SNAPSHOT</version>
</parent>
<artifactId>opendj-rest2ldap-servlet</artifactId>
<name>OpenDJ Commons REST LDAP Gateway</name>
diff --git a/opendj-sdk/opendj3/opendj-rest2ldap/pom.xml b/opendj-sdk/opendj3/opendj-rest2ldap/pom.xml
index ea8e42d..5809e36 100644
--- a/opendj-sdk/opendj3/opendj-rest2ldap/pom.xml
+++ b/opendj-sdk/opendj3/opendj-rest2ldap/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>opendj-project</artifactId>
<groupId>org.forgerock.opendj</groupId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>2.5.0-SNAPSHOT</version>
</parent>
<artifactId>opendj-rest2ldap</artifactId>
<name>OpenDJ Commons REST Adapter</name>
@@ -29,7 +29,6 @@
</description>
<packaging>bundle</packaging>
<properties>
- <forgerockRestVersion>2.0.0-SNAPSHOT</forgerockRestVersion>
<checkstyleHeaderLocation>org/forgerock/checkstyle/default-java-header</checkstyleHeaderLocation>
</properties>
<dependencies>
diff --git a/opendj-sdk/opendj3/opendj-server2x-adapter/pom.xml b/opendj-sdk/opendj3/opendj-server2x-adapter/pom.xml
index 7dae25b..876344f 100644
--- a/opendj-sdk/opendj3/opendj-server2x-adapter/pom.xml
+++ b/opendj-sdk/opendj3/opendj-server2x-adapter/pom.xml
@@ -30,7 +30,7 @@
<parent>
<artifactId>opendj-project</artifactId>
<groupId>org.forgerock.opendj</groupId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>2.5.0-SNAPSHOT</version>
</parent>
<artifactId>opendj-server2x-adapter</artifactId>
<name>OpenDJ Server 2.x Adapter</name>
diff --git a/opendj-sdk/opendj3/opendj-virtual/pom.xml b/opendj-sdk/opendj3/opendj-virtual/pom.xml
index 300d988..56e659f 100644
--- a/opendj-sdk/opendj3/opendj-virtual/pom.xml
+++ b/opendj-sdk/opendj3/opendj-virtual/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>opendj-project</artifactId>
<groupId>org.forgerock.opendj</groupId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>2.5.0-SNAPSHOT</version>
</parent>
<artifactId>opendj-virtual</artifactId>
<name>OpenDJ Virtual</name>
diff --git a/opendj-sdk/opendj3/pom.xml b/opendj-sdk/opendj3/pom.xml
index 7823895..34ae347 100644
--- a/opendj-sdk/opendj3/pom.xml
+++ b/opendj-sdk/opendj3/pom.xml
@@ -32,7 +32,7 @@
</parent>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-project</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>2.5.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>OpenDJ Directory Services Project</name>
<description>
@@ -99,13 +99,14 @@
<properties>
<currentSDKversion>${project.version}</currentSDKversion>
<stableSDKversion>version.not.defined</stableSDKversion>
- <currentServerVersion>2.5.0-SNAPSHOT</currentServerVersion>
+ <currentServerVersion>${project.version}</currentServerVersion>
<stableServerVersion>2.4.6</stableServerVersion>
- <docTargetVersion>2.5.0</docTargetVersion>
- <sdkDocTargetVersion>3.0.0</sdkDocTargetVersion>
+ <docTargetVersion>2.6.0</docTargetVersion>
+ <sdkDocTargetVersion>2.6.0</sdkDocTargetVersion>
<siteDistributionURL>scp://forgerock.org/var/www/vhosts/opendj.forgerock.org/httpdocs</siteDistributionURL>
<i18nFrameworkVersion>1.4.0</i18nFrameworkVersion>
<grizzlyFrameworkVersion>2.3</grizzlyFrameworkVersion>
+ <forgerockRestVersion>2.0.0-SNAPSHOT</forgerockRestVersion>
<gaId>UA-23412190-8</gaId>
<!-- OSGi bundles properties -->
<opendj.osgi.import.additional/>
@@ -148,7 +149,7 @@
<artifactItem>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-log-ref</artifactId>
- <version>2.5.0-SNAPSHOT</version>
+ <version>${project.version}</version>
<type>jar</type>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/logref</outputDirectory>
--
Gitblit v1.10.0