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/07 19:09:49 UTC
[1/2] incubator-netbeans git commit: [NETBEANS-54] Module Review
editor.completion
Repository: incubator-netbeans
Updated Branches:
refs/heads/master 1fbc20b69 -> 4ee38a5a6
[NETBEANS-54] Module Review editor.completion
- No external libraries.
- Updated licenses in apichanges.xml and a Bundle.properties file as per rat report.
- Tests passing. No additional problems found.
Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/f300576e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/f300576e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/f300576e
Branch: refs/heads/master
Commit: f300576ecf8f5f2ab99b44c56ca3f088bab8dee1
Parents: 3880c51
Author: Antonio Vieiro <an...@vieiro.net>
Authored: Wed Oct 4 09:52:49 2017 +0200
Committer: Antonio Vieiro <an...@vieiro.net>
Committed: Wed Oct 4 09:52:49 2017 +0200
----------------------------------------------------------------------
editor.completion/apichanges.xml | 60 ++++++--------------
.../modules/editor/completion/Bundle.properties | 53 +++++------------
2 files changed, 32 insertions(+), 81 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/f300576e/editor.completion/apichanges.xml
----------------------------------------------------------------------
diff --git a/editor.completion/apichanges.xml b/editor.completion/apichanges.xml
index 6b71984..525c302 100644
--- a/editor.completion/apichanges.xml
+++ b/editor.completion/apichanges.xml
@@ -1,48 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Search for CHANGEME in this document when copying and using it: -->
<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright 1997-2010 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]"
-
-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.
+
+ 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
+
+ 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.
+
-->
<?xml-stylesheet type="text/xml" href="../nbbuild/javadoctools/apichanges.xsl"?>
<!DOCTYPE apichanges PUBLIC "-//NetBeans//DTD API changes list 1.0//EN" "../nbbuild/javadoctools/apichanges.dtd">
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/f300576e/editor.completion/src/org/netbeans/modules/editor/completion/Bundle.properties
----------------------------------------------------------------------
diff --git a/editor.completion/src/org/netbeans/modules/editor/completion/Bundle.properties b/editor.completion/src/org/netbeans/modules/editor/completion/Bundle.properties
index 3871f8f..0d7507b 100644
--- a/editor.completion/src/org/netbeans/modules/editor/completion/Bundle.properties
+++ b/editor.completion/src/org/netbeans/modules/editor/completion/Bundle.properties
@@ -1,44 +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 1997-2010 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]"
-#
-# 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.
+# 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-Name=Editor Code Completion
OpenIDE-Module-Display-Category=Editing
[2/2] incubator-netbeans git commit: Merge branch 'pr/55'
Posted by ma...@apache.org.
Merge branch 'pr/55'
Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/4ee38a5a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/4ee38a5a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/4ee38a5a
Branch: refs/heads/master
Commit: 4ee38a5a61a82bdcef41806e27151593fd0017bb
Parents: 1fbc20b f300576
Author: Matthias Bläsing <mb...@doppel-helix.eu>
Authored: Sat Oct 7 21:09:41 2017 +0200
Committer: Matthias Bläsing <mb...@doppel-helix.eu>
Committed: Sat Oct 7 21:09:41 2017 +0200
----------------------------------------------------------------------
editor.completion/apichanges.xml | 60 ++++++--------------
.../modules/editor/completion/Bundle.properties | 53 +++++------------
2 files changed, 32 insertions(+), 81 deletions(-)
----------------------------------------------------------------------