[
https://issues.apache.org/jira/browse/NETBEANS-54?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16223605#comment-16223605
]
ASF GitHub Bot commented on NETBEANS-54:
----------------------------------------
geertjanw closed pull request #198: [NETBEANS-54] Module Review welcome
URL: https://github.com/apache/incubator-netbeans/pull/198
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/welcome/src/org/netbeans/modules/welcome/resources/Bundle.properties
b/welcome/src/org/netbeans/modules/welcome/resources/Bundle.properties
index b52bca8d1..782ffab9e 100644
--- a/welcome/src/org/netbeans/modules/welcome/resources/Bundle.properties
+++ b/welcome/src/org/netbeans/modules/welcome/resources/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 (c) 2006, 2016 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):
-# Sample ResourceBundle properties file
-
-
-
+# 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.
#
# Web Links
#
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
> Clarify the status of donated files from ApacheNetBeansDonation1.zip
> --------------------------------------------------------------------
>
> Key: NETBEANS-54
> URL: https://issues.apache.org/jira/browse/NETBEANS-54
> Project: NetBeans
> Issue Type: Bug
> Reporter: Bertrand Delacretaz
> Labels: pull-request-available
> Attachments: JavaApplication9.java, categorized-1.zip,
> convert-headers-1.zip
>
>
> Reviewing the software grant [1] provided with the first NetBeans code
> donation, my understanding is that not all files found in that zip are
> donated.
> The grant indicates that the contents of that file [2] ("Code File") are
> donated "excluding any third-party and separately licensed material contained
> within the Code File".
> I don't think we can consider that code ready to release as is, due to the
> uncertainty that this creates w.r.t to which files are donated and which are
> not.
> The zip archive contains about 45'000 files.
> I see the following options:
> a) Review all files and include only those which are not "third-party and
> separately licensed material". How such files are identified needs to be
> defined and documented, either in scripts under version control or as a set
> of rules. The review process must be documented and traceable, so that we can
> go back to it if problems are found in the future.
> b) Get an updated grant which does not mention such exclusions.
> If someone sees other options please discuss here or on the NetBeans dev
> list, referencing this ticket.
> [1] in svn under private/documents/grants/oracle-america-netbeans.pdf , ASF
> members have access
> [2] under http://bits.netbeans.org/download/apache-donation/ -
> SHA256(ApacheNetBeansDonation1.zip)=
> 7f2ca0f61953a190613c9a0fbcc1b034084b04a4d55d23c02cefffc354e7c24a
--
This message was sent by Atlassian JIRA
(v6.4.14#64029)
