Author: khmarbaise
Date: Sat Sep 6 20:51:24 2014
New Revision: 1622929
URL: http://svn.apache.org/r1622929
Log:
[MASSEMBLY-710]
- Fixed RAT Report with some exclude rules.
Modified:
maven/plugins/trunk/maven-assembly-plugin/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/this &
that/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/this &
that/src/main/assembly/src.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/this &
that/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/src/main/assembly/descriptor.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/src/main/config/file-1.properties
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/src/main/config/file-2.properties
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/src/main/filters/filter-assembly.properties
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/src/main/filters/filter-build.properties
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/verify.bsh
Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/pom.xml?rev=1622929&r1=1622928&r2=1622929&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Sat Sep 6 20:51:24 2014
@@ -327,6 +327,29 @@ under the License.
</systemPropertyVariables>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <!--
+ These files contain real repository artifacts.
+ -->
+
<exclude>src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/**</exclude>
+
<exclude>src/functional-tests/remote-repo/assembly/dependency-artifact/**</exclude>
+ <!-- These files are only resources for integration tests. -->
+
<exclude>src/it/projects/repositories/repo-with-snapshot-parents/child/remote-repository/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-SNAPSHOT.pom</exclude>
+
<exclude>src/it/projects/container-descriptors/metaInf-services-aggregation/child1/src/main/resources/META-INF/**/*</exclude>
+
<exclude>src/it/projects/container-descriptors/metaInf-services-aggregation/child2/src/main/resources/META-INF/**/*</exclude>
+
<exclude>src/it/projects/container-descriptors/metaInf-spring-aggregation/child1/src/main/resources/META-INF/**/*</exclude>
+
<exclude>src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/src/main/resources/META-INF/**/*</exclude>
+ <!-- The following is used to exclude only txt files which don't
have a license header -->
+ <exclude>src/it/**/*.txt</exclude>
+ <!-- The following is used to exclude files with the extension
*.file -->
+ <exclude>src/it/**/*.file</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
</build>
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/this &
that/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/this%20%26%20that/pom.xml?rev=1622929&r1=1622928&r2=1622929&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/this &
that/pom.xml (original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/this &
that/pom.xml Sat Sep 6 20:51:24 2014
@@ -1,4 +1,24 @@
<?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>
<parent>
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/this &
that/src/main/assembly/src.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/this%20%26%20that/src/main/assembly/src.xml?rev=1622929&r1=1622928&r2=1622929&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/this &
that/src/main/assembly/src.xml (original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/this &
that/src/main/assembly/src.xml Sat Sep 6 20:51:24 2014
@@ -1,3 +1,23 @@
+<?xml version='1.0'?>
+<!--
+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.
+-->
+
<assembly>
<id>src</id>
<formats>
@@ -12,4 +32,4 @@
</excludes>
</fileSet>
</fileSets>
-</assembly>
\ No newline at end of file
+</assembly>
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/this &
that/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/this%20%26%20that/verify.bsh?rev=1622929&r1=1622928&r2=1622929&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/this &
that/verify.bsh (original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/this &
that/verify.bsh Sat Sep 6 20:51:24 2014
@@ -1 +1,20 @@
-return new java.io.File( basedir,
"target/parent-1-src/src/main/assembly/src.xml" ).exists();
\ No newline at end of file
+/*
+ * 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.
+ */
+
+return new java.io.File( basedir,
"target/parent-1-src/src/main/assembly/src.xml" ).exists();
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/pom.xml?rev=1622929&r1=1622928&r2=1622929&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/pom.xml
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/pom.xml
Sat Sep 6 20:51:24 2014
@@ -1,4 +1,24 @@
<?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>
<parent>
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/src/main/assembly/descriptor.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/src/main/assembly/descriptor.xml?rev=1622929&r1=1622928&r2=1622929&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/src/main/assembly/descriptor.xml
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/src/main/assembly/descriptor.xml
Sat Sep 6 20:51:24 2014
@@ -1,4 +1,24 @@
<?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.
+-->
+
<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
http://maven.apache.org/xsd/assembly-1.1.0.xsd";>
<id>assembly</id>
@@ -19,4 +39,4 @@
</fileSet>
</fileSets>
-</assembly>
\ No newline at end of file
+</assembly>
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/src/main/config/file-1.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/src/main/config/file-1.properties?rev=1622929&r1=1622928&r2=1622929&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/src/main/config/file-1.properties
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/src/main/config/file-1.properties
Sat Sep 6 20:51:24 2014
@@ -1,5 +1,22 @@
+# 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.
+
test.build.filter.props.1=${filter.build}
escapedString=\${project.artifactId}
-non.ascii.characters=some characters åäö
+non.ascii.characters=some characters ���
test.assembly.filter.props.1=${filter.assembly}
-test.pom.props.1=${project.artifactId}-${project.version}.${project.packaging}
\ No newline at end of file
+test.pom.props.1=${project.artifactId}-${project.version}.${project.packaging}
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/src/main/config/file-2.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/src/main/config/file-2.properties?rev=1622929&r1=1622928&r2=1622929&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/src/main/config/file-2.properties
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/src/main/config/file-2.properties
Sat Sep 6 20:51:24 2014
@@ -1,3 +1,20 @@
+# 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.
+
test.build.filter.props.2=${filter.build}
test.assembly.filter.props.2=${filter.assembly}
-test.pom.props.2=${project.artifactId}-${project.version}.${project.packaging}
\ No newline at end of file
+test.pom.props.2=${project.artifactId}-${project.version}.${project.packaging}
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/src/main/filters/filter-assembly.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/src/main/filters/filter-assembly.properties?rev=1622929&r1=1622928&r2=1622929&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/src/main/filters/filter-assembly.properties
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/src/main/filters/filter-assembly.properties
Sat Sep 6 20:51:24 2014
@@ -1 +1,18 @@
-filter.assembly=Filter defined in the Assembly plugin's configuration.
\ No newline at end of file
+# 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.
+
+filter.assembly=Filter defined in the Assembly plugin's configuration.
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/src/main/filters/filter-build.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/src/main/filters/filter-build.properties?rev=1622929&r1=1622928&r2=1622929&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/src/main/filters/filter-build.properties
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/src/main/filters/filter-build.properties
Sat Sep 6 20:51:24 2014
@@ -1 +1,18 @@
-filter.build=Filter defined in the projects' build section.
\ No newline at end of file
+# 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.
+
+filter.build=Filter defined in the projects' build section.
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/verify.bsh?rev=1622929&r1=1622928&r2=1622929&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/verify.bsh
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/verify.bsh
Sat Sep 6 20:51:24 2014
@@ -1,3 +1,22 @@
+/*
+ * 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.
+ */
+
import java.io.*;
import java.net.*;
import java.util.jar.*;
