Partial fix for OPENDJ-898: Rename OpenDJ SDK 3.0 to 2.6 in order to align ...

Matthew Swift

14.50.2013 ca049e956b9dac57a42cd0d4d7d70d92c8093517

Partial fix for OPENDJ-898: Rename OpenDJ SDK 3.0 to 2.6 in order to align versions across the product

* update project version to 2.5.0-SNAPSHOT (development version leading to 2.6.0).

 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>

 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>

 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>

 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>

 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>

 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>

 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>

 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>


 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>