Merge branch 'master' into create_archive_processor
diff --git a/apache-rat-plugin/pom.xml b/apache-rat-plugin/pom.xml
index 26b1ad3..41ab7aa 100644
--- a/apache-rat-plugin/pom.xml
+++ b/apache-rat-plugin/pom.xml
@@ -86,6 +86,7 @@
<configuration>
<excludes>
<!-- These files do not have license headers because they are used to test license headers -->
+ <exclude>src/it/**</exclude>
<exclude>src/it/**/src.apt</exclude>
<exclude>src/test/resources/unit/**</exclude>
<exclude>**/*.iml</exclude>
diff --git a/apache-rat-plugin/src/it/RAT-314/.mvn/maven.config b/apache-rat-plugin/src/it/RAT-314/.mvn/maven.config
new file mode 100644
index 0000000..df145f3
--- /dev/null
+++ b/apache-rat-plugin/src/it/RAT-314/.mvn/maven.config
@@ -0,0 +1 @@
+-V
diff --git a/apache-rat-plugin/src/it/RAT-314/.mvn/recursive/foo.xml b/apache-rat-plugin/src/it/RAT-314/.mvn/recursive/foo.xml
new file mode 100644
index 0000000..74d9a6d
--- /dev/null
+++ b/apache-rat-plugin/src/it/RAT-314/.mvn/recursive/foo.xml
@@ -0,0 +1 @@
+<foo></foo>
diff --git a/apache-rat-plugin/src/it/RAT-314/invoker.properties b/apache-rat-plugin/src/it/RAT-314/invoker.properties
new file mode 100644
index 0000000..6486eb1
--- /dev/null
+++ b/apache-rat-plugin/src/it/RAT-314/invoker.properties
@@ -0,0 +1,16 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+invoker.goals = clean apache-rat:rat
diff --git a/apache-rat-plugin/src/it/RAT-314/pom.xml b/apache-rat-plugin/src/it/RAT-314/pom.xml
new file mode 100644
index 0000000..c007d89
--- /dev/null
+++ b/apache-rat-plugin/src/it/RAT-314/pom.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.rat.test</groupId>
+ <artifactId>it-rat314</artifactId>
+ <version>1.0</version>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>@pom.version@</version>
+ <configuration>
+ <includes>
+ <include>pom.xml</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/apache-rat-plugin/src/it/RAT-314/verify.groovy b/apache-rat-plugin/src/it/RAT-314/verify.groovy
new file mode 100644
index 0000000..0bc8db0
--- /dev/null
+++ b/apache-rat-plugin/src/it/RAT-314/verify.groovy
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+content = new File( basedir, 'build.log' ).text
+
+assert content.contains( 'BUILD SUCCESS' )
+
+/*
+ * [WARNING] No resources included
+ */
+assert ! content.contains( '[WARNING]' )
+
+report = new File( basedir, 'target/site/rat-report.html' ).text
+
+assert report.contains( '0 Unknown Licenses' )
+assert report.contains( 'S pom.xml' )
+assert report.contains( 'AL AL Apache License Version 2.0' )
diff --git a/pom.xml b/pom.xml
index c15b7e4..f96930b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,10 +61,10 @@
<mavenJavadocPluginVersion>3.6.3</mavenJavadocPluginVersion>
<mavenPmdPluginVersion>3.22.0</mavenPmdPluginVersion>
<!-- Used to generate download page for RAT during site builds, please adapt versions manually BEFORE doing a release -->
- <!-- START - adapat manually before doing a release -->
+ <!-- START - adapt manually before doing a release -->
<previousRatVersion>0.17</previousRatVersion>
<currentSnapshotRatVersion>0.18-SNAPSHOT</currentSnapshotRatVersion>
- <!-- END - adapat manually before doing a release -->
+ <!-- END - adapt manually before doing a release -->
</properties>
<distributionManagement>
<site>
@@ -448,6 +448,11 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <version>3.2.5</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.2.5</version>
<configuration>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 112ca90..6e7d9d2 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -81,6 +81,9 @@
This change also marks an architecture change from processing Files to processing Documents in order to facilitate
processing nested files in archives.
+
+ <action issue="RAT-314" type="add" dev="pottlinger">
+ Add integration test for new default exclude .mvn, that was introduced with v0.16.
</action>
<action issue="RAT-366" type="add" dev="pottlinger">
Integrate checkstyle and spotbugs into the build and webpage generation. Most charset-related errors cannot be fixed until we break JDK8-compliance and move to newer versions.
