This is an automated email from the ASF dual-hosted git repository.
emi 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 073b5ee [NETBEANS-54] Module Review projectimport.eclipse.core
073b5ee is described below
commit 073b5ee6ed0423b60fcb7fe3e431d402ff206930
Author: Mark Hobson <[email protected]>
AuthorDate: Tue Oct 17 19:25:58 2017 +0100
[NETBEANS-54] Module Review projectimport.eclipse.core
* Update licence in script
* Ignore test data files from RAT
---
nbbuild/build.xml | 1 +
projectimport.eclipse.core/test/createWorkspace.sh | 53 ++++++----------------
2 files changed, 16 insertions(+), 38 deletions(-)
diff --git a/nbbuild/build.xml b/nbbuild/build.xml
index 620a8cf..5a5e61c 100644
--- a/nbbuild/build.xml
+++ b/nbbuild/build.xml
@@ -2047,6 +2047,7 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y
to start the system in d
<exclude
name="java.api.common/src/org/netbeans/modules/java/api/common/project/ui/customizer/vmo/gen/CommandLine.tokens"
/> <!--generated by ANTLR-->
<exclude
name="javafx2.editor/test/unit/data/org/netbeans/modules/javafx2/editor/**/*.fxml"
/>
<exclude
name="javafx2.editor/test/unit/data/goldenfiles/org/netbeans/modules/javafx2/editor/completion/impl/**/*.out*"
/>
+ <exclude name="projectimport.eclipse.core/test/unit/data/**" />
<!--test data-->
</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/projectimport.eclipse.core/test/createWorkspace.sh
b/projectimport.eclipse.core/test/createWorkspace.sh
index 3589dab..e697cc9 100644
--- a/projectimport.eclipse.core/test/createWorkspace.sh
+++ b/projectimport.eclipse.core/test/createWorkspace.sh
@@ -1,45 +1,22 @@
#!/bin/bash
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# 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
#
-# Copyright 2013 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):
-#
-# Portions Copyrighted 2012 Sun Microsystems, Inc.
+# 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.
+
# Script: createWorkspace.sh
#
# Convenient script for generating workspace with metadata we needs for tests.
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].
