[incubator-netbeans] branch master updated: [NETBEANS-54] Module Review junit

[em...@apache.org]

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 ccc3d27  [NETBEANS-54] Module Review junit
ccc3d27 is described below

commit ccc3d2797cbeb423a44cf9217d1f99979d9ff67e
Author: Tuyen Tran <ng...@gmail.com>
AuthorDate: Mon Oct 23 01:34:30 2017 +0700

    [NETBEANS-54] Module Review junit
---
 .../junit/resources/templates/junit-custom.xml     | 49 +++++++---------------
 1 file changed, 14 insertions(+), 35 deletions(-)

diff --git a/junit/src/org/netbeans/modules/junit/resources/templates/junit-custom.xml b/junit/src/org/netbeans/modules/junit/resources/templates/junit-custom.xml
index dd0606f..48b785f 100644
--- a/junit/src/org/netbeans/modules/junit/resources/templates/junit-custom.xml
+++ b/junit/src/org/netbeans/modules/junit/resources/templates/junit-custom.xml
@@ -1,42 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <#--
-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 (c) 2016 Oracle and/or its affiliates. All rights reserved.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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):
+    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.
 -->
 
 <project name="Custom junit test" default="test-custom" basedir=".">

-- 
To stop receiving notification emails like this one, please contact
['"commits@netbeans.apache.org" <co...@netbeans.apache.org>'].