CR-2721 Fix for OPENDJ-1253: Test upgrade to latest doc build plugin

Mark Craig

17.21.2013 0851f3ebcc88abf7de9679b485078c8a564532d5

 opends/pom.xml

@@ -107,7 +107,7 @@
    <releaseDate />
    <softwareReleaseDate>${releaseDate}</softwareReleaseDate>
    <checkstyleHeaderLocation>org/forgerock/checkstyle/opendj-java-header</checkstyleHeaderLocation>
    <frDocPluginVersion>1.2.0</frDocPluginVersion>
    <frDocPluginVersion>2.0.0-SNAPSHOT</frDocPluginVersion>

    <!-- Permit doc build to override relative locations of non DocBook content -->
    <coreDocBase>http://opendj.forgerock.org/doc/</coreDocBase>
@@ -115,9 +115,7 @@
    <serverJavadocBase>http://opendj.forgerock.org/opendj-server/javadoc/</serverJavadocBase>
    <sdkJavadocBase>http://opendj.forgerock.org/opendj-ldap-sdk/apidocs/</sdkJavadocBase>

    <!-- Filtered docbkx sources -->
    <docbkxSourceDirectory>${basedir}/target/docbkx-filtered</docbkxSourceDirectory>
    <docbkxOutputDirectory>${basedir}/target/docbkx</docbkxOutputDirectory> <!-- Pending DOCS-93 -->
    <docbkxSourceDirectory>${basedir}/src/main/docbkx</docbkxSourceDirectory>
    <docbkxBuildDirectory>build</docbkxBuildDirectory>

    <!-- END Documentation properties -->
@@ -191,54 +189,27 @@
      </plugin>

      <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>

      <plugin>
        <groupId>org.forgerock.commons</groupId>
        <artifactId>forgerock-doc-maven-plugin</artifactId>
        <version>${frDocPluginVersion}</version>
        <inherited>false</inherited>
        <configuration>
         <buildDirectory>${docbkxBuildDirectory}</buildDirectory>
         <docbkxSourceDirectory>${docbkxSourceDirectory}</docbkxSourceDirectory> <!-- Use filtered XML -->
         <docbkxOutputDirectory>${docbkxOutputDirectory}</docbkxOutputDirectory>
         <projectName>OpenDJ</projectName>
         <googleAnalyticsId>${gaId}</googleAnalyticsId>
        </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>
@@ -246,6 +217,13 @@
            </goals>
          </execution>
          <execution>
            <id>prepare-sources</id>
            <phase>pre-site</phase>
            <goals>
              <goal>prepare</goal>
            </goals>
          </execution>
          <execution>
            <id>build-doc</id>
            <phase>pre-site</phase>
            <goals>