3:01 p.m.
Author: jbalunas(a)redhat.com
Date: 2011-02-16 16:01:21 -0500 (Wed, 16 Feb 2011)
New Revision: 21712
Modified:
trunk/core/impl/pom.xml
trunk/parent/pom.xml
trunk/ui/misc/ui/pom.xml
trunk/ui/parent/pom.xml
Log:
RF-10006 Fixed javadoc generation
Modified: trunk/core/impl/pom.xml
===================================================================
--- trunk/core/impl/pom.xml 2011-02-16 21:00:34 UTC (rev 21711)
+++ trunk/core/impl/pom.xml 2011-02-16 21:01:21 UTC (rev 21712)
@@ -172,23 +172,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <javadocVersion>1.5</javadocVersion>
- <aggregate>true</aggregate>
- </configuration>
- <executions>
- <execution>
- <id>generate-javadoc</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<!--
TODO - this can go to central, but should check settings. This is
also related to docs so perhaps add to a doc profile Configure
Modified: trunk/parent/pom.xml
===================================================================
--- trunk/parent/pom.xml 2011-02-16 21:00:34 UTC (rev 21711)
+++ trunk/parent/pom.xml 2011-02-16 21:01:21 UTC (rev 21712)
@@ -195,7 +195,16 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.2</version>
+ <version>2.7</version>
+ <configuration>
+ <keywords>true</keywords>
+ <quiet>true</quiet>
+ <!-- Solves issues related to link lookups for all
+ modules, even those that do not need it, that
+ was slowing builds down. If removed review
+ full build. -->
+ <detectOfflineLinks>false</detectOfflineLinks>
+ </configuration>
</plugin>
</plugins>
</pluginManagement>
@@ -215,17 +224,12 @@
<build>
<plugins>
<plugin>
- <!-- TODO move to doc profile? -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <javadocVersion>1.5</javadocVersion>
- <aggregate>true</aggregate>
- </configuration>
<executions>
<execution>
<id>generate-javadoc</id>
- <phase>generate-sources</phase>
+ <phase>package</phase>
<goals>
<goal>jar</goal>
</goals>
@@ -236,12 +240,6 @@
</build>
</profile>
<profile>
- <!-- Triggers generated documentation as part of builds ( javadoc, jsdoc,
- etc... -->
- <id>doc</id>
- <!-- TODO -->
- </profile>
- <profile>
<!-- Triggers clover reports to be generated -->
<id>clover</id>
<build>
Modified: trunk/ui/misc/ui/pom.xml
===================================================================
--- trunk/ui/misc/ui/pom.xml 2011-02-16 21:00:34 UTC (rev 21711)
+++ trunk/ui/misc/ui/pom.xml 2011-02-16 21:01:21 UTC (rev 21712)
@@ -45,11 +45,7 @@
</plugin>
</plugins>
</build>
-
- <properties>
-
<assembly.projects.group>org.richfaces.ui.misc</assembly.projects.group>
- </properties>
-
+
<dependencies>
<dependency>
<groupId>org.richfaces.ui.common</groupId>
@@ -61,99 +57,6 @@
</dependency>
</dependencies>
- <profiles>
- <profile>
- <id>release</id>
- <!-- TODO this needs to be centralized in ui-parent -->
- <build>
- <plugins>
- <plugin>
- <!-- unpack necessary dependencies for collecting jsdoc and
javadocs -->
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>deps</id>
- <phase>process-sources</phase>
- <goals>
- <goal>unpack-dependencies</goal>
- </goals>
- <configuration>
- <classifier>sources</classifier>
-
-
<includeGroupIds>${assembly.projects.group}</includeGroupIds>
-
<useSubDirectoryPerArtifact>true</useSubDirectoryPerArtifact>
-
<excludeTransitive>true</excludeTransitive>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <!--
- <plugin>
- <!– collecting jsdoc
–>
-
<groupId>gr.abiss.mvn.plugins</groupId>
-
<artifactId>maven-jstools-plugin</artifactId>
- <executions>
- <execution>
- <id>jsdoc</id>
-
<phase>prepare-package</phase>
- <configuration>
-
<outputBaseDirectory>${basedir}/target</outputBaseDirectory>
-
<jsDir>${basedir}/target/dependency</jsDir>
-
<includes>**/*.js</includes>
-
<caseSensitive>true</caseSensitive>
- </configuration>
- <goals>
- <goal>jsdoc</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <!– pack jsdoc to jar
–>
-
<artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <id>pack-jsodcs</id>
- <phase>package</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- <configuration>
-
<classesDirectory>${basedir}/target/jsdoc</classesDirectory>
-
<classifier>jsdoc</classifier>
- </configuration>
- </execution>
- </executions>
- </plugin>
- -->
- <plugin>
- <!-- collecting javadoc -->
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.7</version>
- <executions>
- <execution>
- <id>javadoc-jar</id>
- <phase>package</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- <configuration>
-
<sourcepath>${basedir}/target/dependency</sourcepath>
- <!--
-
<includeDependencySources>true</includeDependencySources>
-
<dependencySourceIncludes>
-
<dependencySourceInclude>${assembly.projects.group}:*-ui:*</dependencySourceInclude>
-
</dependencySourceIncludes>
- -->
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
<scm>
<connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/ui/m...
</connection>
Modified: trunk/ui/parent/pom.xml
===================================================================
--- trunk/ui/parent/pom.xml 2011-02-16 21:00:34 UTC (rev 21711)
+++ trunk/ui/parent/pom.xml 2011-02-16 21:01:21 UTC (rev 21712)
@@ -156,23 +156,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <javadocVersion>1.5</javadocVersion>
- <aggregate>true</aggregate>
- </configuration>
- <executions>
- <execution>
- <id>generate-javadoc</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<configuration>
<aggregate>true</aggregate>