svn commit: r1705325 - in /maven/plugins/trunk/maven-eclipse-plugin: pom.xml src/main/java/org/apache/maven/plugin/eclipse/WorkspaceDependencyResolveMojo.java

[rf...@apache.org]

Author: rfscholte
Date: Fri Sep 25 15:46:38 2015
New Revision: 1705325

URL: http://svn.apache.org/viewvc?rev=1705325&view=rev
Log:
Add merge for rat excludes
Add license to WorkspaceDependencyResolveMojo

Modified:
    maven/plugins/trunk/maven-eclipse-plugin/pom.xml
    maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/WorkspaceDependencyResolveMojo.java

Modified: maven/plugins/trunk/maven-eclipse-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/pom.xml?rev=1705325&r1=1705324&r2=1705325&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/pom.xml Fri Sep 25 15:46:38 2015
@@ -290,8 +290,9 @@ under the License.
           <groupId>org.apache.rat</groupId>
           <artifactId>apache-rat-plugin</artifactId>
           <configuration>
-            <excludes>
+            <excludes combine.children="append">
               <exclude>README-testing.txt</exclude>
+              
               <!--
                 These files contain several files for eclipse
                 which will let fail the tests if a license header

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/WorkspaceDependencyResolveMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/WorkspaceDependencyResolveMojo.java?rev=1705325&r1=1705324&r2=1705325&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/WorkspaceDependencyResolveMojo.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/WorkspaceDependencyResolveMojo.java Fri Sep 25 15:46:38 2015
@@ -1,5 +1,24 @@
 package org.apache.maven.plugin.eclipse;
 
+/*
+ * 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.File;
 import java.io.FileReader;
 import java.util.ArrayList;