You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by ma...@apache.org on 2017/10/20 18:18:15 UTC
[incubator-netbeans] branch master updated: [NETBEANS-54] Module
review o.apache.tools.ant.module
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new b1bd0cc [NETBEANS-54] Module review o.apache.tools.ant.module
new 783d6d8 Merge branch 'pr/124'
b1bd0cc is described below
commit b1bd0cc04efd18cc0ad76a9b1f94ab5705f051d0
Author: John McDonnell <jo...@bearingpoint.com>
AuthorDate: Wed Oct 11 15:09:01 2017 +0100
[NETBEANS-54] Module review o.apache.tools.ant.module
- Added 5 patterns to the exclusion list for the Rat Report
- Removed one wrong license header
---
nbbuild/build.xml | 5 +++
.../tools/ant/module/resources/CustomTask_java | 39 ----------------------
2 files changed, 5 insertions(+), 39 deletions(-)
diff --git a/nbbuild/build.xml b/nbbuild/build.xml
index 0e4bc6d..a4b1d82 100644
--- a/nbbuild/build.xml
+++ b/nbbuild/build.xml
@@ -2050,6 +2050,11 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d
<exclude name="javafx2.editor/test/unit/data/goldenfiles/org/netbeans/modules/javafx2/editor/completion/impl/**/*.out*" />
<exclude name="javawebstart/AntTasks/build/**" /> <!-- generated build files -->
<exclude name="projectimport.eclipse.core/test/unit/data/**" /> <!--test data-->
+ <exclude name="o.apache.tools.ant.module/release/VERSION.txt" /> <!--generated file-->
+ <exclude name="o.apache.tools.ant.module/test/unit/data/**/*.xml" /> <!--test data-->
+ <exclude name="o.apache.tools.ant.module/test/unit/data/**/*.properties" /> <!--test data-->
+ <exclude name="o.apache.tools.ant.module/src/org/apache/tools/ant/module/resources/CustomTask_java" /> <!-- user visible file template -->
+ <exclude name="o.apache.tools.ant.module/src/org/apache/tools/ant/module/resources/Project.xml_" /> <!-- user visible file template -->
</patternset>
<rat:report xmlns:rat="antlib:org.apache.rat.anttasks" reportfile="build/rat-report.txt">
<rat:substringMatcher licenseFamilyCategory="w3c2" licenseFamilyName="W3C Software and Document Notice and License">
diff --git a/o.apache.tools.ant.module/src/org/apache/tools/ant/module/resources/CustomTask_java b/o.apache.tools.ant.module/src/org/apache/tools/ant/module/resources/CustomTask_java
index 5143960..be23fee 100644
--- a/o.apache.tools.ant.module/src/org/apache/tools/ant/module/resources/CustomTask_java
+++ b/o.apache.tools.ant.module/src/org/apache/tools/ant/module/resources/CustomTask_java
@@ -1,42 +1,3 @@
-<#--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<#assign licenseFirst = "/*">
<#assign licensePrefix = " * ">
<#assign licenseLast = " */">
--
To stop receiving notification emails like this one, please contact
['"commits@netbeans.apache.org" <co...@netbeans.apache.org>'].