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/02 23:24:25 UTC
[1/3] incubator-netbeans git commit: [NETBEANS-54] Module Review
editor.lib - no external libraries - checked Rat report: modified license
header in src/org/netbeans/editor/BaseKit.java
Repository: incubator-netbeans
Updated Branches:
refs/heads/master 3880c5162 -> ea36ed08f
[NETBEANS-54] Module Review editor.lib
- no external libraries
- checked Rat report: modified license header in src/org/netbeans/editor/BaseKit.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/2993d25f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/2993d25f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/2993d25f
Branch: refs/heads/master
Commit: 2993d25f8c12ebf6e2b8ec5bdbe4a1f32e447a0c
Parents: 3880c51
Author: Antonio Vieiro <an...@vieiro.net>
Authored: Mon Oct 2 11:47:44 2017 +0200
Committer: Antonio Vieiro <an...@vieiro.net>
Committed: Mon Oct 2 11:47:44 2017 +0200
----------------------------------------------------------------------
editor.lib/src/org/netbeans/editor/BaseKit.java | 55 ++++++--------------
1 file changed, 15 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/2993d25f/editor.lib/src/org/netbeans/editor/BaseKit.java
----------------------------------------------------------------------
diff --git a/editor.lib/src/org/netbeans/editor/BaseKit.java b/editor.lib/src/org/netbeans/editor/BaseKit.java
index 2f60392..8cad75f 100644
--- a/editor.lib/src/org/netbeans/editor/BaseKit.java
+++ b/editor.lib/src/org/netbeans/editor/BaseKit.java
@@ -1,45 +1,20 @@
-/*
- * 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):
+/**
+ * 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
*
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Sun Picrosystems, Inc. Portions Copyright 1997-2006 Sun
- * Microsystems, Inc. All Rights Reserved.
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * 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.
*/
package org.netbeans.editor;
[3/3] incubator-netbeans git commit: Merge branch 'pr/38'
Posted by ma...@apache.org.
Merge branch 'pr/38'
Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/ea36ed08
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/ea36ed08
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/ea36ed08
Branch: refs/heads/master
Commit: ea36ed08ff653c3fbfa82fcbcb27db01e43f9ee8
Parents: 2993d25 cb443c2
Author: Matthias Bläsing <mb...@doppel-helix.eu>
Authored: Tue Oct 3 01:21:34 2017 +0200
Committer: Matthias Bläsing <mb...@doppel-helix.eu>
Committed: Tue Oct 3 01:21:34 2017 +0200
----------------------------------------------------------------------
.../org/netbeans/api/editor/caret/package.html | 50 ++++++--------------
1 file changed, 14 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
[2/3] incubator-netbeans git commit: [NETBEANS-54] Module Review
editor.lib2
Posted by ma...@apache.org.
[NETBEANS-54] Module Review editor.lib2
- No external libraries.
- checked Rat report: modified license header in src/org/netbeans/api/editor/caret/package.html
- skimmed through the module, did not notice additional problems
Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/cb443c2e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/cb443c2e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/cb443c2e
Branch: refs/heads/master
Commit: cb443c2efbbd41df528c4166f0b0a629d899cec5
Parents: 3880c51
Author: Antonio Vieiro <an...@vieiro.net>
Authored: Mon Oct 2 12:46:40 2017 +0200
Committer: Antonio Vieiro <an...@vieiro.net>
Committed: Mon Oct 2 12:46:40 2017 +0200
----------------------------------------------------------------------
.../org/netbeans/api/editor/caret/package.html | 50 ++++++--------------
1 file changed, 14 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/cb443c2e/editor.lib2/src/org/netbeans/api/editor/caret/package.html
----------------------------------------------------------------------
diff --git a/editor.lib2/src/org/netbeans/api/editor/caret/package.html b/editor.lib2/src/org/netbeans/api/editor/caret/package.html
index 81d5146..70e3eae 100644
--- a/editor.lib2/src/org/netbeans/api/editor/caret/package.html
+++ b/editor.lib2/src/org/netbeans/api/editor/caret/package.html
@@ -1,46 +1,24 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-Copyright 2016 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.
-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):
-
-Portions Copyrighted 2016 Sun Microsystems, Inc.
-->
-
<html>
<head>
<title>org.netbeans.api.editor.caret</title>