commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nia...@apache.org
Subject svn commit: r611126 - /commons/proper/commons-parent/trunk/pom.xml
Date Fri, 11 Jan 2008 09:49:00 GMT
Author: niallp
Date: Fri Jan 11 01:49:00 2008
New Revision: 611126

URL: http://svn.apache.org/viewvc?rev=611126&view=rev
Log:
Specify latest javadoc, clirr, antrun and site plugin versions. Add hack to include NOTICE/LICENSE
files in the javadoc jar - see:

Dev discussion: http://commons.markmail.org/message/hmlkxgcanovi4esw
First commons-parent-7 vote: http://commons.markmail.org/message/3wdm6kmtlpiwhgbv
Legal-Discuss thread: http://apache.markmail.org/message/iy4gtuilzhhct6h

Modified:
    commons/proper/commons-parent/trunk/pom.xml

Modified: commons/proper/commons-parent/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/commons-parent/trunk/pom.xml?rev=611126&r1=611125&r2=611126&view=diff
==============================================================================
--- commons/proper/commons-parent/trunk/pom.xml (original)
+++ commons/proper/commons-parent/trunk/pom.xml Fri Jan 11 01:49:00 2008
@@ -169,6 +169,26 @@
           <artifactId>cobertura-maven-plugin</artifactId>
           <version>2.2</version>
         </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-javadoc-plugin</artifactId>
+          <version>2.3</version>
+        </plugin>
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>clirr-maven-plugin</artifactId>
+          <version>2.1</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-antrun-plugin</artifactId>
+          <version>1.1</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-site-plugin</artifactId>
+          <version>2.0-beta-6</version>
+        </plugin>
       </plugins>
     </pluginManagement>
     <plugins>
@@ -204,6 +224,33 @@
           <jdkLevel>${maven.compile.source}</jdkLevel>
         </configuration>
       </plugin>
+      <plugin>
+        <!--
+          - Copy LICENSE.txt and NOTICE.txt so that they are included
+          - commons-io-X.Y-javadoc.jar.
+          -->
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>javadoc.resources</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <tasks>
+                <copy todir="${project.build.directory}/apidocs/META-INF">
+                  <fileset dir="${basedir}">
+                    <include name="LICENSE.txt" />
+                    <include name="NOTICE.txt" />
+                  </fileset>
+                </copy>
+              </tasks>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 
@@ -212,7 +259,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.2</version>
         <configuration> 
           <aggregate>true</aggregate>
           <source>${maven.compile.source}</source>



Mime
View raw message