You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ey...@apache.org on 2011/10/27 01:46:10 UTC
svn commit: r1189539 - in /incubator/ambari/trunk: client/pom.xml
controller/pom.xml pom.xml
Author: eyang
Date: Wed Oct 26 23:46:09 2011
New Revision: 1189539
URL: http://svn.apache.org/viewvc?rev=1189539&view=rev
Log:
AMBARI-107. Added reporting section to aggregate javadocs. (Eric Yang)
Modified:
incubator/ambari/trunk/client/pom.xml
incubator/ambari/trunk/controller/pom.xml
incubator/ambari/trunk/pom.xml
Modified: incubator/ambari/trunk/client/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/client/pom.xml?rev=1189539&r1=1189538&r2=1189539&view=diff
==============================================================================
--- incubator/ambari/trunk/client/pom.xml (original)
+++ incubator/ambari/trunk/client/pom.xml Wed Oct 26 23:46:09 2011
@@ -21,6 +21,7 @@
<groupId>org.apache.ambari</groupId>
<artifactId>ambari</artifactId>
<version>0.1.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: incubator/ambari/trunk/controller/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/controller/pom.xml?rev=1189539&r1=1189538&r2=1189539&view=diff
==============================================================================
--- incubator/ambari/trunk/controller/pom.xml (original)
+++ incubator/ambari/trunk/controller/pom.xml Wed Oct 26 23:46:09 2011
@@ -64,11 +64,11 @@
<artifactId>wadl-resourcedoc-doclet</artifactId>
<version>1.8</version>
</docletArtifact>
- <docletArtifact>
+<!-- <docletArtifact>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-server</artifactId>
<version>1.8</version>
- </docletArtifact>
+ </docletArtifact> -->
<docletArtifact>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
@@ -98,11 +98,11 @@
<artifactId>wadl-resourcedoc-doclet</artifactId>
<version>1.8</version>
</docletArtifact>
- <docletArtifact>
+<!-- <docletArtifact>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-server</artifactId>
<version>1.8</version>
- </docletArtifact>
+ </docletArtifact> -->
<docletArtifact>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
Modified: incubator/ambari/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/pom.xml?rev=1189539&r1=1189538&r2=1189539&view=diff
==============================================================================
--- incubator/ambari/trunk/pom.xml (original)
+++ incubator/ambari/trunk/pom.xml Wed Oct 26 23:46:09 2011
@@ -197,6 +197,26 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.8</version>
+ <configuration>
+ <doctitle>Ambari API for ${project.name} ${project.version}</doctitle>
+ </configuration>
+ <executions>
+ <execution>
+ <id>aggregate</id>
+ <goals>
+ <goal>aggregate</goal>
+ </goals>
+ <phase>site</phase>
+ <configuration>
+ <doctitle>Ambari API for ${project.name} ${project.version}</doctitle>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.4</version>
<executions>
@@ -222,7 +242,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.4</version>
+ <version>2.8</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -655,145 +675,80 @@
</build>
</profile>
- <profile>
- <id>docs</id>
- <activation />
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
+ </profiles>
- <profile>
- <id>report</id>
- <activation />
- <reporting>
- <plugins>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.7</version>
- <reportSets>
- <reportSet>
- <id>jaxb</id>
- <configuration>
- <doclet>com.lunatech.doclets.jax.jaxb.JAXBDoclet</doclet>
- <docletArtifacts>
- <docletArtifact>
- <groupId>com.lunatech.jax-doclets</groupId>
- <artifactId>doclets</artifactId>
- <version>0.9.0</version>
- </docletArtifact>
- </docletArtifacts>
- <destDir>jaxbdocs</destDir>
- </configuration>
- <reports>
- <report>javadoc</report>
- </reports>
- </reportSet>
- <reportSet>
- <id>jaxrs</id>
- <configuration>
- <doclet>com.lunatech.doclets.jax.jaxrs.JAXRSDoclet</doclet>
- <docletArtifacts>
- <docletArtifact>
- <groupId>com.lunatech.jax-doclets</groupId>
- <artifactId>doclets</artifactId>
- <version>0.9.0</version>
- </docletArtifact>
- </docletArtifacts>
- <destDir>jaxrsdocs</destDir>
- <links>
- <link>../jaxbdocs/</link>
- </links>
- </configuration>
- <reports>
- <report>javadoc</report>
- </reports>
- </reportSet>
- <reportSet>
- <id>uml</id>
- <configuration>
- <links>
- <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
- </links>
- <doclet>org.umlgraph.doclet.UmlGraphDoc</doclet>
- <docletArtifact>
- <groupId>org.umlgraph</groupId>
- <artifactId>doclet</artifactId>
- <version>5.1</version>
- </docletArtifact>
- <additionalparam>-inferrel -inferdep -useimports -postfixpackage -nodefontsize 9 -nodefontpackagesize 7 -hide java.* -hide org.*</additionalparam>
- <destDir>withUML</destDir>
- <show>public</show>
- </configuration>
- </reportSet>
- </reportSets>
- </plugin>
- <plugin>
- <artifactId>maven-jxr-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-pmd-plugin</artifactId>
- <reportSets>
- <reportSet>
- <reports>
- <report>pmd</report>
- <report>cpd</report>
- </reports>
- </reportSet>
- </reportSets>
- <configuration>
- <targetJdk>1.5</targetJdk>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.4</version>
+ <configuration>
+ <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.7</version>
+ <reportSets>
+ <reportSet>
+ <id>javadoc</id>
<configuration>
- <threshold>Normal</threshold>
- <effort>Max</effort>
+ <aggregate>true</aggregate>
+ <doctitle>Ambari API for ${project.name} ${project.version}</doctitle>
</configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>javancss-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jdepend-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>taglist-maven-plugin</artifactId>
- </plugin>
- </plugins>
- </reporting>
- </profile>
- </profiles>
+ <reports>
+ <report>javadoc</report>
+ </reports>
+ </reportSet>
+ <reportSet>
+ <id>aggregate</id>
+ <reports>
+ <report>aggregate</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ <plugin>
+ <artifactId>maven-jxr-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>pmd</report>
+ <report>cpd</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ <configuration>
+ <targetJdk>1.5</targetJdk>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <configuration>
+ <threshold>Normal</threshold>
+ <effort>Max</effort>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>javancss-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>jdepend-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>taglist-maven-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </reporting>
<repositories>
<repository>