This is an automated email from the ASF dual-hosted git repository. sreimers pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git
The following commit(s) were added to refs/heads/master by this push: new 630d76b Upgrade to Groovy 2.5.2 (#898) 630d76b is described below commit 630d76b78d51a49cddf3f140e824525072e33ac2 Author: Sven Reimers <svenreim...@users.noreply.github.com> AuthorDate: Sat Sep 29 18:39:45 2018 +0200 Upgrade to Groovy 2.5.2 (#898) * Upgrade to Groovy 2.5.2 * Fixing licensing information for Groovy 2.5.2 and related --- groovy/groovy.editor/nbproject/project.xml | 36 ++--- .../modules/groovy/editor/test/GroovyTestBase.java | 3 +- groovy/libs.groovy/external/binaries-list | 3 +- ...-2.4.5-license.txt => groovy-2.5.2-license.txt} | 169 ++++++--------------- .../libs.groovy/external/groovy-2.5.2-notice.txt | 8 + .../external/groovy-all-2.4.5-notice.txt | 10 -- groovy/libs.groovy/manifest.mf | 2 +- groovy/libs.groovy/nbproject/project.properties | 3 +- groovy/libs.groovy/nbproject/project.xml | 16 +- .../netbeans/modules/libs/groovy/Bundle.properties | 3 +- .../libs/groovy/{groovy-all.xml => groovy.xml} | 6 +- .../src/org/netbeans/modules/libs/groovy/layer.xml | 2 +- nbbuild/licenses/ASM | 32 ++++ nbbuild/licenses/Apache-2.0-groovy | 166 ++++++-------------- nbbuild/licenses/names.properties | 1 + 15 files changed, 179 insertions(+), 281 deletions(-) diff --git a/groovy/groovy.editor/nbproject/project.xml b/groovy/groovy.editor/nbproject/project.xml index 7e3daf5..0cdabe9 100644 --- a/groovy/groovy.editor/nbproject/project.xml +++ b/groovy/groovy.editor/nbproject/project.xml @@ -132,6 +132,14 @@ </run-dependency> </dependency> <dependency> + <code-name-base>org.netbeans.modules.editor.document</code-name-base> + <build-prerequisite/> + <compile-dependency/> + <run-dependency> + <specification-version>1.0</specification-version> + </run-dependency> + </dependency> + <dependency> <code-name-base>org.netbeans.modules.editor.indent</code-name-base> <build-prerequisite/> <compile-dependency/> @@ -159,14 +167,6 @@ </run-dependency> </dependency> <dependency> - <code-name-base>org.netbeans.modules.editor.document</code-name-base> - <build-prerequisite/> - <compile-dependency/> - <run-dependency> - <specification-version>1.0</specification-version> - </run-dependency> - </dependency> - <dependency> <code-name-base>org.netbeans.modules.editor.mimelookup</code-name-base> <build-prerequisite/> <compile-dependency/> @@ -236,20 +236,20 @@ </run-dependency> </dependency> <dependency> - <code-name-base>org.netbeans.modules.libs.groovy</code-name-base> + <code-name-base>org.netbeans.modules.lexer</code-name-base> <build-prerequisite/> <compile-dependency/> <run-dependency> - <specification-version>1.0</specification-version> + <release-version>2</release-version> + <specification-version>1.25</specification-version> </run-dependency> </dependency> <dependency> - <code-name-base>org.netbeans.modules.lexer</code-name-base> + <code-name-base>org.netbeans.modules.libs.groovy</code-name-base> <build-prerequisite/> <compile-dependency/> <run-dependency> - <release-version>2</release-version> - <specification-version>1.25</specification-version> + <specification-version>1.0</specification-version> </run-dependency> </dependency> <dependency> @@ -344,7 +344,7 @@ </run-dependency> </dependency> <dependency> - <code-name-base>org.openide.util.ui</code-name-base> + <code-name-base>org.openide.util</code-name-base> <build-prerequisite/> <compile-dependency/> <run-dependency> @@ -352,19 +352,19 @@ </run-dependency> </dependency> <dependency> - <code-name-base>org.openide.util</code-name-base> + <code-name-base>org.openide.util.lookup</code-name-base> <build-prerequisite/> <compile-dependency/> <run-dependency> - <specification-version>9.3</specification-version> + <specification-version>8.0</specification-version> </run-dependency> </dependency> <dependency> - <code-name-base>org.openide.util.lookup</code-name-base> + <code-name-base>org.openide.util.ui</code-name-base> <build-prerequisite/> <compile-dependency/> <run-dependency> - <specification-version>8.0</specification-version> + <specification-version>9.3</specification-version> </run-dependency> </dependency> <dependency> diff --git a/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/test/GroovyTestBase.java b/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/test/GroovyTestBase.java index 6752d9c..fdf9e15 100644 --- a/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/test/GroovyTestBase.java +++ b/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/test/GroovyTestBase.java @@ -32,7 +32,6 @@ import java.util.Map; import java.util.Set; import java.util.StringTokenizer; import java.util.logging.Level; -import org.codehaus.groovy.ant.Groovyc; import org.netbeans.api.java.classpath.ClassPath; import org.netbeans.editor.BaseDocument; import org.netbeans.lib.lexer.test.TestLanguageProvider; @@ -162,7 +161,7 @@ public class GroovyTestBase extends CslTestBase { } private static ClassPath createCompilePath() { - URL url = Groovyc.class.getProtectionDomain().getCodeSource().getLocation(); + URL url = org.codehaus.groovy.ant.Groovyc.class.getProtectionDomain().getCodeSource().getLocation(); return ClassPathSupport.createClassPath(FileUtil.getArchiveRoot(url)); } diff --git a/groovy/libs.groovy/external/binaries-list b/groovy/libs.groovy/external/binaries-list index ba82170..d438f8e 100644 --- a/groovy/libs.groovy/external/binaries-list +++ b/groovy/libs.groovy/external/binaries-list @@ -14,4 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -01730F61E9C9E59FD1B814371265334D7BE0B8D2 org.codehaus.groovy:groovy-all:2.4.5 +FF667436CFD98CC2C7E58631883C75D23D52261B org.codehaus.groovy:groovy:2.5.2 +7E9998E2AE9E371324661AC6924A5E185F950B76 org.codehaus.groovy:groovy-ant:2.5.2 diff --git a/groovy/libs.groovy/external/groovy-all-2.4.5-license.txt b/groovy/libs.groovy/external/groovy-2.5.2-license.txt similarity index 67% rename from groovy/libs.groovy/external/groovy-all-2.4.5-license.txt rename to groovy/libs.groovy/external/groovy-2.5.2-license.txt index b935f63..f052e33 100644 --- a/groovy/libs.groovy/external/groovy-all-2.4.5-license.txt +++ b/groovy/libs.groovy/external/groovy-2.5.2-license.txt @@ -1,5 +1,6 @@ Name: Groovy -Version: 2.4.5 +Version: 2.5.2 +Files: groovy-2.5.2.jar groovy-ant-2.5.2.jar Description: Groovy Language distribution. License: Apache-2.0-groovy Origin: http://groovy-lang.org/ @@ -208,135 +209,61 @@ Origin: http://groovy-lang.org/ ------------------------------------------------------------------------ -Asciidoc License +ANTLR 2 License -This product uses the style.css from asciidoctor.org within -documentation. The file is available under the MIT License. -For details, see licenses/asciidoc-style-license.txt. +We reserve no legal rights to the ANTLR--it is fully in the public domain. An individual or company may do +whatever they wish with source code distributed with ANTLR or the code generated by ANTLR, including the +incorporation of ANTLR, or its output, into commerical software. -The MIT License +We encourage users to develop software with ANTLR. However, we do ask that credit is given to us for +developing ANTLR. By "credit", we mean that if you use ANTLR or incorporate any source code into one of your +programs (commercial product, research project, or otherwise) that you acknowledge this fact somewhere in +the documentation, research report, etc... If you like ANTLR and have developed a nice tool with the output, +please mention that you developed it using ANTLR. In addition, we ask that the headers remain intact in our +source code. As long as these guidelines are kept, we expect to continue enhancing this system and expect to +make other tools available as they are completed. -Copyright (C) 2012-2015 Dan Allen, Ryan Waldron and the Asciidoctor Project +In countries where the Public Domain status of the work may not be valid, the author grants a copyright +licence to the general public to deal in the work without restriction and permission to sublicence derivates +under the terms of any (OSI approved) Open Source licence. -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: +The Python parser generator code under antlr/actions/python/ is covered by the 3-clause BSD licence (this +part is included in the binary JAR files); the run-time part under lib/python/ is covered by the GNU GPL, +version 3 or later (this part is not included in the binary JAR files). See [1] for the full details. -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. +https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=750643#80%22 -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. ------------------------------------------------------------------------ -JQuery License +ASM 4 License -The following file is used within documentation: - - src/spec/assets/css/jquery-2.1.1.min.js - -This file is made available under the following MIT license: -licenses/jquery-js-license.txt - -Copyright jQuery Foundation and other contributors, https://jquery.org/ - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ------------------------------------------------------------------------- - -JSR223 License - -The following classes within this product: - - org.codehaus.groovy.jsr223.GroovyCompiledScript - org.codehaus.groovy.jsr223.GroovyScriptEngineFactory - org.codehaus.groovy.jsr223.GroovyScriptEngineImpl - -were derived from reference implementation files developed by Sun in -collaboration with the Groovy community. The reference implementation -has a BSD-style license. Details can be found in: licenses/jsr223-license.txt - -Copyright (c) 2006, Sun Microsystems, Inc. +ASM: a very small and fast Java bytecode manipulation framework +Copyright (c) 2000-2011 INRIA, France Telecom All rights reserved. Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - - Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - - - Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - - Neither the name of the Sun Microsystems, Inc. nor the names of - contributors may be used to endorse or promote products derived from this - software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND -CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED -WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A -PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY -DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF -USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH -DAMAGE ------------------------------------------------------------------------- - -normalize.css License - -The stylesheet.css file (originally normalize.css) is used by the -groovydoc and docgenerator components for groovy-jdk/gapi documentation. -It is made available under a MIT License: -licenses/normalize-stylesheet-license.txt - -Copyright (c) Nicolas Gallagher and Jonathan Neal - -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies -of the Software, and to permit persons to whom the Software is furnished to do -so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. +modification, are permitted provided that the following conditions +are met: + +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + +3. Neither the name of the copyright holders nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF +THE POSSIBILITY OF SUCH DAMAGE. diff --git a/groovy/libs.groovy/external/groovy-2.5.2-notice.txt b/groovy/libs.groovy/external/groovy-2.5.2-notice.txt new file mode 100644 index 0000000..d946ebe --- /dev/null +++ b/groovy/libs.groovy/external/groovy-2.5.2-notice.txt @@ -0,0 +1,8 @@ +Apache Groovy +Copyright 2003-2018 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). + +This product includes/uses ANTLR (http://www.antlr2.org/) +developed by Terence Parr 1989-2006 \ No newline at end of file diff --git a/groovy/libs.groovy/external/groovy-all-2.4.5-notice.txt b/groovy/libs.groovy/external/groovy-all-2.4.5-notice.txt deleted file mode 100644 index 090afee..0000000 --- a/groovy/libs.groovy/external/groovy-all-2.4.5-notice.txt +++ /dev/null @@ -1,10 +0,0 @@ -Apache Groovy -Copyright 2003-2018 The Apache Software Foundation - -This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). - -This product bundles icons from the famfamfam.com silk icons set -http://www.famfamfam.com/lab/icons/silk/ -Licensed under the Creative Commons Attribution Licence v2.5 -http://creativecommons.org/licenses/by/2.5/ diff --git a/groovy/libs.groovy/manifest.mf b/groovy/libs.groovy/manifest.mf index b70955e..7412404 100644 --- a/groovy/libs.groovy/manifest.mf +++ b/groovy/libs.groovy/manifest.mf @@ -3,5 +3,5 @@ AutoUpdate-Show-In-Client: false OpenIDE-Module: org.netbeans.modules.libs.groovy OpenIDE-Module-Layer: org/netbeans/modules/libs/groovy/layer.xml OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/libs/groovy/Bundle.properties -OpenIDE-Module-Specification-Version: 1.8 +OpenIDE-Module-Specification-Version: 1.9 diff --git a/groovy/libs.groovy/nbproject/project.properties b/groovy/libs.groovy/nbproject/project.properties index e999117..cf5154e 100644 --- a/groovy/libs.groovy/nbproject/project.properties +++ b/groovy/libs.groovy/nbproject/project.properties @@ -24,4 +24,5 @@ javac.compilerargs=-Xlint -Xlint:-serial sigtest.gen.fail.on.error=false #cp.extra=external/groovy-all-2.1.7.jar -release.external/groovy-all-2.4.5.jar=modules/ext/groovy-all.jar +release.external/groovy-2.5.2.jar=modules/ext/groovy.jar +release.external/groovy-ant-2.5.2.jar=modules/ext/groovy-ant.jar diff --git a/groovy/libs.groovy/nbproject/project.xml b/groovy/libs.groovy/nbproject/project.xml index 184a02f..eb8fd91 100644 --- a/groovy/libs.groovy/nbproject/project.xml +++ b/groovy/libs.groovy/nbproject/project.xml @@ -27,25 +27,35 @@ <module-dependencies/> <friend-packages> <friend>org.netbeans.modules.groovy.editor</friend> - <friend>org.netbeans.modules.groovy.support</friend> <friend>org.netbeans.modules.groovy.refactoring</friend> + <friend>org.netbeans.modules.groovy.support</friend> <package>groovy.lang</package> <package>groovyjarjarantlr</package> <package>groovyjarjarasm.asm</package> <package>org.codehaus.groovy</package> + <package>org.codehaus.groovy.ant</package> <package>org.codehaus.groovy.antlr.parser</package> <package>org.codehaus.groovy.ast</package> <package>org.codehaus.groovy.ast.expr</package> <package>org.codehaus.groovy.ast.stmt</package> + <package>org.codehaus.groovy.ast.tools</package> <package>org.codehaus.groovy.classgen</package> <package>org.codehaus.groovy.control</package> + <package>org.codehaus.groovy.control.customizers</package> + <package>org.codehaus.groovy.control.customizers.builder</package> <package>org.codehaus.groovy.control.messages</package> <package>org.codehaus.groovy.reflection</package> <package>org.codehaus.groovy.syntax</package> + <package>org.codehaus.groovy.transform</package> + <package>org.codehaus.groovy.transform.stc</package> </friend-packages> <class-path-extension> - <runtime-relative-path>ext/groovy-all.jar</runtime-relative-path> - <binary-origin>external/groovy-all-2.4.5.jar</binary-origin> + <runtime-relative-path>ext/groovy.jar</runtime-relative-path> + <binary-origin>external/groovy-2.5.2.jar</binary-origin> + </class-path-extension> + <class-path-extension> + <runtime-relative-path>ext/groovy-ant.jar</runtime-relative-path> + <binary-origin>external/groovy-ant-2.5.2.jar</binary-origin> </class-path-extension> </data> </configuration> diff --git a/groovy/libs.groovy/src/org/netbeans/modules/libs/groovy/Bundle.properties b/groovy/libs.groovy/src/org/netbeans/modules/libs/groovy/Bundle.properties index fdf6483..0e9c0a3 100644 --- a/groovy/libs.groovy/src/org/netbeans/modules/libs/groovy/Bundle.properties +++ b/groovy/libs.groovy/src/org/netbeans/modules/libs/groovy/Bundle.properties @@ -16,4 +16,5 @@ # under the License. OpenIDE-Module-Name=Groovy Binaries -groovy-all=Groovy 2.1.7 +groovy=Groovy 2.5.2 +groovy-ant=Groovy Ant 2.5.2 diff --git a/groovy/libs.groovy/src/org/netbeans/modules/libs/groovy/groovy-all.xml b/groovy/libs.groovy/src/org/netbeans/modules/libs/groovy/groovy.xml similarity index 83% rename from groovy/libs.groovy/src/org/netbeans/modules/libs/groovy/groovy-all.xml rename to groovy/libs.groovy/src/org/netbeans/modules/libs/groovy/groovy.xml index a794139..7fd5284 100644 --- a/groovy/libs.groovy/src/org/netbeans/modules/libs/groovy/groovy-all.xml +++ b/groovy/libs.groovy/src/org/netbeans/modules/libs/groovy/groovy.xml @@ -27,12 +27,14 @@ <localizing-bundle>org/netbeans/modules/libs/groovy/Bundle</localizing-bundle> <volume> <type>classpath</type> - <resource>jar:nbinst://org.netbeans.modules.libs.groovy/modules/ext/groovy-all.jar!/</resource> + <resource>jar:nbinst://org.netbeans.modules.libs.groovy/modules/ext/groovy.jar!/</resource> + <resource>jar:nbinst://org.netbeans.modules.libs.groovy/modules/ext/groovy-ant.jar!/</resource> </volume> <properties> <property> <name>maven-dependencies</name> - <value>org.codehaus.groovy:groovy-all:2.4.5:jar</value> + <value>org.codehaus.groovy:groovy:2.5.2:jar</value> + <value>org.codehaus.groovy:groovy-ant:2.5.2:jar</value> </property> </properties> </library> diff --git a/groovy/libs.groovy/src/org/netbeans/modules/libs/groovy/layer.xml b/groovy/libs.groovy/src/org/netbeans/modules/libs/groovy/layer.xml index e67601d..255279a 100644 --- a/groovy/libs.groovy/src/org/netbeans/modules/libs/groovy/layer.xml +++ b/groovy/libs.groovy/src/org/netbeans/modules/libs/groovy/layer.xml @@ -24,7 +24,7 @@ <folder name="org-netbeans-api-project-libraries"> <folder name="Libraries"> <file name="groovy-all.xml" url="groovy-all.xml"> - <attr name="displayName" bundlevalue="org/netbeans/modules/libs/groovy/Bundle#groovy-all"/> + <attr name="displayName" bundlevalue="org/netbeans/modules/libs/groovy/Bundle#groovy"/> </file> </folder> </folder> diff --git a/nbbuild/licenses/ASM b/nbbuild/licenses/ASM new file mode 100644 index 0000000..d4230a5 --- /dev/null +++ b/nbbuild/licenses/ASM @@ -0,0 +1,32 @@ +ASM License + +ASM: a very small and fast Java bytecode manipulation framework +Copyright (c) 2000-2011 INRIA, France Telecom +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + +3. Neither the name of the copyright holders nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF +THE POSSIBILITY OF SUCH DAMAGE. diff --git a/nbbuild/licenses/Apache-2.0-groovy b/nbbuild/licenses/Apache-2.0-groovy index 0c3cf04..7e7d422 100644 --- a/nbbuild/licenses/Apache-2.0-groovy +++ b/nbbuild/licenses/Apache-2.0-groovy @@ -203,135 +203,61 @@ ------------------------------------------------------------------------ -Asciidoc License +ANTLR 2 License -This product uses the style.css from asciidoctor.org within -documentation. The file is available under the MIT License. -For details, see licenses/asciidoc-style-license.txt. +We reserve no legal rights to the ANTLR--it is fully in the public domain. An individual or company may do +whatever they wish with source code distributed with ANTLR or the code generated by ANTLR, including the +incorporation of ANTLR, or its output, into commerical software. -The MIT License +We encourage users to develop software with ANTLR. However, we do ask that credit is given to us for +developing ANTLR. By "credit", we mean that if you use ANTLR or incorporate any source code into one of your +programs (commercial product, research project, or otherwise) that you acknowledge this fact somewhere in +the documentation, research report, etc... If you like ANTLR and have developed a nice tool with the output, +please mention that you developed it using ANTLR. In addition, we ask that the headers remain intact in our +source code. As long as these guidelines are kept, we expect to continue enhancing this system and expect to +make other tools available as they are completed. -Copyright (C) 2012-2015 Dan Allen, Ryan Waldron and the Asciidoctor Project +In countries where the Public Domain status of the work may not be valid, the author grants a copyright +licence to the general public to deal in the work without restriction and permission to sublicence derivates +under the terms of any (OSI approved) Open Source licence. -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: +The Python parser generator code under antlr/actions/python/ is covered by the 3-clause BSD licence (this +part is included in the binary JAR files); the run-time part under lib/python/ is covered by the GNU GPL, +version 3 or later (this part is not included in the binary JAR files). See [1] for the full details. -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. +https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=750643#80%22 -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. ------------------------------------------------------------------------ -JQuery License +ASM 4 License -The following file is used within documentation: - - src/spec/assets/css/jquery-2.1.1.min.js - -This file is made available under the following MIT license: -licenses/jquery-js-license.txt - -Copyright jQuery Foundation and other contributors, https://jquery.org/ - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ------------------------------------------------------------------------- - -JSR223 License - -The following classes within this product: - - org.codehaus.groovy.jsr223.GroovyCompiledScript - org.codehaus.groovy.jsr223.GroovyScriptEngineFactory - org.codehaus.groovy.jsr223.GroovyScriptEngineImpl - -were derived from reference implementation files developed by Sun in -collaboration with the Groovy community. The reference implementation -has a BSD-style license. Details can be found in: licenses/jsr223-license.txt - -Copyright (c) 2006, Sun Microsystems, Inc. +ASM: a very small and fast Java bytecode manipulation framework +Copyright (c) 2000-2011 INRIA, France Telecom All rights reserved. Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - - Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - - - Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - - Neither the name of the Sun Microsystems, Inc. nor the names of - contributors may be used to endorse or promote products derived from this - software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND -CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED -WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A -PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY -DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF -USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH -DAMAGE ------------------------------------------------------------------------- - -normalize.css License - -The stylesheet.css file (originally normalize.css) is used by the -groovydoc and docgenerator components for groovy-jdk/gapi documentation. -It is made available under a MIT License: -licenses/normalize-stylesheet-license.txt - -Copyright (c) Nicolas Gallagher and Jonathan Neal - -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies -of the Software, and to permit persons to whom the Software is furnished to do -so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. +modification, are permitted provided that the following conditions +are met: + +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + +3. Neither the name of the copyright holders nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF +THE POSSIBILITY OF SUCH DAMAGE. diff --git a/nbbuild/licenses/names.properties b/nbbuild/licenses/names.properties index 0832fc2..fb562d8 100644 --- a/nbbuild/licenses/names.properties +++ b/nbbuild/licenses/names.properties @@ -17,6 +17,7 @@ GPL-2-CP=GPL v2 with Classpath exception (http://openjdk.java.net/legal/gplv2+ce.html) Apache-2.0=Apache Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +Apache-2.0-groovy=Apache Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) with Apache Groovy addendums 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 --------------------------------------------------------------------- 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