Skip to content

Commit 2f8e0f5

Browse files
committed
Add merge for rat excludes
Add license to WorkspaceDependencyResolveMojo git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk@1705325 13f79535-47bb-0310-9956-ffa450edef68
1 parent 7e5bc59 commit 2f8e0f5

2 files changed

Lines changed: 21 additions & 1 deletion

File tree

pom.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,8 +290,9 @@ under the License.
290290
<groupId>org.apache.rat</groupId>
291291
<artifactId>apache-rat-plugin</artifactId>
292292
<configuration>
293-
<excludes>
293+
<excludes combine.children="append">
294294
<exclude>README-testing.txt</exclude>
295+
295296
<!--
296297
These files contain several files for eclipse
297298
which will let fail the tests if a license header

src/main/java/org/apache/maven/plugin/eclipse/WorkspaceDependencyResolveMojo.java

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,24 @@
11
package org.apache.maven.plugin.eclipse;
22

3+
/*
4+
* Licensed to the Apache Software Foundation (ASF) under one
5+
* or more contributor license agreements. See the NOTICE file
6+
* distributed with this work for additional information
7+
* regarding copyright ownership. The ASF licenses this file
8+
* to you under the Apache License, Version 2.0 (the
9+
* "License"); you may not use this file except in compliance
10+
* with the License. You may obtain a copy of the License at
11+
*
12+
* http://www.apache.org/licenses/LICENSE-2.0
13+
*
14+
* Unless required by applicable law or agreed to in writing,
15+
* software distributed under the License is distributed on an
16+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
17+
* KIND, either express or implied. See the License for the
18+
* specific language governing permissions and limitations
19+
* under the License.
20+
*/
21+
322
import java.io.File;
423
import java.io.FileReader;
524
import java.util.ArrayList;

0 commit comments

Comments
 (0)