From e0f79df5318d2bdfd21caa199d4cc8295595bd30 Mon Sep 17 00:00:00 2001
From: Mark Craig <mark.craig@forgerock.com>
Date: Fri, 07 Feb 2014 10:47:06 +0000
Subject: [PATCH] FR-74 fix for OPENDJ-1324: Prepare OpenDJ 2.6.1 release notes
---
pom.xml | 79 +++++++++++++++------------------------
1 files changed, 30 insertions(+), 49 deletions(-)
diff --git a/pom.xml b/pom.xml
index a44c2bf..3407491 100644
--- a/pom.xml
+++ b/pom.xml
@@ -102,8 +102,8 @@
<stableSDKversion>version.not.defined</stableSDKversion>
<currentServerVersion>2.6.0</currentServerVersion>
<stableServerVersion>2.6.0</stableServerVersion>
- <docTargetVersion>2.6.0</docTargetVersion>
- <sdkDocTargetVersion>2.6.0</sdkDocTargetVersion>
+ <docTargetVersion>2.6.1</docTargetVersion>
+ <sdkDocTargetVersion>2.6.7</sdkDocTargetVersion>
<siteDistributionURL>scp://forgerock.org/var/www/vhosts/opendj.forgerock.org/httpdocs</siteDistributionURL>
<i18nFrameworkVersion>1.4.0</i18nFrameworkVersion>
<grizzlyFrameworkVersion>2.3.4</grizzlyFrameworkVersion>
@@ -122,60 +122,27 @@
*
</opendj.osgi.import>
<!--
- Release date is specified only when building the documentation
- for publication. For example:
- -D"releaseDate=Software release date: January 1, 1970"
- Otherwise release date should remain empty.
+ Release date and publication date are set at release build time.
+ -D"releaseDate=Software release date: January 1, 1970"
+ -D"pubDate=Publication date: December 31, 1969"
+ At all other times, the dates should be empty.
-->
<releaseDate />
<softwareReleaseDate>${releaseDate}</softwareReleaseDate>
+ <pubDate />
+ <publicationDate>${pubDate}</publicationDate>
<checkstyleHeaderLocation>org/forgerock/checkstyle/opendj-java-header</checkstyleHeaderLocation>
- <frDocPluginVersion>1.2.0</frDocPluginVersion>
+ <frDocPluginVersion>2.0.0</frDocPluginVersion>
<!-- Permit doc build to override relative locations of non DocBook content -->
- <configRefBase>http://opendj.forgerock.org/opendj-server/configref/</configRefBase>
- <serverJavadocBase>http://opendj.forgerock.org/opendj-server/javadoc/</serverJavadocBase>
- <sdkJavadocBase>http://opendj.forgerock.org/opendj-ldap-sdk/apidocs/</sdkJavadocBase>
+ <configRefBase>http://docs.forgerock.org/en/opendj/2.6.0/configref/</configRefBase>
+ <serverJavadocBase>http://docs.forgerock.org/en/opendj/2.6.0/javadoc/</serverJavadocBase>
+ <sdkJavadocBase>http://docs.forgerock.org/en/opendj/2.6.0/javadoc/</sdkJavadocBase>
- <!-- Filtered docbkx sources -->
- <docbkxSourceDirectory>target/docbkx-filtered</docbkxSourceDirectory>
</properties>
<build>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>filter-docbkx-resources</id>
- <phase>pre-site</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <inherited>false</inherited>
- <configuration>
- <!-- Filter XML to allow ${property} in attribute values. -->
- <outputDirectory>${docbkxSourceDirectory}</outputDirectory>
- <resources>
- <resource>
- <directory>src/main/docbkx</directory>
- <filtering>true</filtering>
- <includes>
- <include>**/*.xml</include>
- </includes>
- </resource>
- <resource>
- <directory>src/main/docbkx</directory>
- <filtering>false</filtering>
- <excludes>
- <exclude>**/*.xml</exclude>
- </excludes>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
+<!-- For 2.6.x, we deliver only release notes, so leave out the log reference.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
@@ -202,18 +169,32 @@
</artifactItems>
</configuration>
</plugin>
+-->
<plugin>
<groupId>org.forgerock.commons</groupId>
<artifactId>forgerock-doc-maven-plugin</artifactId>
<version>${frDocPluginVersion}</version>
<inherited>false</inherited>
<configuration>
- <docbkxSourceDirectory>${docbkxSourceDirectory}</docbkxSourceDirectory> <!-- Use filtered XML -->
<projectName>OpenDJ</projectName>
<googleAnalyticsId>${gaId}</googleAnalyticsId>
</configuration>
<executions>
<execution>
+ <id>copy-common</id>
+ <phase>pre-site</phase>
+ <goals>
+ <goal>boilerplate</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>filter-sources</id>
+ <phase>pre-site</phase>
+ <goals>
+ <goal>filter</goal>
+ </goals>
+ </execution>
+ <execution>
<id>run-jcite</id>
<phase>pre-site</phase>
<configuration>
@@ -226,10 +207,10 @@
</goals>
</execution>
<execution>
- <id>copy-common</id>
+ <id>prepare-sources</id>
<phase>pre-site</phase>
<goals>
- <goal>boilerplate</goal>
+ <goal>prepare</goal>
</goals>
</execution>
<execution>
--
Gitblit v1.10.0