Author: dennisl Date: Sat Sep 6 19:02:43 2014 New Revision: 1622908 URL: http://svn.apache.org/r1622908 Log: [RAT-170] RAT should use itself during build and site generation - Move the Rat execution from a profile and into the normal build. This way Rat is always run when we build Rat, so that we can detect problems early.
Modified: creadur/rat/trunk/apache-rat-core/pom.xml creadur/rat/trunk/apache-rat-plugin/pom.xml creadur/rat/trunk/apache-rat-tasks/pom.xml creadur/rat/trunk/apache-rat/pom.xml creadur/rat/trunk/pom.xml Modified: creadur/rat/trunk/apache-rat-core/pom.xml URL: http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/pom.xml?rev=1622908&r1=1622907&r2=1622908&view=diff ============================================================================== --- creadur/rat/trunk/apache-rat-core/pom.xml (original) +++ creadur/rat/trunk/apache-rat-core/pom.xml Sat Sep 6 19:02:43 2014 @@ -46,42 +46,35 @@ </includes> </resource> </resources> - </build> + <plugins> + <plugin> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> + <configuration> + <excludes> + <!-- These files have bad license headers because they are used to test bad license headers --> + <exclude>src/test/resources/appliedAL20/bad/*.*</exclude> + <exclude>src/test/resources/oasis/bad/*.*</exclude> + <!-- These files does not have license headers because they are used to test license headers --> + <exclude>src/test/resources/elements/Source.java</exclude> + <exclude>src/test/resources/elements/ILoggerFactory.java</exclude> + <exclude>src/test/resources/elements/sub/Empty.txt</exclude> + <exclude>src/test/resources/violations/bad.txt</exclude> + <exclude>src/test/resources/violations/FilterTest.cs</exclude> + </excludes> + </configuration> + <executions> + <execution> + <goals> + <goal>check</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> - <profiles> - <profile> - <id>rat</id> - <build> - <plugins> - <plugin> - <groupId>org.apache.rat</groupId> - <artifactId>apache-rat-plugin</artifactId> - <configuration> - <excludes> - <!-- These files have bad license headers because they are used to test bad license headers --> - <exclude>src/test/resources/appliedAL20/bad/*.*</exclude> - <exclude>src/test/resources/oasis/bad/*.*</exclude> - <!-- These files does not have license headers because they are used to test license headers --> - <exclude>src/test/resources/elements/Source.java</exclude> - <exclude>src/test/resources/elements/ILoggerFactory.java</exclude> - <exclude>src/test/resources/elements/sub/Empty.txt</exclude> - <exclude>src/test/resources/violations/bad.txt</exclude> - <exclude>src/test/resources/violations/FilterTest.cs</exclude> - </excludes> - </configuration> - <executions> - <execution> - <goals> - <goal>check</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> <dependencies> <dependency> Modified: creadur/rat/trunk/apache-rat-plugin/pom.xml URL: http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-plugin/pom.xml?rev=1622908&r1=1622907&r2=1622908&view=diff ============================================================================== --- creadur/rat/trunk/apache-rat-plugin/pom.xml (original) +++ creadur/rat/trunk/apache-rat-plugin/pom.xml Sat Sep 6 19:02:43 2014 @@ -110,36 +110,28 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> + <configuration> + <excludes> + <!-- These files does not have license headers because they are used to test license headers --> + <exclude>src/it/it1/src.apt</exclude> + <exclude>src/test/resources/unit/it2/src.txt</exclude> + <exclude>src/test/resources/unit/it3/src.apt</exclude> + </excludes> + </configuration> + <executions> + <execution> + <goals> + <goal>check</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> - <profiles> - <profile> - <id>rat</id> - <build> - <plugins> - <plugin> - <groupId>org.apache.rat</groupId> - <artifactId>apache-rat-plugin</artifactId> - <configuration> - <excludes> - <!-- These files does not have license headers because they are used to test license headers --> - <exclude>src/it/it1/src.apt</exclude> - <exclude>src/test/resources/unit/it2/src.txt</exclude> - <exclude>src/test/resources/unit/it3/src.apt</exclude> - </excludes> - </configuration> - <executions> - <execution> - <goals> - <goal>check</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> + <dependencies> <dependency> <groupId>org.apache.rat</groupId> Modified: creadur/rat/trunk/apache-rat-tasks/pom.xml URL: http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-tasks/pom.xml?rev=1622908&r1=1622907&r2=1622908&view=diff ============================================================================== --- creadur/rat/trunk/apache-rat-tasks/pom.xml (original) +++ creadur/rat/trunk/apache-rat-tasks/pom.xml Sat Sep 6 19:02:43 2014 @@ -119,6 +119,23 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> + <configuration> + <excludes> + <!-- This file does not have license header because it is used to test license headers --> + <exclude>src/test/resources/antunit/index.apt</exclude> + </excludes> + </configuration> + <executions> + <execution> + <goals> + <goal>check</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> <pluginManagement> @@ -150,31 +167,4 @@ </plugins> </pluginManagement> </build> - - <profiles> - <profile> - <id>rat</id> - <build> - <plugins> - <plugin> - <groupId>org.apache.rat</groupId> - <artifactId>apache-rat-plugin</artifactId> - <configuration> - <excludes> - <!-- This file does not have license header because it is used to test license headers --> - <exclude>src/test/resources/antunit/index.apt</exclude> - </excludes> - </configuration> - <executions> - <execution> - <goals> - <goal>check</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> </project> Modified: creadur/rat/trunk/apache-rat/pom.xml URL: http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat/pom.xml?rev=1622908&r1=1622907&r2=1622908&view=diff ============================================================================== --- creadur/rat/trunk/apache-rat/pom.xml (original) +++ creadur/rat/trunk/apache-rat/pom.xml Sat Sep 6 19:02:43 2014 @@ -106,6 +106,25 @@ </configuration> </plugin> <plugin> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> + <configuration> + <excludes> + <!-- These files only describe how to use the project and they + have no license headers --> + <exclude>README-ANT.txt</exclude> + <exclude>README-CLI.txt</exclude> + </excludes> + </configuration> + <executions> + <execution> + <goals> + <goal>check</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>animal-sniffer-maven-plugin</artifactId> <executions> @@ -120,7 +139,6 @@ </plugin> </plugins> - <pluginManagement> <plugins> <plugin> @@ -149,7 +167,6 @@ </plugin> </plugins> </pluginManagement> - </build> <profiles> @@ -178,32 +195,5 @@ </plugins> </build> </profile> - - <profile> - <id>rat</id> - <build> - <plugins> - <plugin> - <groupId>org.apache.rat</groupId> - <artifactId>apache-rat-plugin</artifactId> - <configuration> - <excludes> - <!-- These files only describe how to use the project and they - have no license headers --> - <exclude>README-ANT.txt</exclude> - <exclude>README-CLI.txt</exclude> - </excludes> - </configuration> - <executions> - <execution> - <goals> - <goal>check</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> </profiles> </project> \ No newline at end of file Modified: creadur/rat/trunk/pom.xml URL: http://svn.apache.org/viewvc/creadur/rat/trunk/pom.xml?rev=1622908&r1=1622907&r2=1622908&view=diff ============================================================================== --- creadur/rat/trunk/pom.xml (original) +++ creadur/rat/trunk/pom.xml Sat Sep 6 19:02:43 2014 @@ -368,6 +368,25 @@ agnostic home for software distribution </dependencies> </plugin> <plugin> + <!-- We don't want this to propagate to the modules, because they all have their own excludes --> + <inherited>false</inherited> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> + <configuration> + <excludes> + <!-- This file only describes how to build the project and it has no license header --> + <exclude>BUILD.txt</exclude> + </excludes> + </configuration> + <executions> + <execution> + <goals> + <goal>check</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>animal-sniffer-maven-plugin</artifactId> <version>1.11</version> @@ -567,31 +586,5 @@ agnostic home for software distribution </plugins> </build> </profile> - <profile> - <id>rat</id> - <build> - <plugins> - <plugin> - <!-- We don't want this to propagate to the modules, because they all have their own excludes --> - <inherited>false</inherited> - <groupId>org.apache.rat</groupId> - <artifactId>apache-rat-plugin</artifactId> - <configuration> - <excludes> - <!-- This file only describes how to build the project and it has no license header --> - <exclude>BUILD.txt</exclude> - </excludes> - </configuration> - <executions> - <execution> - <goals> - <goal>check</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> </profiles> </project>