4:37 p.m.
Author: artdaw
Date: 2008-05-14 17:37:07 -0400 (Wed, 14 May 2008)
New Revision: 8585
Modified:
trunk/docs/faq/en/pom.xml
trunk/docs/faq/pom.xml
trunk/docs/migrationguide/en/pom.xml
trunk/docs/migrationguide/pom.xml
trunk/docs/userguide/en/pom.xml
trunk/docs/userguide/pom.xml
trunk/pom.xml
trunk/ui/assembly/pom.xml
Log:
http://jira.jboss.com/jira/browse/RF-3189 - Build with new version of
maven-jdocbook-plugin was fixed.
Modified: trunk/docs/faq/en/pom.xml
===================================================================
--- trunk/docs/faq/en/pom.xml 2008-05-14 18:44:25 UTC (rev 8584)
+++ trunk/docs/faq/en/pom.xml 2008-05-14 21:37:07 UTC (rev 8585)
@@ -11,7 +11,7 @@
<groupId>org.richfaces.docs.faq</groupId>
<artifactId>${translation}</artifactId>
<version>3.2.1-SNAPSHOT</version>
- <packaging>jdocbook</packaging>
+ <packaging>jar</packaging>
<name>Richfaces Manual (${translation})</name>
<properties>
Modified: trunk/docs/faq/pom.xml
===================================================================
--- trunk/docs/faq/pom.xml 2008-05-14 18:44:25 UTC (rev 8584)
+++ trunk/docs/faq/pom.xml 2008-05-14 21:37:07 UTC (rev 8585)
@@ -34,22 +34,29 @@
<groupId>org.jboss.maven.plugins</groupId>
<artifactId>maven-jdocbook-plugin</artifactId>
<version>2.0.0</version>
- <!--
<executions>
- <execution>
- <id>generate</id>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- <execution>
- <id>resources</id>
- <goals>
- <goal>resources</goal>
- </goals>
- </execution>
+ <execution>
+ <id>jdocbook:generate</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>jdocbook:resources</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>resources</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>jdocbook:bundle</id>
+ <phase>package</phase>
+ <goals>
+ <goal>bundle</goal>
+ </goals>
+ </execution>
</executions>
- -->
<dependencies>
<dependency>
<groupId>org.jboss</groupId>
Modified: trunk/docs/migrationguide/en/pom.xml
===================================================================
--- trunk/docs/migrationguide/en/pom.xml 2008-05-14 18:44:25 UTC (rev 8584)
+++ trunk/docs/migrationguide/en/pom.xml 2008-05-14 21:37:07 UTC (rev 8585)
@@ -11,7 +11,7 @@
<groupId>org.richfaces.docs.migration</groupId>
<artifactId>${translation}</artifactId>
<version>3.2.1-SNAPSHOT</version>
- <packaging>jdocbook</packaging>
+ <packaging>jar</packaging>
<name>RichFaces Migration Guide (${translation})</name>
<properties>
Modified: trunk/docs/migrationguide/pom.xml
===================================================================
--- trunk/docs/migrationguide/pom.xml 2008-05-14 18:44:25 UTC (rev 8584)
+++ trunk/docs/migrationguide/pom.xml 2008-05-14 21:37:07 UTC (rev 8585)
@@ -35,6 +35,29 @@
<groupId>org.jboss.maven.plugins</groupId>
<artifactId>maven-jdocbook-plugin</artifactId>
<version>2.0.0</version>
+ <executions>
+ <execution>
+ <id>jdocbook:generate</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>jdocbook:resources</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>resources</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>jdocbook:bundle</id>
+ <phase>package</phase>
+ <goals>
+ <goal>bundle</goal>
+ </goals>
+ </execution>
+ </executions>
<dependencies>
<dependency>
<groupId>org.jboss</groupId>
Modified: trunk/docs/userguide/en/pom.xml
===================================================================
--- trunk/docs/userguide/en/pom.xml 2008-05-14 18:44:25 UTC (rev 8584)
+++ trunk/docs/userguide/en/pom.xml 2008-05-14 21:37:07 UTC (rev 8585)
@@ -11,7 +11,7 @@
<groupId>org.richfaces.docs.userguide</groupId>
<artifactId>${translation}</artifactId>
<version>3.2.1-SNAPSHOT</version>
- <packaging>jdocbook</packaging>
+ <packaging>jar</packaging>
<name>Richfaces Manual (${translation})</name>
<properties>
Modified: trunk/docs/userguide/pom.xml
===================================================================
--- trunk/docs/userguide/pom.xml 2008-05-14 18:44:25 UTC (rev 8584)
+++ trunk/docs/userguide/pom.xml 2008-05-14 21:37:07 UTC (rev 8585)
@@ -693,22 +693,29 @@
<groupId>org.jboss.maven.plugins</groupId>
<artifactId>maven-jdocbook-plugin</artifactId>
<version>2.1.0-200803311251UTC-MPJDOCBOOK-8</version>
- <!--
<executions>
- <execution>
- <id>generate</id>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- <execution>
- <id>resources</id>
- <goals>
- <goal>resources</goal>
- </goals>
- </execution>
+ <execution>
+ <id>jdocbook:generate</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>jdocbook:resources</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>resources</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>jdocbook:bundle</id>
+ <phase>package</phase>
+ <goals>
+ <goal>bundle</goal>
+ </goals>
+ </execution>
</executions>
- -->
<dependencies>
<dependency>
<groupId>org.jboss</groupId>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2008-05-14 18:44:25 UTC (rev 8584)
+++ trunk/pom.xml 2008-05-14 21:37:07 UTC (rev 8585)
@@ -76,7 +76,7 @@
<module>framework</module>
<module>ui</module>
<module>extensions</module>
- <!--<module>docs</module>-->
+ <module>docs</module>
<module>ui/assembly</module>
<module>samples</module>
<!--
Modified: trunk/ui/assembly/pom.xml
===================================================================
--- trunk/ui/assembly/pom.xml 2008-05-14 18:44:25 UTC (rev 8584)
+++ trunk/ui/assembly/pom.xml 2008-05-14 21:37:07 UTC (rev 8585)
@@ -292,8 +292,8 @@
<version>
${project.version}
</version>
- <type>war</type>
- <classifier>pdf</classifier>
+ <type>jar</type>
+ <!--classifier>pdf</classifier-->
<outputDirectory>
${project.build.directory}/docs/userguide/en
</outputDirectory>
@@ -306,8 +306,8 @@
<version>
${project.version}
</version>
- <type>war</type>
- <classifier>pdf</classifier>
+ <type>jar</type>
+ <!--classifier>pdf</classifier-->
<outputDirectory>
${project.build.directory}/docs/faq/en
</outputDirectory>