You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@creadur.apache.org by jo...@apache.org on 2009/03/09 03:09:17 UTC
svn commit: r751571 - in /incubator/rat/main/trunk: ./ apache-rat-core/
apache-rat-plugin/ apache-rat-plugin/src/main/java/org/apache/rat/mp/
apache-rat-plugin/src/site/apt/ apache-rat-plugin/src/site/apt/examples/
apache-rat-plugin/src/site/fml/ apach...
Author: jochen
Date: Mon Mar 9 02:09:17 2009
New Revision: 751571
URL: http://svn.apache.org/viewvc?rev=751571&view=rev
Log:
- Updated docs: rat-maven-plugin, rather than
apache-rat-plugin was used in various places.
- Performance improvement of build: Moved javadoc,
sources, docck, and rat plugin to release profile.
Modified:
incubator/rat/main/trunk/apache-rat-core/pom.xml
incubator/rat/main/trunk/apache-rat-plugin/pom.xml
incubator/rat/main/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java
incubator/rat/main/trunk/apache-rat-plugin/src/site/apt/examples/basic.apt
incubator/rat/main/trunk/apache-rat-plugin/src/site/apt/examples/site.apt
incubator/rat/main/trunk/apache-rat-plugin/src/site/apt/examples/verify.apt
incubator/rat/main/trunk/apache-rat-plugin/src/site/apt/usage.apt
incubator/rat/main/trunk/apache-rat-plugin/src/site/fml/faq.fml
incubator/rat/main/trunk/apache-rat-tasks/pom.xml
incubator/rat/main/trunk/pom.xml
incubator/rat/main/trunk/src/site/apt/index.apt
Modified: incubator/rat/main/trunk/apache-rat-core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/pom.xml?rev=751571&r1=751570&r2=751571&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/pom.xml (original)
+++ incubator/rat/main/trunk/apache-rat-core/pom.xml Mon Mar 9 02:09:17 2009
@@ -25,8 +25,8 @@
<artifactId>apache-rat-core</artifactId>
<packaging>jar</packaging>
<name>RAT Core</name>
- <description>The core functionality of RAT, shared by rat-anttasks,
- and rat-maven-plugin.</description>
+ <description>The core functionality of RAT, shared by the Ant tasks,
+ and the Maven plugin.</description>
<build>
<resources>
@@ -47,38 +47,6 @@
</includes>
</resource>
</resources>
- <plugins>
- <plugin>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <version>1.0</version>
- <executions>
- <execution>
- <goals>
- <goal>process</goal>
- </goals>
- <configuration>
- <resourceBundles>
- <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
- </resourceBundles>
- <properties>
- <addLicense>true</addLicense>
- </properties>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- </plugins>
</build>
<dependencies>
Modified: incubator/rat/main/trunk/apache-rat-plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-plugin/pom.xml?rev=751571&r1=751570&r2=751571&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-plugin/pom.xml (original)
+++ incubator/rat/main/trunk/apache-rat-plugin/pom.xml Mon Mar 9 02:09:17 2009
@@ -26,22 +26,12 @@
<packaging>maven-plugin</packaging>
<name>RAT Maven Plugin</name>
<description>Maven 2 plugin for running RAT, the Release Audit Tool.</description>
- <url>http://incubator.apache.org/rat/</url>
+ <inceptionYear>2007</inceptionYear>
<prerequisites>
<maven>2.0.4</maven>
</prerequisites>
- <inceptionYear>2007</inceptionYear>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
- <organization>
- <name>Apache Software Foundation</name>
- <url>http://www.apache.org/</url>
- </organization>
+ <url>http://incubator.apache.org/rat</url>
+
<build>
<resources>
<resource>
@@ -62,98 +52,29 @@
</resource>
</resources>
<plugins>
- <!-- Comment out once this plugin has been released
<plugin>
<groupId>org.apache.rat</groupId>
- <artifactId>rat-maven-plugin</artifactId>
+ <artifactId>apache-rat-plugin</artifactId>
<configuration>
<excludes>
- <exclude>target/**/*</exclude>
- <exclude>.settings/**/*</exclude>
- <exclude>.project</exclude>
- <exclude>.classpath</exclude>
- <exclude>.cvsignore</exclude>
+ <exclude>src/test/it2/src.txt</exclude>
</excludes>
</configuration>
</plugin>
- -->
- <!--
- <plugin>
- <artifactId>maven-docck-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- -->
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.4</version>
- <executions>
- <execution>
- <id>create-javadocs</id>
- <phase>package</phase>
- <goals>
- <goal>javadoc</goal>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <version>2.0.4</version>
- <executions>
- <execution>
- <id>attach-sources</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <version>1.0</version>
- <executions>
- <execution>
- <goals>
- <goal>process</goal>
- </goals>
- <configuration>
- <resourceBundles>
- <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
- </resourceBundles>
- <properties>
- <addLicense>true</addLicense>
- </properties>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
- </manifest>
- </archive>
- </configuration>
- </plugin>
</plugins>
</build>
+
<dependencies>
<dependency>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-core</artifactId>
</dependency>
<dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>1.4</version>
@@ -179,25 +100,18 @@
<version>2.0.4</version>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-plugin-testing-harness</artifactId>
<version>1.0-beta-1</version>
</dependency>
</dependencies>
+
<reporting>
<plugins>
- <!-- Need to release this first!
<plugin>
<groupId>org.apache.rat</groupId>
- <artifactId>rat-maven-plugin</artifactId>
+ <artifactId>apache-rat-plugin</artifactId>
</plugin>
- -->
<plugin>
<artifactId>maven-changes-plugin</artifactId>
<version>2.0-beta-2</version>
@@ -211,6 +125,7 @@
</plugin>
</plugins>
</reporting>
+
<developers>
<developer>
<id>jochen</id>
@@ -218,6 +133,7 @@
<email>jochen.wiedmann@gmail.com</email>
</developer>
</developers>
+
<contributors>
<contributor>
<name>Bernd Bohmann</name>
@@ -232,4 +148,42 @@
<email>jukka@apache.org</email>
</contributor>
</contributors>
+
+ <profiles>
+ <profile>
+ <id>release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-docck-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>0.6-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <phase>verify</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ <configuration>
+ <excludes>
+ <exclude>src/test/it2/src.txt</exclude>
+ </excludes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Modified: incubator/rat/main/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java?rev=751571&r1=751570&r2=751571&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java (original)
+++ incubator/rat/main/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java Mon Mar 9 02:09:17 2009
@@ -139,8 +139,8 @@
private boolean useIdeaDefaultExcludes;
/**
- * Whether to exclude subprojects. This is recommended, if you want a separate rat-maven-plugin report for each
- * subproject.
+ * Whether to exclude subprojects. This is recommended, if you want a
+ * separate apache-rat-plugin report for each subproject.
*
* @parameter expression="${rat.excludeSubprojects}" default-value="true"
*/
@@ -304,6 +304,17 @@
}
}
final List excludeList = excludeList1;
+ if ( excludes == null || excludes.length == 0 )
+ {
+ getLog().info( "No excludes" );
+ }
+ else
+ {
+ for ( int i = 0; i < excludes.length; i++ )
+ {
+ getLog().info( "Exclude: " + excludes[i] );
+ }
+ }
add( excludeList, excludes );
if ( !excludeList.isEmpty() )
{
Modified: incubator/rat/main/trunk/apache-rat-plugin/src/site/apt/examples/basic.apt
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-plugin/src/site/apt/examples/basic.apt?rev=751571&r1=751570&r2=751571&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-plugin/src/site/apt/examples/basic.apt (original)
+++ incubator/rat/main/trunk/apache-rat-plugin/src/site/apt/examples/basic.apt Mon Mar 9 02:09:17 2009
@@ -34,9 +34,9 @@
<plugins>
...
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rat-maven-plugin</artifactId>
- <version>1.0-alpha-3</version>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>0.6</version>
</plugin>
...
</plugins>
Modified: incubator/rat/main/trunk/apache-rat-plugin/src/site/apt/examples/site.apt
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-plugin/src/site/apt/examples/site.apt?rev=751571&r1=751570&r2=751571&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-plugin/src/site/apt/examples/site.apt (original)
+++ incubator/rat/main/trunk/apache-rat-plugin/src/site/apt/examples/site.apt Mon Mar 9 02:09:17 2009
@@ -34,9 +34,9 @@
<plugins>
...
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rat-maven-plugin</artifactId>
- <version>1.0-alpha-3</version>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>0.6</version>
</plugin>
...
</plugins>
Modified: incubator/rat/main/trunk/apache-rat-plugin/src/site/apt/examples/verify.apt
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-plugin/src/site/apt/examples/verify.apt?rev=751571&r1=751570&r2=751571&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-plugin/src/site/apt/examples/verify.apt (original)
+++ incubator/rat/main/trunk/apache-rat-plugin/src/site/apt/examples/verify.apt Mon Mar 9 02:09:17 2009
@@ -27,9 +27,9 @@
<plugins>
...
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rat-maven-plugin</artifactId>
- <version>1.0-alpha-3</version>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>0.6</version>
<executions>
<execution>
<phase>verify</phase>
@@ -56,9 +56,9 @@
<plugins>
...
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rat-maven-plugin</artifactId>
- <version>1.0-alpha-3</version>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>0.6</version>
<executions>
<execution>
<phase>verify</phase>
Modified: incubator/rat/main/trunk/apache-rat-plugin/src/site/apt/usage.apt
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-plugin/src/site/apt/usage.apt?rev=751571&r1=751570&r2=751571&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-plugin/src/site/apt/usage.apt (original)
+++ incubator/rat/main/trunk/apache-rat-plugin/src/site/apt/usage.apt Mon Mar 9 02:09:17 2009
@@ -36,8 +36,8 @@
<plugins>
...
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rat-maven-plugin</artifactId>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
</plugin>
...
</plugins>
@@ -63,8 +63,8 @@
<plugins>
...
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rat-maven-plugin</artifactId>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
</plugin>
...
</plugins>
Modified: incubator/rat/main/trunk/apache-rat-plugin/src/site/fml/faq.fml
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-plugin/src/site/fml/faq.fml?rev=751571&r1=751570&r2=751571&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-plugin/src/site/fml/faq.fml (original)
+++ incubator/rat/main/trunk/apache-rat-plugin/src/site/fml/faq.fml Mon Mar 9 02:09:17 2009
@@ -58,7 +58,7 @@
<part id="Configuration">
<faq id="includeSubprojects">
<question>
- The rat-maven-plugin creates a report for every subproject.
+ The apache-rat-plugin creates a report for every subproject.
I want a single report for the whole project, which includes
the subprojects.
</question>
Modified: incubator/rat/main/trunk/apache-rat-tasks/pom.xml
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-tasks/pom.xml?rev=751571&r1=751570&r2=751571&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-tasks/pom.xml (original)
+++ incubator/rat/main/trunk/apache-rat-tasks/pom.xml Mon Mar 9 02:09:17 2009
@@ -87,63 +87,6 @@
</executions>
</plugin>
<plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.4</version>
- <executions>
- <execution>
- <id>create-javadocs</id>
- <phase>package</phase>
- <goals>
- <goal>javadoc</goal>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <version>2.0.4</version>
- <executions>
- <execution>
- <id>attach-sources</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <version>1.0</version>
- <executions>
- <execution>
- <goals>
- <goal>process</goal>
- </goals>
- <configuration>
- <resourceBundles>
- <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
- </resourceBundles>
- <properties>
- <addLicense>true</addLicense>
- </properties>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
@@ -174,4 +117,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: incubator/rat/main/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/pom.xml?rev=751571&r1=751570&r2=751571&view=diff
==============================================================================
--- incubator/rat/main/trunk/pom.xml (original)
+++ incubator/rat/main/trunk/pom.xml Mon Mar 9 02:09:17 2009
@@ -40,6 +40,10 @@
</description>
<inceptionYear>2006</inceptionYear>
+ <prerequisites>
+ <maven>2.0.4</maven>
+ </prerequisites>
+
<properties>
<!--
Website properties allow local staging of the website
@@ -154,7 +158,7 @@
<!--
<plugin>
<groupId>org.apache.rat</groupId>
- <artifactId>rat-maven-plugin</artifactId>
+ <artifactId>apache-rat-plugin</artifactId>
</plugin>
-->
</plugins>
@@ -181,34 +185,6 @@
</testResource>
</testResources>
- <plugins>
-<!--
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>rat-maven-plugin</artifactId>
- <version>0.6-SNAPSHOT</version>
- <executions>
- <execution>
- <phase>verify</phase>
- <goals>
- <goal>check</goal>
- </goals>
- <configuration>
- <excludes>
- <exclude>BUILD.txt</exclude>
- <exclude>RELEASE_NOTES.txt</exclude>
- <exclude>LICENSE.txt</exclude>
- <exclude>NOTICE.txt</exclude>
- <exclude>DISCLAIMER.txt</exclude>
- <exclude>target/**/*</exclude>
- </excludes>
- </configuration>
- </execution>
- </executions>
- </plugin>
--->
- </plugins>
-
<pluginManagement>
<plugins>
<plugin>
@@ -234,6 +210,18 @@
</dependency>
</dependencies>
</plugin>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.2</version>
+ <configuration>
+ <archive>
+ <manifest>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
</build>
@@ -332,6 +320,25 @@
<build>
<plugins>
<plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <version>1.0</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <configuration>
+ <resourceBundles>
+ <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
+ </resourceBundles>
+ <properties>
+ <addLicense>true</addLicense>
+ </properties>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.4</version>
<executions>
@@ -362,4 +369,4 @@
</build>
</profile>
</profiles>
-</project>
\ No newline at end of file
+</project>
Modified: incubator/rat/main/trunk/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/src/site/apt/index.apt?rev=751571&r1=751570&r2=751571&view=diff
==============================================================================
--- incubator/rat/main/trunk/src/site/apt/index.apt (original)
+++ incubator/rat/main/trunk/src/site/apt/index.apt Mon Mar 9 02:09:17 2009
@@ -90,5 +90,6 @@
* Running with Apache Maven
- Projects using Maven are directed to the
- {{{http://mojo.codehaus.org/rat-maven-plugin} RAT plugin}}.
+ RAT includes a plugin for Maven 2. This allows RAT reports to be run against
+ a wide variety of resources. Details can be found in the
+ {{{http://incubator.apache.org/rat/apache-rat-plugin} plugin documentation}}.