You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@netbeans.apache.org by jlahoda <gi...@git.apache.org> on 2017/09/25 18:14:12 UTC
[GitHub] incubator-netbeans pull request #8: [NETBEANS-54] Module Review api.htmlui
GitHub user jlahoda opened a pull request:
https://github.com/apache/incubator-netbeans/pull/8
[NETBEANS-54] Module Review api.htmlui
-no external library
-checked Rat report: no license of manifest and signature file (see central problems); unconverted license in api.htmlui/src/org/netbeans/api/htmlui/HTMLDialog.java (misplaced /*\n, so the tool, being strict, refused to convert it. After deleting the '/*\n', the tool was happy to convert the header).
-skimmed through the module, did not notice additional problems
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/jlahoda/incubator-netbeans api.htmlui-review2
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/incubator-netbeans/pull/8.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #8
----
commit 5becc129a2753d62ca6b787cb34f85b380d260c7
Author: Jan Lahoda <jl...@netbeans.org>
Date: 2017-09-24T06:20:19Z
[NETBEANS-54] Module Review api.htmlui
-no external library
-checked Rat report: no license of manifest and signature file (see central problems); unconverted license in api.htmlui/src/org/netbeans/api/htmlui/HTMLDialog.java (misplaced /*\n, so the tool, being strict, refused to convert it. After deleting the '/*\n', the tool was happy to convert the header).
-skimmed through the module, did not notice additional problems
----
---
[GitHub] incubator-netbeans issue #8: [NETBEANS-54] Module Review api.htmlui
Posted by emilianbold <gi...@git.apache.org>.
Github user emilianbold commented on the issue:
https://github.com/apache/incubator-netbeans/pull/8
@asfgit who are you?
---
[GitHub] incubator-netbeans issue #8: [NETBEANS-54] Module Review api.htmlui
Posted by jlahoda <gi...@git.apache.org>.
Github user jlahoda commented on the issue:
https://github.com/apache/incubator-netbeans/pull/8
Pushed:
https://git-wip-us.apache.org/repos/asf?p=incubator-netbeans.git;a=commit;h=3880c5162f149eb0d3953aacac63c4c014cd101d
---
[GitHub] incubator-netbeans issue #8: [NETBEANS-54] Module Review api.htmlui
Posted by matthiasblaesing <gi...@git.apache.org>.
Github user matthiasblaesing commented on the issue:
https://github.com/apache/incubator-netbeans/pull/8
+1
---
[GitHub] incubator-netbeans issue #8: [NETBEANS-54] Module Review api.htmlui
Posted by JaroslavTulach <gi...@git.apache.org>.
Github user JaroslavTulach commented on the issue:
https://github.com/apache/incubator-netbeans/pull/8
This patch is correct and can be integrated.
---
[GitHub] incubator-netbeans pull request #8: [NETBEANS-54] Module Review api.htmlui
Posted by jlahoda <gi...@git.apache.org>.
Github user jlahoda closed the pull request at:
https://github.com/apache/incubator-netbeans/pull/8
---
[GitHub] incubator-netbeans issue #8: [NETBEANS-54] Module Review api.htmlui
Posted by asfgit <gi...@git.apache.org>.
Github user asfgit commented on the issue:
https://github.com/apache/incubator-netbeans/pull/8
Can one of the admins verify this patch?
---
[GitHub] incubator-netbeans pull request #8: [NETBEANS-54] Module Review api.htmlui
Posted by JaroslavTulach <gi...@git.apache.org>.
Github user JaroslavTulach commented on a diff in the pull request:
https://github.com/apache/incubator-netbeans/pull/8#discussion_r141023560
--- Diff: api.htmlui/src/org/netbeans/api/htmlui/HTMLDialog.java ---
@@ -1,44 +1,20 @@
-/*
- * 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 2014 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):
- *
- * Portions Copyrighted 2014 Sun Microsystems, Inc.
+ * 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.
*/
--- End diff --
Correct change. This is certainly file owned by Oracle as I (Oracle employee) wrote it.
---