-
Notifications
You must be signed in to change notification settings - Fork 904
Cleanup/Separate/Document licenses in apache netbeans #396
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
matthiasblaesing
merged 6 commits into
apache:master
from
matthiasblaesing:file-licenses
Jan 30, 2018
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
8be06a4
Use correct ALv2 header for newly created files in nbbuild
matthiasblaesing f4e171c
[NETBEANS-311] Add license infos for individual files to modules and …
matthiasblaesing 57bbf74
[NETBEANS-314] Add license info for files sourced from W3C
matthiasblaesing 4327ec0
[NETBEANS-309] Add license info for icons merged after donation
matthiasblaesing 9d3fd69
[NETBEANS-315] Remove usage of rss-0_91.dtd and replace with XHTML1 DTDs
matthiasblaesing 49524f1
Remove files from rat exclusions and add explicit license information
matthiasblaesing File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| <?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. | ||
|
|
||
| --> | ||
| <licenseinfo> | ||
| <fileset> | ||
| <file>src/org/netbeans/modules/css/resources/icons/chrome20-disabled.png</file> | ||
| <file>src/org/netbeans/modules/css/resources/icons/chrome20.png</file> | ||
| <file>src/org/netbeans/modules/css/resources/icons/firefox20-disabled.png</file> | ||
| <file>src/org/netbeans/modules/css/resources/icons/firefox20.png</file> | ||
| <file>src/org/netbeans/modules/css/resources/icons/ie20-disabled.png</file> | ||
| <file>src/org/netbeans/modules/css/resources/icons/ie20.png</file> | ||
| <file>src/org/netbeans/modules/css/resources/icons/opera20-disabled.png</file> | ||
| <file>src/org/netbeans/modules/css/resources/icons/opera20.png</file> | ||
| <file>src/org/netbeans/modules/css/resources/icons/safari20-disabled.png</file> | ||
| <file>src/org/netbeans/modules/css/resources/icons/safari20.png</file> | ||
| <license ref="CDDL-1.0" /> | ||
| <comment> | ||
| Files were taken from oracle netbeans repository and were distributed | ||
| in the netbeans binary distribution under the combined GPLv2 + CDDL | ||
| license. | ||
|
|
||
| The files are used in the GUI to represent the browsers and so need | ||
| to be close to the original artwork of their icons. | ||
| </comment> | ||
| </fileset> | ||
| </licenseinfo> | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| <?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. | ||
|
|
||
| --> | ||
| <licenseinfo> | ||
| <fileset> | ||
| <file>src/org/netbeans/modules/html/editor/resources/DTDs/3_2/html32.dtd</file> | ||
| <file>src/org/netbeans/modules/html/editor/resources/DTDs/4_0/frameset.dtd</file> | ||
| <file>src/org/netbeans/modules/html/editor/resources/DTDs/4_0/loose.dtd</file> | ||
| <file>src/org/netbeans/modules/html/editor/resources/DTDs/4_0/strict.dtd</file> | ||
| <file>src/org/netbeans/modules/html/editor/resources/DTDs/4_01/frameset.dtd</file> | ||
| <file>src/org/netbeans/modules/html/editor/resources/DTDs/4_01/loose.dtd</file> | ||
| <file>src/org/netbeans/modules/html/editor/resources/DTDs/4_01/strict.dtd</file> | ||
| <file>src/org/netbeans/modules/html/editor/resources/DTDs/xhtml/xhtml1-frameset.dtd</file> | ||
| <file>src/org/netbeans/modules/html/editor/resources/DTDs/xhtml/xhtml1-strict.dtd</file> | ||
| <file>src/org/netbeans/modules/html/editor/resources/DTDs/xhtml/xhtml1-transitional.dtd</file> | ||
| <license ref="W3C2" /> | ||
| <comment>DTDs and XMLSchemata are used at runtime to offer code completion for HTML/XHTML files.</comment> | ||
| </fileset> | ||
| <fileset> | ||
| <file>src/org/netbeans/modules/html/editor/resources/DTDs/3_2/lat1.ent</file> | ||
| <file>src/org/netbeans/modules/html/editor/resources/DTDs/4_0/HTMLlat1.ent</file> | ||
| <file>src/org/netbeans/modules/html/editor/resources/DTDs/4_0/HTMLspecial.ent</file> | ||
| <file>src/org/netbeans/modules/html/editor/resources/DTDs/4_0/HTMLsymbol.ent</file> | ||
| <file>src/org/netbeans/modules/html/editor/resources/DTDs/4_01/HTMLlat1.ent</file> | ||
| <file>src/org/netbeans/modules/html/editor/resources/DTDs/4_01/HTMLspecial.ent</file> | ||
| <file>src/org/netbeans/modules/html/editor/resources/DTDs/4_01/HTMLsymbol.ent</file> | ||
| <file>src/org/netbeans/modules/html/editor/resources/DTDs/xhtml/xhtml-lat1.ent</file> | ||
| <file>src/org/netbeans/modules/html/editor/resources/DTDs/xhtml/xhtml-special.ent</file> | ||
| <file>src/org/netbeans/modules/html/editor/resources/DTDs/xhtml/xhtml-symbol.ent</file> | ||
| <license ref="ISO-8879-SGML" /> | ||
| <comment>DTDs and XMLSchemata are used at runtime to offer code completion for HTML/XHTML files.</comment> | ||
| </fileset> | ||
| <fileset> | ||
| <file>src/org/netbeans/modules/html/editor/resources/DTDs/3_2/catalog</file> | ||
| <file>src/org/netbeans/modules/html/editor/resources/DTDs/4_0/catalog</file> | ||
| <file>src/org/netbeans/modules/html/editor/resources/DTDs/4_01/catalog</file> | ||
| <file>src/org/netbeans/modules/html/editor/resources/DTDs/xhtml/catalog</file> | ||
| <license ref="Apache-2.0" /> | ||
| <comment type="COMMENT_UNSUPPORTED" /> | ||
| </fileset> | ||
| <fileset> | ||
| <file>src/org/netbeans/modules/html/editor/options/ui/formatSample.html</file> | ||
| <file>src/org/netbeans/modules/html/editor/resources/HTMLExample</file> | ||
| <file>src/org/netbeans/modules/html/editor/resources/XHTMLExample</file> | ||
| <license ref="Apache-2.0" /> | ||
| <comment type="GUI_USABILITY"/> | ||
| </fileset> | ||
| </licenseinfo> |
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| <?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. | ||
|
|
||
| --> | ||
| <licenseinfo> | ||
| <fileset> | ||
| <file>src/org/netbeans/modules/j2ee/persistence/dd/resources/orm_1_0.xsd</file> | ||
| <file>src/org/netbeans/modules/j2ee/persistence/dd/resources/persistence_1_0.xsd</file> | ||
| <license ref="CDDL-1.0" /> | ||
| <comment type="CATEGORY_B">Used for XML Validation and code completion at runtime.</comment> | ||
| </fileset> | ||
| <fileset> | ||
| <file>src/org/netbeans/modules/j2ee/persistence/dd/resources/orm_2_0.xsd</file> | ||
| <file>src/org/netbeans/modules/j2ee/persistence/dd/resources/persistence_2_0.xsd</file> | ||
| <license ref="EDL-1.0"> | ||
| Copyright (c) 2008, 2009 Sun Microsystems. All rights reserved. | ||
|
|
||
| Contributors: | ||
| Linda DeMichiel - Java Persistence 2.0, Version 2.0 (October 1, 2009) | ||
| Specification available from http://jcp.org/en/jsr/detail?id=317 | ||
| </license> | ||
| <comment type="CATEGORY_B">Used for XML Validation and code completion at runtime.</comment> | ||
| </fileset> | ||
| <fileset> | ||
| <file>src/org/netbeans/modules/j2ee/persistence/dd/resources/orm_2_1.xsd</file> | ||
| <file>src/org/netbeans/modules/j2ee/persistence/dd/resources/persistence_2_1.xsd</file> | ||
| <license ref="EDL-1.0"> | ||
| Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved. | ||
|
|
||
| Contributors: | ||
| Linda DeMichiel - Java Persistence 2.1, Version 2.1 (February 4, 2013) | ||
| Specification available from http://jcp.org/en/jsr/detail?id=338 | ||
| </license> | ||
| <comment type="CATEGORY_B">Used for XML Validation and code completion at runtime.</comment> | ||
| </fileset> | ||
| <fileset> | ||
| <file>src/org/netbeans/modules/j2ee/persistence/ui/resources/persistence-1.0.xml</file> | ||
| <file>src/org/netbeans/modules/j2ee/persistence/ui/resources/persistence-2.0.xml</file> | ||
| <file>src/org/netbeans/modules/j2ee/persistence/ui/resources/persistence-2.1.xml</file> | ||
| <file>src/org/netbeans/modules/j2ee/persistence/wizard/jpacontroller/resources/IllegalOrphanException.java.txt</file> | ||
| <file>src/org/netbeans/modules/j2ee/persistence/wizard/jpacontroller/resources/NonexistentEntityException.java.txt</file> | ||
| <file>src/org/netbeans/modules/j2ee/persistence/wizard/jpacontroller/resources/PreexistingEntityException.java.txt</file> | ||
| <file>src/org/netbeans/modules/j2ee/persistence/wizard/jpacontroller/resources/RollbackFailureException.java.txt</file> | ||
| <license ref="Apache-2.0" /> | ||
| <comment type="TEMPLATE_MINIMAL_IP" /> | ||
| </fileset> | ||
| </licenseinfo> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| <?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. | ||
|
|
||
| --> | ||
| <licenseinfo> | ||
| <fileset> | ||
| <file>src/org/netbeans/modules/maven/coverage/coverage-04.dtd</file> | ||
| <license ref="ISO-8879-SGML" /> | ||
| </fileset> | ||
| <fileset> | ||
| <file>src/org/netbeans/modules/maven/coverage/jacoco-1.0.dtd</file> | ||
| <license ref="EPL-v10" /> | ||
| <comment type="CATEGORY_B">Used by XML parser at runtime.</comment> | ||
| </fileset> | ||
| </licenseinfo> |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not sure if this is correct, but someone else will need to comment I guess (e.g. I don't know how where these icons were from in neither repository).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
My reasoning: the icons are present in the distributed packages from oracle. There are various license statements, but I did not find statements addressing the icons specifically. So I deduce, that they are distributed under the global GPLv2-CDDL license and from that only the CDDL can even be considered for Apache NetBeans.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I understand what you are saying, but I don't know if that's correct (sorry).