[ https://issues.apache.org/jira/browse/NETBEANS-54?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16238514#comment-16238514 ]
ASF GitHub Bot commented on NETBEANS-54: ---------------------------------------- geertjanw closed pull request #226: [NETBEANS-54] adding license headers to UML files in openide.options URL: https://github.com/apache/incubator-netbeans/pull/226 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/openide.options/uml/options.argo b/openide.options/uml/options.argo index 84dc573a5..bfa9ac79d 100644 --- a/openide.options/uml/options.argo +++ b/openide.options/uml/options.argo @@ -1,4 +1,24 @@ <?xml version = "1.0" encoding = "ISO-8859-1" ?> +<!-- + + 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. + +--> <!DOCTYPE argo SYSTEM "argo.dtd" > <argo> <documentation> diff --git a/openide.options/uml/options.xmi b/openide.options/uml/options.xmi index d716a478c..17cfd1877 100644 --- a/openide.options/uml/options.xmi +++ b/openide.options/uml/options.xmi @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + 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. + +--> <!DOCTYPE XMI SYSTEM "uml13.dtd"> <XMI xmi.version="1.0"> <XMI.header> diff --git a/openide.options/uml/options_classdiagram8.pgml b/openide.options/uml/options_classdiagram8.pgml index 5db37f03c..19dbde928 100644 --- a/openide.options/uml/options_classdiagram8.pgml +++ b/openide.options/uml/options_classdiagram8.pgml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="ISO-8859-1" ?> +<!-- + + 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. + +--> <!DOCTYPE pgml SYSTEM "pgml.dtd"> <pgml description="uci.uml.visual.UMLClassDiagram|-44-24--118--42-572200:e11d48b612:-7ff0" name="options class" diff --git a/openide.options/uml/options_usecasediagram3.pgml b/openide.options/uml/options_usecasediagram3.pgml index 1a056dbb2..b5ea53bc7 100644 --- a/openide.options/uml/options_usecasediagram3.pgml +++ b/openide.options/uml/options_usecasediagram3.pgml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="ISO-8859-1" ?> +<!-- + + 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. + +--> <!DOCTYPE pgml SYSTEM "pgml.dtd"> <pgml description="uci.uml.visual.UMLUseCaseDiagram|-44-24--118--42-572200:e11d48b612:-7ff0" name="use case diagram 3" ---------------------------------------------------------------- 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 > 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)