[hibernate-commits] Hibernate SVN: r17366 - in core/trunk: documentation/jbosscache2 and 2 other directories.

Author: steve.ebersole(a)jboss.com Date: 2009-08-19 14:14:33 -0400 (Wed, 19 Aug 2009) New Revision: 17366 Modified: core/trunk/documentation/envers/pom.xml core/trunk/documentation/jbosscache2/pom.xml core/trunk/documentation/manual/pom.xml core/trunk/parent/pom.xml Log: HHH-4099 : Doc build error (http://jira.codehaus.org/browse/MNG-1323) Modified: core/trunk/documentation/envers/pom.xml =================================================================== --- core/trunk/documentation/envers/pom.xml 2009-08-19 15:05:56 UTC (rev 17365) +++ core/trunk/documentation/envers/pom.xml 2009-08-19 18:14:33 UTC (rev 17366) @@ -21,16 +21,6 @@ <plugin> <groupId>org.jboss.maven.plugins</groupId> <artifactId>maven-jdocbook-plugin</artifactId> - <version>2.1.2</version> - <extensions>true</extensions> - <dependencies> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-jdocbook-style</artifactId> - <version>1.0.2</version> - <type>jdocbook-style</type> - </dependency> - </dependencies> <configuration> <sourceDocumentName>Envers_Reference.xml</sourceDocumentName> <masterTranslation>en-US</masterTranslation> @@ -43,31 +33,6 @@ <exclude>**/*.zargo</exclude> </excludes> </imageResource> - <formats> - <format> - <formatName>pdf</formatName> - <stylesheetResource>classpath:/xslt/hibernate/pdf/main-pdf.xsl</stylesheetResource> - <finalName>hibernate_reference.pdf</finalName> - <profilingTypeName>two_pass</profilingTypeName> - </format> - <format> - <formatName>html_single</formatName> - <stylesheetResource>classpath:/xslt/hibernate/html/main-single.xsl</stylesheetResource> - <finalName>index.html</finalName> - <profilingTypeName>two_pass</profilingTypeName> - </format> - <format> - <formatName>html</formatName> - <stylesheetResource>classpath:/xslt/hibernate/html/main-chunk.xsl</stylesheetResource> - <finalName>index.html</finalName> - <profilingTypeName>two_pass</profilingTypeName> - </format> - </formats> - <options> - <xincludeSupported>true</xincludeSupported> - <localeSeparator>-</localeSeparator> - <useRelativeImageUris>false</useRelativeImageUris> - </options> </configuration> </plugin> </plugins> Modified: core/trunk/documentation/jbosscache2/pom.xml =================================================================== --- core/trunk/documentation/jbosscache2/pom.xml 2009-08-19 15:05:56 UTC (rev 17365) +++ core/trunk/documentation/jbosscache2/pom.xml 2009-08-19 18:14:33 UTC (rev 17366) @@ -51,16 +51,6 @@ <plugin> <groupId>org.jboss.maven.plugins</groupId> <artifactId>maven-jdocbook-plugin</artifactId> - <version>2.1.0</version> - <extensions>true</extensions> - <dependencies> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-jdocbook-style</artifactId> - <version>1.0.2</version> - <type>jdocbook-style</type> - </dependency> - </dependencies> <configuration> <sourceDocumentName>Hibernate_JBC2_Reference.xml</sourceDocumentName> <sourceDirectory>${basedir}/src/main/docbook/en-US</sourceDirectory> @@ -74,37 +64,6 @@ <exclude>**/*.zargo</exclude> </excludes> </imageResource> - <formats> - <format> - <formatName>pdf</formatName> - <stylesheetResource>classpath:/xslt/hibernate/pdf/main-pdf.xsl</stylesheetResource> - <finalName>hibernate-jbosscache-guide.pdf</finalName> - <!-- - <profilingTypeName>two_pass</profilingTypeName> - --> - </format> - <format> - <formatName>html_single</formatName> - <stylesheetResource>classpath:/xslt/hibernate/html/main-single.xsl</stylesheetResource> - <finalName>index.html</finalName> - <!-- - <profilingTypeName>two_pass</profilingTypeName> - --> - </format> - <format> - <formatName>html</formatName> - <stylesheetResource>classpath:/xslt/hibernate/html/main-chunk.xsl</stylesheetResource> - <finalName>index.html</finalName> - <!-- - <profilingTypeName>two_pass</profilingTypeName> - --> - </format> - </formats> - <options> - <xincludeSupported>true</xincludeSupported> - <localeSeparator>-</localeSeparator> - <useRelativeImageUris>true</useRelativeImageUris> - </options> </configuration> </plugin> </plugins> Modified: core/trunk/documentation/manual/pom.xml =================================================================== --- core/trunk/documentation/manual/pom.xml 2009-08-19 15:05:56 UTC (rev 17365) +++ core/trunk/documentation/manual/pom.xml 2009-08-19 18:14:33 UTC (rev 17366) @@ -19,27 +19,9 @@ <build> <plugins> <plugin> - <!-- Needed in order to load the proper 'artifact handler' for the 'jdocbook-style' packaging --> <groupId>org.jboss.maven.plugins</groupId> - <artifactId>maven-jdocbook-style-plugin</artifactId> - <version>2.0.0</version> - <extensions>true</extensions> - </plugin> - <plugin> - <groupId>org.jboss.maven.plugins</groupId> <artifactId>maven-jdocbook-plugin</artifactId> - <version>2.2.0</version> - <extensions>true</extensions> - <dependencies> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-jdocbook-style</artifactId> - <version>2.0.0</version> - <type>jdocbook-style</type> - </dependency> - </dependencies> - <executions> <execution> <!-- @@ -77,43 +59,9 @@ <profiling> <enabled>true</enabled> </profiling> - <formats> - <format> - <formatName>pdf</formatName> - <stylesheetResource>classpath:/xslt/org/hibernate/jdocbook/xslt/pdf.xsl</stylesheetResource> - <finalName>hibernate_reference.pdf</finalName> - </format> - <format> - <formatName>html_single</formatName> - <stylesheetResource>classpath:/xslt/org/hibernate/jdocbook/xslt/xhtml-single.xsl</stylesheetResource> - <finalName>index.html</finalName> - </format> - <format> - <formatName>html</formatName> - <stylesheetResource>classpath:/xslt/org/hibernate/jdocbook/xslt/xhtml.xsl</stylesheetResource> - <finalName>index.html</finalName> - </format> - </formats> - <options> - <xincludeSupported>true</xincludeSupported> - <xmlTransformerType>saxon</xmlTransformerType> - <!-- needed for uri-resolvers; can be ommitted if using 'current' uri scheme --> - <!-- could also locate the docbook dependency and inspect its version... --> - <docbookVersion>1.72.0</docbookVersion> - <localeSeparator>-</localeSeparator> - </options> </configuration> </plugin> </plugins> </build> - <dependencies> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-jdocbook-style</artifactId> - <version>2.0.0</version> - <type>jdocbook-style</type> - </dependency> - </dependencies> - </project> Modified: core/trunk/parent/pom.xml =================================================================== --- core/trunk/parent/pom.xml 2009-08-19 15:05:56 UTC (rev 17365) +++ core/trunk/parent/pom.xml 2009-08-19 18:14:33 UTC (rev 17366) @@ -114,6 +114,12 @@ <build> <plugins> <plugin> + <!-- Needed in order to load the proper 'artifact handler' for the 'jdocbook-style' packaging --> + <groupId>org.jboss.maven.plugins</groupId> + <artifactId>maven-jdocbook-style-plugin</artifactId> + <extensions>true</extensions> + </plugin> + <plugin> <!-- require at least JDK 1.5 to run the build --> <!-- ... --> <!-- we need at least Maven 2.0.8 because of a bug fix affecting our antlr usage --> @@ -175,6 +181,52 @@ <pluginManagement> <plugins> <plugin> + <groupId>org.jboss.maven.plugins</groupId> + <artifactId>maven-jdocbook-plugin</artifactId> + <version>2.2.0</version> + <extensions>true</extensions> + <dependencies> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-jdocbook-style</artifactId> + <version>2.0.0</version> + <type>jdocbook-style</type> + </dependency> + </dependencies> + <configuration> + <formats> + <format> + <formatName>pdf</formatName> + <stylesheetResource>classpath:/xslt/org/hibernate/jdocbook/xslt/pdf.xsl</stylesheetResource> + <finalName>hibernate_reference.pdf</finalName> + </format> + <format> + <formatName>html_single</formatName> + <stylesheetResource>classpath:/xslt/org/hibernate/jdocbook/xslt/xhtml-single.xsl</stylesheetResource> + <finalName>index.html</finalName> + </format> + <format> + <formatName>html</formatName> + <stylesheetResource>classpath:/xslt/org/hibernate/jdocbook/xslt/xhtml.xsl</stylesheetResource> + <finalName>index.html</finalName> + </format> + </formats> + <options> + <xincludeSupported>true</xincludeSupported> + <xmlTransformerType>saxon</xmlTransformerType> + <!-- needed for uri-resolvers; can be ommitted if using 'current' uri scheme --> + <!-- could also locate the docbook dependency and inspect its version... --> + <docbookVersion>1.72.0</docbookVersion> + <localeSeparator>-</localeSeparator> + </options> + </configuration> + </plugin> + <plugin> + <groupId>org.jboss.maven.plugins</groupId> + <artifactId>maven-jdocbook-style-plugin</artifactId> + <version>2.0.0</version> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> <version>2.5</version> @@ -339,6 +391,7 @@ <!-- / test-scoped dependencies for common testing dependencies --> </dependencies> + <dependencyManagement> <dependencies> <dependency>