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/08 18:24:52 UTC
[1/2] incubator-netbeans git commit: [NETBEANS-54] Module Review
languages.yaml
Repository: incubator-netbeans
Updated Branches:
refs/heads/master 018c18365 -> 73b9472ea
[NETBEANS-54] Module Review languages.yaml
- No external libraries.
- Added license to l10n.list
- Two user-facing small templates without a license.
- 94 unit test files without license. As this module is a parser/lexer/scanner for yaml files I think it's safer not to modify these files with license headers.
Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/a858f131
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/a858f131
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/a858f131
Branch: refs/heads/master
Commit: a858f131260db819b3c6106d7d97f28bc61fe26d
Parents: 018c183
Author: Antonio Vieiro <an...@vieiro.net>
Authored: Sun Oct 8 19:18:58 2017 +0200
Committer: Matthias Bläsing <mb...@doppel-helix.eu>
Committed: Sun Oct 8 20:15:04 2017 +0200
----------------------------------------------------------------------
languages.yaml/l10n.list | 52 ++++++++++++-------------------------------
1 file changed, 14 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/a858f131/languages.yaml/l10n.list
----------------------------------------------------------------------
diff --git a/languages.yaml/l10n.list b/languages.yaml/l10n.list
index 6b732b3..2af31fb 100644
--- a/languages.yaml/l10n.list
+++ b/languages.yaml/l10n.list
@@ -1,44 +1,20 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-# Copyright 2009-2017 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.
+# 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]"
+# 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.
#
-# Contributor(s):
-#
-# The Original Software is NetBeans. The Initial Developer of the Original
-# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 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.
# languages/yaml
read global
${l10n-module}/src/org/netbeans/modules/languages/yaml/EmptyYAMLFileDescription.html
[2/2] incubator-netbeans git commit: [NETBEANS-54] Module Review
languages.yaml
Posted by ma...@apache.org.
[NETBEANS-54] Module Review languages.yaml
- added test-data to rat exclusion list
- added GUI relevant files to exclusion list
Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/73b9472e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/73b9472e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/73b9472e
Branch: refs/heads/master
Commit: 73b9472ea4174da890b03465ed727ac876bc1686
Parents: a858f13
Author: Matthias Bläsing <mb...@doppel-helix.eu>
Authored: Sun Oct 8 20:24:26 2017 +0200
Committer: Matthias Bläsing <mb...@doppel-helix.eu>
Committed: Sun Oct 8 20:24:26 2017 +0200
----------------------------------------------------------------------
nbbuild/build.xml | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/73b9472e/nbbuild/build.xml
----------------------------------------------------------------------
diff --git a/nbbuild/build.xml b/nbbuild/build.xml
index 359e55d..145c6bc 100644
--- a/nbbuild/build.xml
+++ b/nbbuild/build.xml
@@ -1977,6 +1977,9 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d
<exclude name="editor.fold/test/unit/data/hierarchy/update-hierarchy.folds" /> <!--test data-->
<exclude name="editor.fold/test/unit/src/org/netbeans/modules/editor/fold/FoldContentReader.txt" /> <!--test data-->
<exclude name="libs.freemarker/test/unit/data/**" /> <!--test data-->
+ <exclude name="languages.yaml/src/org/netbeans/modules/languages/yaml/*.yml" /> <!--Files used in GUI as sample/starting point-->
+ <exclude name="languages.yaml/src/org/netbeans/modules/languages/yaml/*.yaml" /> <!--Files used in GUI as sample/starting point-->
+ <exclude name="languages.yaml/test/unit/data/testfiles/*" /> <!--test data-->
</fileset>
</rat:report>
</target>