You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by em...@apache.org on 2017/10/10 08:03:20 UTC
incubator-netbeans git commit: [NETBEANS-54] Module Review
spring.beans
Repository: incubator-netbeans
Updated Branches:
refs/heads/master d1c79aa66 -> 9f18e646b
[NETBEANS-54] Module Review spring.beans
Replaced the old license with the Apache license for spring.beans
module.
Excluded the template file from Rat
Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/9f18e646
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/9f18e646
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/9f18e646
Branch: refs/heads/master
Commit: 9f18e646b178e232660587ad90634aa3bb80897b
Parents: d1c79aa
Author: Diego Cortes <df...@gmail.com>
Authored: Tue Oct 10 03:02:52 2017 -0500
Committer: Emilian Bold <em...@gmail.com>
Committed: Tue Oct 10 11:02:52 2017 +0300
----------------------------------------------------------------------
nbbuild/build.xml | 1 +
.../beans/ui/customizer/Bundle.properties | 56 ++++++--------------
2 files changed, 16 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/9f18e646/nbbuild/build.xml
----------------------------------------------------------------------
diff --git a/nbbuild/build.xml b/nbbuild/build.xml
index 1979d63..b8a9526 100644
--- a/nbbuild/build.xml
+++ b/nbbuild/build.xml
@@ -1975,6 +1975,7 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d
<exclude name="api.search/test/unit/data/textFiles/utf8file.txt" /> <!--test data-->
<exclude name="api.search/test/unit/src/org/netbeans/modules/search/data/**" /> <!--test data-->
<exclude name="beans/src/org/netbeans/modules/beans/resources/templates/*.template" /> <!--license would be visible when users edit the templates inside their IDE-->
+ <exclude name="spring.beans/src/org/netbeans/modules/spring/beans/resources/templates/*.template" /> <!--license would be visible when users edit the templates inside their IDE-->
<exclude name="editor.settings.storage/test/unit/src/org/netbeans/modules/editor/settings/storage/compatibility/p1/**" /> <!--test data-->
<exclude name="editor.plain/src/org/netbeans/modules/editor/plain/resources/PlainTextExample" /> <!--license would be visible to users in the Fonts/Colors settings-->
<exclude name="editor.fold/test/unit/data/goldenfiles/hierarchy/update-hierarchy.folds" /> <!--test data-->
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/9f18e646/spring.beans/src/org/netbeans/modules/spring/beans/ui/customizer/Bundle.properties
----------------------------------------------------------------------
diff --git a/spring.beans/src/org/netbeans/modules/spring/beans/ui/customizer/Bundle.properties b/spring.beans/src/org/netbeans/modules/spring/beans/ui/customizer/Bundle.properties
index 7f97781..7e3feae 100644
--- a/spring.beans/src/org/netbeans/modules/spring/beans/ui/customizer/Bundle.properties
+++ b/spring.beans/src/org/netbeans/modules/spring/beans/ui/customizer/Bundle.properties
@@ -1,45 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+# 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
#
-# 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]"
-
-# Contributor(s):
-
-# The Original Software is NetBeans. The Initial Developer of the Original
-# Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 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.
-
+# 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.
LBL_SpringFramework=Spring Framework
LBL_ConfigFilesTitle=Configuration Files
LBL_ConfigFileGroupsTitle=Configuration File Groups