[
https://issues.apache.org/jira/browse/NETBEANS-54?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16237228#comment-16237228
]
ASF GitHub Bot commented on NETBEANS-54:
----------------------------------------
geertjanw closed pull request #222: [NETBEANS-54] Module Review javahelp
URL: https://github.com/apache/incubator-netbeans/pull/222
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/javahelp/src/org/netbeans/modules/javahelp/resources/favorites_2_0.dtd
b/javahelp/src/org/netbeans/modules/javahelp/resources/favorites_2_0.dtd
index 526b34457..a892681a9 100644
--- a/javahelp/src/org/netbeans/modules/javahelp/resources/favorites_2_0.dtd
+++ b/javahelp/src/org/netbeans/modules/javahelp/resources/favorites_2_0.dtd
@@ -1,10 +1,24 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- This is the DTD for favorites
- Copyright (c) 2001 Sun Microsystems
+<!--
+
+ 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.
- @(#)favorites_2_0.dtd 1.2 03/19/02
-->
diff --git
a/javahelp/src/org/netbeans/modules/javahelp/resources/helpset_1_0.dtd
b/javahelp/src/org/netbeans/modules/javahelp/resources/helpset_1_0.dtd
index bc743bb57..deeee37e3 100644
--- a/javahelp/src/org/netbeans/modules/javahelp/resources/helpset_1_0.dtd
+++ b/javahelp/src/org/netbeans/modules/javahelp/resources/helpset_1_0.dtd
@@ -1,10 +1,24 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- This is the DTD for helpset
- Copyright (c) 1998,1999 Sun Microsystems
+<!--
+
+ 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.
- @(#)helpset_1_0.dtd 1.5 01/14/99
-->
diff --git
a/javahelp/src/org/netbeans/modules/javahelp/resources/helpset_2_0.dtd
b/javahelp/src/org/netbeans/modules/javahelp/resources/helpset_2_0.dtd
index f59f220fa..e2e911791 100644
--- a/javahelp/src/org/netbeans/modules/javahelp/resources/helpset_2_0.dtd
+++ b/javahelp/src/org/netbeans/modules/javahelp/resources/helpset_2_0.dtd
@@ -1,10 +1,24 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- This is the DTD for helpset
- Copyright (c) 1998,1999 Sun Microsystems
+<!--
+
+ 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.
- @(#)helpset_2_0.dtd 1.5 06/05/03
-->
diff --git a/javahelp/src/org/netbeans/modules/javahelp/resources/index_1_0.dtd
b/javahelp/src/org/netbeans/modules/javahelp/resources/index_1_0.dtd
index 7f7b1ab67..d2266cb8d 100644
--- a/javahelp/src/org/netbeans/modules/javahelp/resources/index_1_0.dtd
+++ b/javahelp/src/org/netbeans/modules/javahelp/resources/index_1_0.dtd
@@ -1,10 +1,24 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- This is the DTD for Index
- Copyright (c) 1998 Sun Microsystems
+<!--
+
+ 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.
- @(#)index_1_0.dtd 1.2 01/03/99
-->
diff --git a/javahelp/src/org/netbeans/modules/javahelp/resources/index_2_0.dtd
b/javahelp/src/org/netbeans/modules/javahelp/resources/index_2_0.dtd
index 4b51dafe2..06ab255a3 100644
--- a/javahelp/src/org/netbeans/modules/javahelp/resources/index_2_0.dtd
+++ b/javahelp/src/org/netbeans/modules/javahelp/resources/index_2_0.dtd
@@ -1,10 +1,24 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- This is the DTD for Index
- Copyright (c) 1998 Sun Microsystems
+<!--
+
+ 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.
- @(#)index_2_0.dtd 1.4 06/05/03
-->
diff --git a/javahelp/src/org/netbeans/modules/javahelp/resources/map_1_0.dtd
b/javahelp/src/org/netbeans/modules/javahelp/resources/map_1_0.dtd
index dd4d13db2..637b0eeb9 100644
--- a/javahelp/src/org/netbeans/modules/javahelp/resources/map_1_0.dtd
+++ b/javahelp/src/org/netbeans/modules/javahelp/resources/map_1_0.dtd
@@ -1,10 +1,23 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- This is the DTD for (flat) Maps
- Copyright (c) 1998 Sun Microsystems
-
- @(#)map_1_0.dtd 1.1 12/17/98
+<!--
+
+ 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.
-->
diff --git a/javahelp/src/org/netbeans/modules/javahelp/resources/map_2_0.dtd
b/javahelp/src/org/netbeans/modules/javahelp/resources/map_2_0.dtd
index d241d8374..cab8725c1 100644
--- a/javahelp/src/org/netbeans/modules/javahelp/resources/map_2_0.dtd
+++ b/javahelp/src/org/netbeans/modules/javahelp/resources/map_2_0.dtd
@@ -1,10 +1,23 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- This is the DTD for (flat) Maps
- Copyright (c) 1998 Sun Microsystems
-
- @(#)map_2_0.dtd 1.1 03/19/02
+<!--
+
+ 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.
-->
diff --git a/javahelp/src/org/netbeans/modules/javahelp/resources/toc_1_0.dtd
b/javahelp/src/org/netbeans/modules/javahelp/resources/toc_1_0.dtd
index a5e9337b8..96bc0d813 100644
--- a/javahelp/src/org/netbeans/modules/javahelp/resources/toc_1_0.dtd
+++ b/javahelp/src/org/netbeans/modules/javahelp/resources/toc_1_0.dtd
@@ -1,10 +1,24 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- This is the DTD for TOC
- Copyright (c) 1998 Sun Microsystems
+<!--
+
+ 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.
- @(#)toc_1_0.dtd 1.3 01/03/99
-->
diff --git a/javahelp/src/org/netbeans/modules/javahelp/resources/toc_2_0.dtd
b/javahelp/src/org/netbeans/modules/javahelp/resources/toc_2_0.dtd
index d8b6908b3..646864dd1 100644
--- a/javahelp/src/org/netbeans/modules/javahelp/resources/toc_2_0.dtd
+++ b/javahelp/src/org/netbeans/modules/javahelp/resources/toc_2_0.dtd
@@ -1,10 +1,24 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- This is the DTD for TOC
- Copyright (c) 1998 Sun Microsystems
+<!--
+
+ 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.
- @(#)toc_2_0.dtd 1.4 06/05/03
-->
----------------------------------------------------------------
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:
[email protected]
> 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
> Priority: Major
> 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)
