Repository: incubator-netbeans
Updated Branches:
  refs/heads/master 8ebf08bc5 -> a303ed395


[NETBEANS-54] Module Review testng.ui

* Updated license in Bundle.properties
* Add exclude for testng.ui template files


Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/a303ed39
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/a303ed39
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/a303ed39

Branch: refs/heads/master
Commit: a303ed39589f522dd47d6d94252ba246134b04b5
Parents: 8ebf08b
Author: Trevor Lewis <[email protected]>
Authored: Mon Oct 9 11:26:05 2017 -0600
Committer: Emilian Bold <[email protected]>
Committed: Mon Oct 9 20:26:05 2017 +0300

----------------------------------------------------------------------
 nbbuild/build.xml                               |  1 +
 .../modules/testng/ui/wizards/Bundle.properties | 51 ++++++--------------
 2 files changed, 15 insertions(+), 37 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/a303ed39/nbbuild/build.xml
----------------------------------------------------------------------
diff --git a/nbbuild/build.xml b/nbbuild/build.xml
index 6753dba..1f32b7a 100644
--- a/nbbuild/build.xml
+++ b/nbbuild/build.xml
@@ -1987,6 +1987,7 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y 
to start the system in d
                 <exclude 
name="versioning.core/test/unit/data/workdir/root/a.txt" /> <!--test data-->
                 <exclude 
name="versioning.core/test/unit/data/workdir/root-test-versioned/**" /> 
<!--test data-->
                 <exclude 
name="versioning.core/test/unit/data/workdir/root-with-exclusions/**" /> 
<!--test data-->
+                <exclude 
name="testng.ui/src/org/netbeans/modules/testng/ui/resources/*.template" /> 
<!--template files-->
             </fileset>
         </rat:report>
     </target>

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/a303ed39/testng.ui/src/org/netbeans/modules/testng/ui/wizards/Bundle.properties
----------------------------------------------------------------------
diff --git 
a/testng.ui/src/org/netbeans/modules/testng/ui/wizards/Bundle.properties 
b/testng.ui/src/org/netbeans/modules/testng/ui/wizards/Bundle.properties
index 5f82c3a..ee21b2f 100644
--- a/testng.ui/src/org/netbeans/modules/testng/ui/wizards/Bundle.properties
+++ b/testng.ui/src/org/netbeans/modules/testng/ui/wizards/Bundle.properties
@@ -1,41 +1,19 @@
-# 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 \u00a9 1997-2012 Oracle and/or its affiliates. All rights reserved.
+#  http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# Contributor(s):
-#
-# The Original Software is NetBeans. The Initial Developer of the Original
-# Software is Sun Microsystems, Inc. Portions Copyright 2006-2008 Sun
-# Microsystems, Inc. All Rights Reserved.
-#
-# 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.
+# 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.
 
 OpenIDE-Module-Display-Category=Testing Tools
 OpenIDE-Module-Long-Description=The TestNG Support module allows you to create 
test classes suitable for the TestNG framework.
@@ -51,4 +29,3 @@ goto_source_source_not_found=Source file for {0} not found.
 
 # library name
 testng=TestNG 6.8.1
-

Reply via email to