From ca049e956b9dac57a42cd0d4d7d70d92c8093517 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

---
 opendj3/pom.xml |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/opendj3/pom.xml b/opendj3/pom.xml
index 7823895..34ae347 100644
--- a/opendj3/pom.xml
+++ b/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