mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git

Mark Craig
28.39.2014 3daa16df0a3c316b670e52721c85d7822505c5fa
CR-3284 Move to latest doc tools

This introduces a dependency on a -SNAPSHOT in order to check that everything runs fine in Jenkins as well before the release, which is coming real soon now.

If ever the whole thing goes wrong, or we cannot release, I'll revert to remove the -SNAPSHOT dependency.
3 files modified
20 ■■■■ changed files
opendj-sdk/opends/pom.xml 4 ●●● patch | view | raw | blame | history
opendj-sdk/pom.xml 4 ●●● patch | view | raw | blame | history
opendj-sdk/src/site/xdoc/docs.xml 12 ●●●●● patch | view | raw | blame | history
opendj-sdk/opends/pom.xml
@@ -99,7 +99,7 @@
    <docPreviousVersion>2.6.0</docPreviousVersion>
    <sdkDocTargetVersion>${docTargetVersion}</sdkDocTargetVersion>
    <frDocPluginVersion>2.0.0</frDocPluginVersion>
    <frDocPluginVersion>2.1.0-SNAPSHOT</frDocPluginVersion>
    <gaId>UA-23412190-8</gaId>
    <!--
@@ -196,6 +196,8 @@
        <inherited>false</inherited>
        <configuration>
         <projectName>OpenDJ</projectName>
         <projectVersion>${docTargetVersion}</projectVersion>
         <latestJson>http://mcraig.org/fr/latest.php</latestJson><!-- Temporary workaround pending #QOZ-985-23233 -->
         <googleAnalyticsId>${gaId}</googleAnalyticsId>
         <docbkxSourceDirectory>${basedir}/src/main/docbkx</docbkxSourceDirectory>
        </configuration>
opendj-sdk/pom.xml
@@ -136,7 +136,7 @@
    <docPreviousVersion>2.6.0</docPreviousVersion>
    <sdkDocTargetVersion>${docTargetVersion}</sdkDocTargetVersion>
    <frDocPluginVersion>2.0.0</frDocPluginVersion>
    <frDocPluginVersion>2.1.0-SNAPSHOT</frDocPluginVersion>
    <gaId>UA-23412190-8</gaId>
    <siteDistributionURL>scp://forgerock.org/var/www/vhosts/opendj.forgerock.org/httpdocs</siteDistributionURL>
@@ -168,6 +168,8 @@
        <inherited>false</inherited>
        <configuration>
         <projectName>OpenDJ</projectName>
         <projectVersion>${docTargetVersion}</projectVersion>
         <latestJson>http://mcraig.org/fr/latest.php</latestJson><!-- Temporary workaround pending #QOZ-985-23233 -->
         <googleAnalyticsId>${gaId}</googleAnalyticsId>
        </configuration>
        <executions>
opendj-sdk/src/site/xdoc/docs.xml
@@ -44,28 +44,32 @@
    <a href="./opendj-server/doc/release-notes/index.html">HTML (single page)</a>,
    <a href="./opendj-server/doc/release-notes/index/index.html">HTML (1 page/chapter)</a>,
    <a href="./opendj-server/doc/OpenDJ-Release-Notes.pdf">PDF</a>,
    <a href="./opendj-server/doc/OpenDJ-Release-Notes.rtf">RTF</a></dd>
    <a href="./opendj-server/doc/OpenDJ-Release-Notes.rtf">RTF</a>,
    <a href="./opendj-server/doc/webhelp/release-notes/index.html">Webhelp</a></dd>
    <dt>Installation Guide</dt>
    <dd><a href="./opendj-server/doc/OpenDJ-Install-Guide.epub">EPUB</a>,
    <a href="./opendj-server/doc/install-guide/index.html">HTML (single page)</a>,
    <a href="./opendj-server/doc/install-guide/index/index.html">HTML (1 page/chapter)</a>,
    <a href="./opendj-server/doc/OpenDJ-Install-Guide.pdf">PDF</a>,
    <a href="./opendj-server/doc/OpenDJ-Install-Guide.rtf">RTF</a></dd>
    <a href="./opendj-server/doc/OpenDJ-Install-Guide.rtf">RTF</a>,
    <a href="./opendj-server/doc/webhelp/install-guide/index.html">Webhelp</a></dd>
    <dt>Administration Guide</dt>
    <dd><a href="./opendj-server/doc/OpenDJ-Admin-Guide.epub">EPUB</a>,
    <a href="./opendj-server/doc/admin-guide/index.html">HTML (single page)</a>,
    <a href="./opendj-server/doc/admin-guide/index/index.html">HTML (1 page/chapter)</a>,
    <a href="./opendj-server/doc/OpenDJ-Admin-Guide.pdf">PDF</a>,
    <a href="./opendj-server/doc/OpenDJ-Admin-Guide.rtf">RTF</a></dd>
    <a href="./opendj-server/doc/OpenDJ-Admin-Guide.rtf">RTF</a>,
    <a href="./opendj-server/doc/webhelp/admin-guide/index.html">Webhelp</a></dd>
    <dt>Developer Guide</dt>
    <dd><a href="./doc/OpenDJ-Dev-Guide.epub">EPUB</a>,
    <a href="./doc/dev-guide/index.html">HTML (single page)</a>,
    <a href="./doc/dev-guide/index/index.html">HTML (1 page/chapter)</a>,
    <a href="./doc/OpenDJ-Dev-Guide.pdf">PDF</a>,
    <a href="./doc/OpenDJ-Dev-Guide.rtf">RTF</a></dd>
    <a href="./doc/OpenDJ-Dev-Guide.rtf">RTF</a>,
    <a href="./doc/webhelp/dev-guide/index.html">Webhelp</a></dd>
    <dt>Configuration Reference</dt>
    <dd><a href="./opendj-server/configref/index.html">HTML</a></dd>