aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n..@apache.org
Subject svn commit: r1062061 - in /aries/trunk/parent/default-parent: java5-parent/pom.xml pom.xml
Date Fri, 21 Jan 2011 22:43:06 GMT
Author: not
Date: Fri Jan 21 22:43:06 2011
New Revision: 1062061

URL: http://svn.apache.org/viewvc?rev=1062061&view=rev
Log:
ARIES-553 Update javadoc plugin config

Modified:
    aries/trunk/parent/default-parent/java5-parent/pom.xml
    aries/trunk/parent/default-parent/pom.xml

Modified: aries/trunk/parent/default-parent/java5-parent/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/parent/default-parent/java5-parent/pom.xml?rev=1062061&r1=1062060&r2=1062061&view=diff
==============================================================================
--- aries/trunk/parent/default-parent/java5-parent/pom.xml (original)
+++ aries/trunk/parent/default-parent/java5-parent/pom.xml Fri Jan 21 22:43:06 2011
@@ -78,60 +78,6 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <configuration>
-                    <quiet>true</quiet>
-                    <source>1.5</source>
-                    <links>
-                        <link>http://java.sun.com/j2se/1.5.0/docs/api</link>
-                    </links>
-                    <tags>
-                        <tag>
-                            <name>goal</name>
-                            <placement>Xt</placement>
-                        </tag>
-                        <tag>
-                            <name>phase</name>
-                            <placement>Xt</placement>
-                        </tag>
-                        <tag>
-                            <name>execute</name>
-                            <placement>Xt</placement>
-                        </tag>
-                        <tag>
-                            <name>requiresDependencyResolution</name>
-                            <placement>Xt</placement>
-                        </tag>
-                        <tag>
-                            <name>parameter</name>
-                            <placement>Xf</placement>
-                        </tag>
-                        <tag>
-                            <name>required</name>
-                            <placement>Xf</placement>
-                        </tag>
-                        <tag>
-                            <name>readonly</name>
-                            <placement>Xf</placement>
-                        </tag>
-                        <tag>
-                            <name>component</name>
-                            <placement>Xf</placement>
-                        </tag>
-                        <tag>
-                            <name>plexus.component</name>
-                            <placement>Xf</placement>
-                        </tag>
-                        <tag>
-                            <name>plexus.requirement</name>
-                            <placement>Xf</placement>
-                        </tag>
-                    </tags>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-pmd-plugin</artifactId>
                 <configuration>
                     <targetJdk>1.5</targetJdk>

Modified: aries/trunk/parent/default-parent/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/parent/default-parent/pom.xml?rev=1062061&r1=1062060&r2=1062061&view=diff
==============================================================================
--- aries/trunk/parent/default-parent/pom.xml (original)
+++ aries/trunk/parent/default-parent/pom.xml Fri Jan 21 22:43:06 2011
@@ -250,6 +250,11 @@
                     <version>1.2.1</version>
                 </plugin>
                 
+                <plugin>
+                	<groupId>org.apache.maven.plugins</groupId>
+                	<artifactId>maven-javadoc-plugin</artifactId>
+                	<version>2.7</version>
+                </plugin>
             </plugins>
         </pluginManagement> 
 
@@ -443,19 +448,26 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.5</version>
+                <version>2.7</version>
 
                 <reportSets>
                     <reportSet>
                         <reports>
                             <report>javadoc</report>
                             <report>test-javadoc</report>
+                            <report>aggregate</report>
                         </reports>
                     </reportSet>
                 </reportSets>
 
                 <configuration>
+                    <excludePackageNames>${aries.javadoc.exclude.packages}</excludePackageNames>
                     <quiet>true</quiet>
+                    <source>1.5</source>
+                    <links>
+                        <link>http://java.sun.com/j2se/1.5.0/docs/api</link>
+                        <link>http://www.osgi.org/javadoc/r4v42/</link>
+                    </links>
                     <tags>
                         <tag>
                             <name>goal</name>
@@ -497,6 +509,14 @@
                             <name>plexus.requirement</name>
                             <placement>Xf</placement>
                         </tag>
+                        <tag>
+                            <name>Immutable</name>
+                            <placement>t</placement>
+                        </tag>
+                        <tag>
+                            <name>ThreadSafe</name>
+                            <placement>t</placement>
+                        </tag>
                     </tags>
                 </configuration>
             </plugin>
@@ -594,6 +614,7 @@
         <aries.osgi.exclude.dependencies>false</aries.osgi.exclude.dependencies>
         <aries.osgi.remove.headers>Ignore-Package,Include-Resource,Private-Package,Bundle-DocURL</aries.osgi.remove.headers>
         <aries.osgi.include.resource>{maven-resources}</aries.osgi.include.resource>
+        <aries.javadoc.exclude.packages>${aries.osgi.private.pkg}</aries.javadoc.exclude.packages>
     </properties>
 
     <modules>



Mime
View raw message