From 185c702261bb72f697775def87e4e81975fd94ef Mon Sep 17 00:00:00 2001
From: Mark Craig <mark.craig@forgerock.com>
Date: Tue, 11 Feb 2014 15:08:10 +0000
Subject: [PATCH] CR-2986 Fix for OPENDJ-1336: Clean up version properties used for docs

---
 opendj-sdk/pom.xml        |   34 ++++++++++++++++++++--------------
 opendj-sdk/opends/pom.xml |   12 +++++++-----
 2 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/opendj-sdk/opends/pom.xml b/opendj-sdk/opends/pom.xml
index a3d5895..27835c4 100644
--- a/opendj-sdk/opends/pom.xml
+++ b/opendj-sdk/opends/pom.xml
@@ -22,7 +22,7 @@
   !
   ! CDDL HEADER END
   !
-  !      Copyright 2011-2013 ForgeRock AS
+  !      Copyright 2011-2014 ForgeRock AS
   !    
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -92,12 +92,16 @@
     <ant.home>ext/ant</ant.home>
     <BUILD_NUMBER>0</BUILD_NUMBER>
 
-    <!-- START Documentation properties -->
+    <checkstyleHeaderLocation>org/forgerock/checkstyle/opendj-java-header</checkstyleHeaderLocation>
 
+  <!-- START Documentation properties -->
     <docTargetVersion>${project.version}</docTargetVersion><!-- Reset before final publication -->
     <docPreviousVersion>2.6.0</docPreviousVersion>
     <sdkDocTargetVersion>${docTargetVersion}</sdkDocTargetVersion>
+
+    <frDocPluginVersion>2.0.0</frDocPluginVersion>
     <gaId>UA-23412190-8</gaId>
+
     <!--
       Release date and publication date are set at release build time.
         -D"releaseDate=Software release date: January 1, 1970"
@@ -108,8 +112,6 @@
     <softwareReleaseDate>${releaseDate}</softwareReleaseDate>
     <pubDate />
     <publicationDate>${pubDate}</publicationDate>
-    <checkstyleHeaderLocation>org/forgerock/checkstyle/opendj-java-header</checkstyleHeaderLocation>
-    <frDocPluginVersion>2.0.0</frDocPluginVersion>
 
     <!-- Permit doc build to override relative locations of non DocBook content -->
     <coreDocBase>http://opendj.forgerock.org/doc/</coreDocBase>
@@ -117,7 +119,7 @@
     <serverJavadocBase>http://opendj.forgerock.org/opendj-server/javadoc/</serverJavadocBase>
     <sdkJavadocBase>http://opendj.forgerock.org/opendj-ldap-sdk/apidocs/</sdkJavadocBase>
 
-    <!-- END Documentation properties -->
+  <!-- END Documentation properties -->
   </properties>
   <build>
     <directory>build</directory>
diff --git a/opendj-sdk/pom.xml b/opendj-sdk/pom.xml
index 5fbed9a..195b5b8 100644
--- a/opendj-sdk/pom.xml
+++ b/opendj-sdk/pom.xml
@@ -109,19 +109,13 @@
   <properties>
     <mavenRepoSnapshots>http://maven.forgerock.org/repo/snapshots</mavenRepoSnapshots>
     <mavenRepoReleases>http://maven.forgerock.org/repo/releases</mavenRepoReleases>
+
     <forgerockBuildToolsVersion>1.0.2</forgerockBuildToolsVersion>
-    <currentSDKversion>${project.version}</currentSDKversion>
-    <stableSDKversion>version.not.defined</stableSDKversion>
-    <currentServerVersion>2.5.0-SNAPSHOT</currentServerVersion>
-    <docTargetVersion>${project.version}</docTargetVersion><!-- Reset before final publication -->
-    <docPreviousVersion>2.6.0</docPreviousVersion>
-    <sdkDocTargetVersion>${docTargetVersion}</sdkDocTargetVersion>
-    <siteDistributionURL>scp://forgerock.org/var/www/vhosts/opendj.forgerock.org/httpdocs</siteDistributionURL>
     <i18nFrameworkVersion>1.4.2-SNAPSHOT</i18nFrameworkVersion>
     <grizzlyFrameworkVersion>2.3.6</grizzlyFrameworkVersion>
     <slf4jVersion>1.7.5</slf4jVersion>
     <forgerockRestVersion>2.1.0-SNAPSHOT</forgerockRestVersion>
-    <gaId>UA-23412190-8</gaId>
+
     <!-- OSGi bundles properties -->
     <opendj.osgi.import.additional/>
     <!--
@@ -129,11 +123,24 @@
      | it change the version policy from == + to == =+  [2.0,3) [2.0,2.1)
     -->
     <opendj.osgi.import>
-     org.forgerock.opendj.*;provide:=true,
-     org.forgerock.json.*;provide:=true,
-     ${opendj.osgi.import.additional},
-     *
+      org.forgerock.opendj.*;provide:=true,
+      org.forgerock.json.*;provide:=true,
+      ${opendj.osgi.import.additional},
+      *
     </opendj.osgi.import>
+
+    <checkstyleHeaderLocation>org/forgerock/checkstyle/opendj-java-header</checkstyleHeaderLocation>
+
+  <!-- START Documentation properties -->
+    <docTargetVersion>${project.version}</docTargetVersion><!-- Reset before final publication -->
+    <docPreviousVersion>2.6.0</docPreviousVersion>
+    <sdkDocTargetVersion>${docTargetVersion}</sdkDocTargetVersion>
+
+    <frDocPluginVersion>2.0.0</frDocPluginVersion>
+    <gaId>UA-23412190-8</gaId>
+
+    <siteDistributionURL>scp://forgerock.org/var/www/vhosts/opendj.forgerock.org/httpdocs</siteDistributionURL>
+
     <!--
       Release date and publication date are set at release build time.
         -D"releaseDate=Software release date: January 1, 1970"
@@ -144,14 +151,13 @@
     <softwareReleaseDate>${releaseDate}</softwareReleaseDate>
     <pubDate/>
     <publicationDate>${pubDate}</publicationDate>
-    <checkstyleHeaderLocation>org/forgerock/checkstyle/opendj-java-header</checkstyleHeaderLocation>
-    <frDocPluginVersion>2.0.0</frDocPluginVersion>
 
     <!-- Permit doc build to override relative locations of non DocBook content -->
     <coreDocBase>http://opendj.forgerock.org/doc/</coreDocBase>
     <configRefBase>http://opendj.forgerock.org/opendj-server/configref/</configRefBase>
     <serverJavadocBase>http://opendj.forgerock.org/opendj-server/javadoc/</serverJavadocBase>
     <sdkJavadocBase>http://opendj.forgerock.org/opendj-core/apidocs/</sdkJavadocBase>
+  <!-- END Documentation properties -->
   </properties>
   <build>
     <plugins>

--
Gitblit v1.10.0