Align with fix for DOCS-121; additional fix for OPENDJ-1253

Mark Craig

18.00.2013 e5a630b05410ceede6685b3bb3f579ea8d2aba26

 opends/pom.xml

@@ -99,13 +99,15 @@
    <sdkDocTargetVersion>${docTargetVersion}</sdkDocTargetVersion>
    <gaId>UA-23412190-8</gaId>
    <!--
      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>2.0.0-SNAPSHOT</frDocPluginVersion>

@@ -115,9 +117,6 @@
    <serverJavadocBase>http://opendj.forgerock.org/opendj-server/javadoc/</serverJavadocBase>
    <sdkJavadocBase>http://opendj.forgerock.org/opendj-ldap-sdk/apidocs/</sdkJavadocBase>

    <docbkxSourceDirectory>${basedir}/src/main/docbkx</docbkxSourceDirectory>
    <docbkxBuildDirectory>build</docbkxBuildDirectory>

    <!-- END Documentation properties -->
  </properties>
  <build>
@@ -194,22 +193,12 @@
        <version>${frDocPluginVersion}</version>
        <inherited>false</inherited>
        <configuration>
         <buildDirectory>${docbkxBuildDirectory}</buildDirectory>
         <projectName>OpenDJ</projectName>
         <googleAnalyticsId>${gaId}</googleAnalyticsId>
         <docbkxSourceDirectory>${basedir}/src/main/docbkx</docbkxSourceDirectory>
        </configuration>
        <executions>
          <execution>
            <id>filter-sources</id>
            <phase>pre-site</phase>
            <goals>
              <goal>filter</goal>
            </goals>
            <configuration>
              <docbkxSourceDirectory>${docbkxSourceDirectory}</docbkxSourceDirectory>
            </configuration>
          </execution>
          <execution>
            <id>copy-common</id>
            <phase>pre-site</phase>
            <goals>
@@ -217,6 +206,13 @@
            </goals>
          </execution>
          <execution>
            <id>filter-sources</id>
            <phase>pre-site</phase>
            <goals>
              <goal>filter</goal>
            </goals>
          </execution>
          <execution>
            <id>prepare-sources</id>
            <phase>pre-site</phase>
            <goals>