This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git
commit 6d9346e1e40dd4804cee921e2374b39d12f9bcdd Author: Matthias Bläsing <mblaes...@doppel-helix.eu> AuthorDate: Mon Feb 19 22:39:33 2018 +0100 Update licenseinfos to match ALv2 header for ASF projects --- html.editor/licenseinfo.xml | 4 +- j2ee.persistence/licenseinfo.xml | 2 +- {performance => lib.profiler}/licenseinfo.xml | 6 +- .../nbbuild/extlibs/CreateLicenseSummary.java | 2 +- nbbuild/licenses/Apache-2-ASF | 213 +++++++++++++++++++++ nbbuild/licenses/names.properties | 1 + nbbuild/rat-exclusions.txt | 3 +- performance/licenseinfo.xml | 2 +- spellchecker.dictionary_en/licenseinfo.xml | 2 +- xml/licenseinfo.xml | 2 +- xsl/licenseinfo.xml | 2 +- 11 files changed, 227 insertions(+), 12 deletions(-) diff --git a/html.editor/licenseinfo.xml b/html.editor/licenseinfo.xml index 74a6f86..f007684 100644 --- a/html.editor/licenseinfo.xml +++ b/html.editor/licenseinfo.xml @@ -53,14 +53,14 @@ <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" /> + <license ref="Apache-2.0-ASF" /> <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" /> + <license ref="Apache-2.0-ASF" /> <comment type="GUI_USABILITY"/> </fileset> </licenseinfo> diff --git a/j2ee.persistence/licenseinfo.xml b/j2ee.persistence/licenseinfo.xml index 01e4a9e..e0bcd06 100644 --- a/j2ee.persistence/licenseinfo.xml +++ b/j2ee.persistence/licenseinfo.xml @@ -58,7 +58,7 @@ Specification available from http://jcp.org/en/jsr/detail?id=338 <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" /> + <license ref="Apache-2.0-ASF" /> <comment type="TEMPLATE_MINIMAL_IP" /> </fileset> </licenseinfo> diff --git a/performance/licenseinfo.xml b/lib.profiler/licenseinfo.xml similarity index 81% copy from performance/licenseinfo.xml copy to lib.profiler/licenseinfo.xml index 402cfe1..221ee4d 100644 --- a/performance/licenseinfo.xml +++ b/lib.profiler/licenseinfo.xml @@ -21,8 +21,10 @@ --> <licenseinfo> <fileset> - <file>threaddemo/src/threaddemo/util/doc-files/TwoWaySupport.zargo</file> - <license ref="Apache-2.0" /> + <file>test/unit/src/org/netbeans/lib/profiler/heap/heap_dump.bin</file> + <file>test/unit/src/org/netbeans/lib/profiler/heap/heapDumpLog.txt</file> + <license ref="Apache-2.0-ASF" /> <comment type="COMMENT_UNSUPPORTED" /> + <sourceOnly /> </fileset> </licenseinfo> diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/CreateLicenseSummary.java b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/CreateLicenseSummary.java index 6e42e71..41846a8 100644 --- a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/CreateLicenseSummary.java +++ b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/CreateLicenseSummary.java @@ -232,7 +232,7 @@ public class CreateLicenseSummary extends Task { Licenseinfo licenseInfo = Licenseinfo.parse(licenseInfoFile); for(Fileset fs: licenseInfo.getFilesets()) { - if("Apache-2.0".equals(fs.getLicenseRef())) { + if("Apache-2.0-ASF".equals(fs.getLicenseRef())) { continue; } if(binary && fs.isSourceOnly()) { diff --git a/nbbuild/licenses/Apache-2-ASF b/nbbuild/licenses/Apache-2-ASF new file mode 100644 index 0000000..4898386 --- /dev/null +++ b/nbbuild/licenses/Apache-2-ASF @@ -0,0 +1,213 @@ +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. + +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. + + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed 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/nbbuild/licenses/names.properties b/nbbuild/licenses/names.properties index a0d10c8..d690a07 100644 --- a/nbbuild/licenses/names.properties +++ b/nbbuild/licenses/names.properties @@ -20,6 +20,7 @@ Apache-2.0=Apache Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) Apache-2.0-lucene=Apache Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) with Apache Lucene addendums Apache-2.0-spring3.2.7=Apache Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) with Spring addendums, version 3.2.7 Apache-2.0-spring4.0.1=Apache Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) with Spring addendums, version 4.0.1 +Apache-2.0-ASF=Apache Version 2.0 with CLA reference (http://www.apache.org/licenses/LICENSE-2.0.txt) OSGi=Eclipse Public License v1 (https://www.eclipse.org/legal/epl-v10.html) with OSGi materials under Apache License Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) BSD-hamcrest=BSD license with hamcrest copyright BSD-INRIA=BSD license with INRIA copyright diff --git a/nbbuild/rat-exclusions.txt b/nbbuild/rat-exclusions.txt index 3873a5b..757652e 100644 --- a/nbbuild/rat-exclusions.txt +++ b/nbbuild/rat-exclusions.txt @@ -73,7 +73,6 @@ ide.kit/test/qa-functional/**/*.txt ### module-info.bin (compiled Java class) java.j2seproject/copylibstask/test/org/netbeans/modules/java/j2seproject/moduletask/resources/module-info.bin lexer/demo/src/org/netbeans/modules/lexer/demo/**/*.txt -lib.profiler/test/unit/src/org/netbeans/lib/profiler/heap/heapDumpLog.txt lib.uihandler/test/unit/src/** o.n.core/test/unit/src/org/netbeans/core/projects/cache/data/** openide.nodes/test/unit/src/org/openide/nodes/data/** @@ -196,4 +195,4 @@ o.apache.tools.ant.module/src/org/apache/tools/ant/module/resources/Project.xml_ spring.beans/src/org/netbeans/modules/spring/beans/resources/templates/*.template xml.text/src/org/netbeans/modules/xml/text/resources/DTDExample xml.text/src/org/netbeans/modules/xml/text/resources/XMLExample -properties.syntax/src/org/netbeans/modules/properties/syntax/PropertiesExample \ No newline at end of file +properties.syntax/src/org/netbeans/modules/properties/syntax/PropertiesExample diff --git a/performance/licenseinfo.xml b/performance/licenseinfo.xml index 402cfe1..4f90a74 100644 --- a/performance/licenseinfo.xml +++ b/performance/licenseinfo.xml @@ -22,7 +22,7 @@ <licenseinfo> <fileset> <file>threaddemo/src/threaddemo/util/doc-files/TwoWaySupport.zargo</file> - <license ref="Apache-2.0" /> + <license ref="Apache-2.0-ASF" /> <comment type="COMMENT_UNSUPPORTED" /> </fileset> </licenseinfo> diff --git a/spellchecker.dictionary_en/licenseinfo.xml b/spellchecker.dictionary_en/licenseinfo.xml index c68515a..15da3ba 100644 --- a/spellchecker.dictionary_en/licenseinfo.xml +++ b/spellchecker.dictionary_en/licenseinfo.xml @@ -24,7 +24,7 @@ <file>release/modules/dict/dictionary_en.description</file> <file>release/modules/dict/dictionary_en_GB.description</file> <file>release/modules/dict/dictionary_en_US.description</file> - <license ref="Apache-2.0" /> + <license ref="Apache-2.0-ASF" /> <comment type="COMMENT_UNSUPPORTED" /> </fileset> </licenseinfo> diff --git a/xml/licenseinfo.xml b/xml/licenseinfo.xml index ff70fa8..155ca87 100644 --- a/xml/licenseinfo.xml +++ b/xml/licenseinfo.xml @@ -26,7 +26,7 @@ <file>src/org/netbeans/modules/xml/resources/templates/emptyXmlSchema.xsd.template</file> <file>src/org/netbeans/modules/xml/resources/templates/xhtml.xml.template</file> <file>src/org/netbeans/modules/xml/resources/templates/xml_entity.ent.template</file> - <license ref="Apache-2.0" /> + <license ref="Apache-2.0-ASF" /> <comment type="TEMPLATE_MINIMAL_IP"/> </fileset> </licenseinfo> diff --git a/xsl/licenseinfo.xml b/xsl/licenseinfo.xml index 437b725..8af4edd 100644 --- a/xsl/licenseinfo.xml +++ b/xsl/licenseinfo.xml @@ -22,7 +22,7 @@ <licenseinfo> <fileset> <file>src/org/netbeans/modules/xsl/resources/templates/stylesheet.xsl</file> - <license ref="Apache-2.0" /> + <license ref="Apache-2.0-ASF" /> <comment type="TEMPLATE_MINIMAL_IP"/> </fileset> </licenseinfo> -- To stop receiving notification emails like this one, please contact matthiasblaes...@apache.org. --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists