You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2026/07/31 02:45:42 UTC
(groovy) branch master updated: license tweaks for Groovy 6
This is an automated email from the ASF dual-hosted git repository.
paulk-asert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
The following commit(s) were added to refs/heads/master by this push:
new 70f102d4ab license tweaks for Groovy 6
70f102d4ab is described below
commit 70f102d4ab85c1bc4c39c38bf21b2ea51e61bdf5
Author: Paul King <pa...@asert.com.au>
AuthorDate: Fri Jul 31 12:45:32 2026 +1000
license tweaks for Groovy 6
---
LICENSE | 2 +-
.../src/main/groovy/org.apache.groovy-base.gradle | 25 +++++++-
.../groovy/org.apache.groovy-doc-aggregator.gradle | 29 ++++++++++
build.gradle | 6 ++
gradle/licenses.gradle | 17 +++++-
licenses/LICENSE-BINZIP | 67 ++++++++++++++++++++++
licenses/LICENSE-DOC | 11 +++-
licenses/{LICENSE-DOC => LICENSE-DOCSJAR} | 19 ------
licenses/LICENSE-SDK | 67 ++++++++++++++++++++++
licenses/commonmark-BINZIP.txt | 5 ++
licenses/commonmark-license.txt | 23 ++++++++
licenses/jna-BINZIP.txt | 5 ++
licenses/jquery-js-DOC-SRC.txt | 2 +-
licenses/jquery-ui-DOC.txt | 6 ++
licenses/jquery-webjar-BINZIP.txt | 5 ++
licenses/mxparser-BINZIP.txt | 6 ++
licenses/mxparser-license.txt | 56 ++++++++++++++++++
licenses/reactive-streams-BINZIP.txt | 6 ++
licenses/reactive-streams-license.txt | 18 ++++++
licenses/slf4j-BINZIP.txt | 5 ++
licenses/slf4j-license.txt | 24 ++++++++
licenses/stax2-BINZIP.txt | 5 ++
licenses/stax2-license.txt | 25 ++++++++
licenses/treelayout-BINZIP.txt | 6 ++
licenses/treelayout-license.txt | 27 +++++++++
subprojects/groovy-binary/build.gradle | 22 ++++++-
subprojects/groovy-groovydoc/LICENSE | 44 ++++++++++++++
27 files changed, 503 insertions(+), 30 deletions(-)
diff --git a/LICENSE b/LICENSE
index 11803c0ae8..8255047013 100644
--- a/LICENSE
+++ b/LICENSE
@@ -241,7 +241,7 @@ JQuery License
The following file is used within documentation:
- src/spec/assets/css/jquery-2.1.1.min.js
+ src/spec/doc/assets/js/jquery-2.1.1.min.js
This file is made available under the following MIT license:
licenses/jquery-js-license.txt
diff --git a/build-logic/src/main/groovy/org.apache.groovy-base.gradle b/build-logic/src/main/groovy/org.apache.groovy-base.gradle
index fe3e570f7b..8c4cc8e81c 100644
--- a/build-logic/src/main/groovy/org.apache.groovy-base.gradle
+++ b/build-logic/src/main/groovy/org.apache.groovy-base.gradle
@@ -166,8 +166,8 @@ tasks.withType(Jar).configureEach { jar ->
return
}
metaInf {
- // root project provides its own JARJAR license/notice in its jar task
- if (jar.name in ['jar', 'sourcesJar'] && project != rootProject) {
+ // the root project's main jar provides its own JARJAR license/notice in its jar task
+ if (jar.name in ['jar', 'sourcesJar'] && !(jar.name == 'jar' && project == rootProject)) {
if (file("${projectDir}/LICENSE").exists()) {
from "${projectDir}/LICENSE"
} else {
@@ -182,6 +182,27 @@ tasks.withType(Jar).configureEach { jar ->
rename 'NOTICE-BASE', 'NOTICE'
}
}
+ } else if (jar.name == 'groovydocJar') {
+ // generated groovydoc bundles prism assets and a normalize-derived stylesheet
+ from("${rootProject.projectDir}/licenses/LICENSE-DOCSJAR") {
+ rename 'LICENSE-DOCSJAR', 'LICENSE'
+ }
+ from("${rootProject.projectDir}/notices/NOTICE-BASE") {
+ rename 'NOTICE-BASE', 'NOTICE'
+ }
+ into('licenses') {
+ from "${rootProject.projectDir}/licenses/normalize-stylesheet-license.txt"
+ from "${rootProject.projectDir}/licenses/prism-license.txt"
+ }
+ } else if (jar.name == 'javadocJar') {
+ // javadoc output bundles the JDK tool's own JS libraries (jquery etc.)
+ // whose licenses ship in the tool-generated legal/ directory
+ from("${rootProject.projectDir}/licenses/LICENSE-BASE") {
+ rename 'LICENSE-BASE', 'LICENSE'
+ }
+ from("${rootProject.projectDir}/notices/NOTICE-BASE") {
+ rename 'NOTICE-BASE', 'NOTICE'
+ }
}
from generateReleaseInfo
}
diff --git a/build-logic/src/main/groovy/org.apache.groovy-doc-aggregator.gradle b/build-logic/src/main/groovy/org.apache.groovy-doc-aggregator.gradle
index 6b8130b19f..7f1a460f30 100644
--- a/build-logic/src/main/groovy/org.apache.groovy-doc-aggregator.gradle
+++ b/build-logic/src/main/groovy/org.apache.groovy-doc-aggregator.gradle
@@ -68,6 +68,12 @@ def sourcesAllJar = tasks.register("sourcesAllJar", Jar) {
dependsOn ':generateGrammarSource'
from configurations.allSources
archiveClassifier = 'sources'
+ metaInf {
+ // the aggregated sources include the third-party-derived source files
+ // covered by the source distribution's LICENSE and NOTICE
+ from rootProject.file('LICENSE')
+ from rootProject.file('NOTICE')
+ }
}
def javadocAll = tasks.register("javadocAll", Javadoc) {
@@ -96,6 +102,16 @@ def javadocAll = tasks.register("javadocAll", Javadoc) {
def javadocAllJar = tasks.register("javadocAllJar", Jar) {
from javadocAll
archiveClassifier = 'javadoc'
+ metaInf {
+ // javadoc output bundles the JDK tool's own JS libraries (jquery etc.)
+ // whose licenses ship in the tool-generated legal/ directory
+ from(rootProject.file('licenses/LICENSE-BASE')) {
+ rename 'LICENSE-BASE', 'LICENSE'
+ }
+ from(rootProject.file('notices/NOTICE-BASE')) {
+ rename 'NOTICE-BASE', 'NOTICE'
+ }
+ }
}
def groovydocAll = tasks.register("groovydocAll", Groovydoc) {
@@ -115,6 +131,19 @@ def groovydocAll = tasks.register("groovydocAll", Groovydoc) {
def groovydocAllJar = tasks.register("groovydocAllJar", Jar) {
from groovydocAll
archiveClassifier = 'groovydoc'
+ metaInf {
+ // generated groovydoc bundles prism assets and a normalize-derived stylesheet
+ from(rootProject.file('licenses/LICENSE-DOCSJAR')) {
+ rename 'LICENSE-DOCSJAR', 'LICENSE'
+ }
+ from(rootProject.file('notices/NOTICE-BASE')) {
+ rename 'NOTICE-BASE', 'NOTICE'
+ }
+ into('licenses') {
+ from rootProject.file('licenses/normalize-stylesheet-license.txt')
+ from rootProject.file('licenses/prism-license.txt')
+ }
+ }
}
class JavadocClasspathCompatibilityRule implements AttributeCompatibilityRule<Usage> {
diff --git a/build.gradle b/build.gradle
index 747d1a8c49..83ff1d3981 100644
--- a/build.gradle
+++ b/build.gradle
@@ -280,6 +280,12 @@ sonarqube {
}
+// The optional feature variants deliberately publish the raw (unshaded) jar
+// as their artifact. It is only reachable through Gradle module metadata by
+// consumers requiring the corresponding capability (e.g.
+// 'org.apache.groovy:groovy-grapes'); Maven consumers only ever see the
+// repackaged jar. The raw jar has been part of the published artifact surface
+// since Groovy 4, so removing it would break capability-based consumers.
artifacts {
grapesRuntimeElements file: jar.archiveFile.get().asFile, type: 'jar'
xstreamAstRuntimeElements file: jar.archiveFile.get().asFile, type: 'jar'
diff --git a/gradle/licenses.gradle b/gradle/licenses.gradle
index d00eadb735..e8dde29f2a 100644
--- a/gradle/licenses.gradle
+++ b/gradle/licenses.gradle
@@ -28,11 +28,12 @@ tasks.register('updateLicenses') {
ext.licenseJLine3File = "${projectDir}/subprojects/groovy-groovysh/LICENSE"
ext.licenseBinZipFile = "${licensesDir}/LICENSE-BINZIP"
ext.licenseDocFile = "${licensesDir}/LICENSE-DOC"
+ ext.licenseDocsJarFile = "${licensesDir}/LICENSE-DOCSJAR"
ext.licenseJarJarFile = "${licensesDir}/LICENSE-JARJAR"
ext.licenseSdkFile = "${licensesDir}/LICENSE-SDK"
inputs.files(licenseBaseFile, fileTree(licensesDir).include('*.txt'))
- outputs.files(licenseBinZipFile, licenseDocFile, licenseJarJarFile, licenseSrcFile,
- licenseGroovyDocFile, licenseJsr223File, licenseSdkFile)
+ outputs.files(licenseBinZipFile, licenseDocFile, licenseDocsJarFile, licenseJarJarFile,
+ licenseSrcFile, licenseGroovyDocFile, licenseJsr223File, licenseSdkFile)
doLast {
def srcFiles = fileTree(licensesDir).include('*-SRC*.txt').sort { it.name }
@@ -42,13 +43,23 @@ tasks.register('updateLicenses') {
include '*-JARJAR*.txt'
include '*-BINZIP*.txt'
}.sort { it.name }
- def groovydocFiles = fileTree(licensesDir).include('normalize-stylesheet-groovy-groovydoc.txt')
+ def groovydocFiles = fileTree(licensesDir) {
+ include 'normalize-stylesheet-groovy-groovydoc.txt'
+ include 'prism-groovy-groovydoc.txt'
+ }.sort { it.name }
+ // for the generated-documentation (groovydoc classifier) jars, which
+ // bundle the normalize-derived stylesheet and the prism assets
+ def docsJarFiles = fileTree(licensesDir) {
+ include 'normalize-stylesheet-BINZIP-DOC-SRC.txt'
+ include 'prism-BINZIP-DOC-SRC.txt'
+ }.sort { it.name }
def jsr223Files = fileTree(licensesDir).include('jsr223-BINZIP-SRC.txt')
def jline3Files = fileTree(licensesDir).include('jline3-BINZIP-SRC.txt')
def licenseHdr = '\n\n------------------------------------------------------------------------\n\n'
[
(licenseBinZipFile) : binzipFiles,
(licenseDocFile) : docFiles,
+ (licenseDocsJarFile) : docsJarFiles,
(licenseJarJarFile) : jarjarFiles,
(licenseSrcFile) : srcFiles,
(licenseGroovyDocFile) : groovydocFiles,
diff --git a/licenses/LICENSE-BINZIP b/licenses/LICENSE-BINZIP
index 9a8ea44b77..f2ae064433 100644
--- a/licenses/LICENSE-BINZIP
+++ b/licenses/LICENSE-BINZIP
@@ -216,6 +216,14 @@ ASM uses a 3-clause BSD license. For details, see licenses/asm-license.txt.
------------------------------------------------------------------------
+commonmark-java License (used by the optional groovy-markdown module
+and by the groovydoc component for markdown processing)
+
+This product bundles the commonmark jar, which is available under a
+"2-clause BSD" license. For details, see licenses/commonmark-license.txt.
+
+------------------------------------------------------------------------
+
Hamcrest License (needed when using optional JUnit dependency)
This product bundles the Hamcrest jar, which is available under a
@@ -249,6 +257,22 @@ which are available under a BSD License. For details, see licenses/jline3-licen
------------------------------------------------------------------------
+JNA License (dependency used with groovysh)
+
+This product bundles the JNA jar, which is dual-licensed under the
+Apache License 2.0 and the LGPL v2.1. It is distributed here under
+the Apache License 2.0, the text of which appears at the top of this file.
+
+------------------------------------------------------------------------
+
+JQuery License (dependency of the optional TestNG dependency, used
+for its report generation)
+
+This product bundles the jquery webjar, which is available under the
+MIT License. For details, see licenses/jquery-js-license.txt.
+
+------------------------------------------------------------------------
+
JSR166y License (optionally used by the optional GPars dependency)
This product bundles the jsr166y jar (containing works from
@@ -288,6 +312,15 @@ Eclipse Public License v2.0. For details, see licenses/junit5-license.txt.
------------------------------------------------------------------------
+MXParser License (dependency of the optional XStream dependency
+used when serializing AST as XML)
+
+This product bundles the MXParser jar, which is available under the
+Indiana University Extreme! Lab Software License, Version 1.2.
+For details, see licenses/mxparser-license.txt.
+
+------------------------------------------------------------------------
+
normalize.css License
The stylesheet.css file (originally normalize.css) is referenced
@@ -308,6 +341,40 @@ licenses/prism-license.txt
------------------------------------------------------------------------
+Reactive Streams License (dependency of the optional RxJava and
+Project Reactor dependencies)
+
+This product bundles the reactive-streams jar, which is available under
+the MIT No Attribution (MIT-0) License. For details, see
+licenses/reactive-streams-license.txt.
+
+------------------------------------------------------------------------
+
+SLF4J License (the slf4j-api and jcl-over-slf4j jars are dependencies
+of several optional modules including groovy-testng and Maven-based Grape)
+
+This product bundles the slf4j-api and jcl-over-slf4j jars, which are
+available under the MIT License. For details, see licenses/slf4j-license.txt.
+
+------------------------------------------------------------------------
+
+Stax2 API License (dependency of the Woodstox library used by the
+optional Maven-based Grape support)
+
+This product bundles the stax2-api jar, which is available under a
+"2-clause BSD" license. For details, see licenses/stax2-license.txt.
+
+------------------------------------------------------------------------
+
+TreeLayout License (used by groovyConsole for its AST browser
+tree layout)
+
+This product bundles the org.abego.treelayout.core jar, which is
+available under a "3-clause BSD" license. For details, see
+licenses/treelayout-license.txt.
+
+------------------------------------------------------------------------
+
XStream License (optional dependency when serializing AST as XML)
This product bundles the XStream jar, which is available under a
diff --git a/licenses/LICENSE-DOC b/licenses/LICENSE-DOC
index 61fbf8a1a3..2888d48da7 100644
--- a/licenses/LICENSE-DOC
+++ b/licenses/LICENSE-DOC
@@ -215,13 +215,22 @@ JQuery License
The following file is used within documentation:
- src/spec/assets/css/jquery-2.1.1.min.js
+ src/spec/doc/assets/js/jquery-2.1.1.min.js
This file is made available under the following MIT license:
licenses/jquery-js-license.txt
------------------------------------------------------------------------
+JQuery and JQuery UI Licenses (bundled by the JDK javadoc tool)
+
+The API documentation under html/api is produced by the JDK javadoc
+tool, which bundles its own copies of the JQuery and JQuery UI
+JavaScript libraries. Their MIT licenses are provided by the tool in
+the generated html/api/legal directory (jquery.md and jqueryUI.md).
+
+------------------------------------------------------------------------
+
normalize.css License
The stylesheet.css file (originally normalize.css) is referenced
diff --git a/licenses/LICENSE-DOC b/licenses/LICENSE-DOCSJAR
similarity index 95%
copy from licenses/LICENSE-DOC
copy to licenses/LICENSE-DOCSJAR
index 61fbf8a1a3..417a912945 100644
--- a/licenses/LICENSE-DOC
+++ b/licenses/LICENSE-DOCSJAR
@@ -203,25 +203,6 @@
------------------------------------------------------------------------
-Asciidoc 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.
-
-------------------------------------------------------------------------
-
-JQuery 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
-
-------------------------------------------------------------------------
-
normalize.css License
The stylesheet.css file (originally normalize.css) is referenced
diff --git a/licenses/LICENSE-SDK b/licenses/LICENSE-SDK
index 85873465a3..25c2ea8b2c 100644
--- a/licenses/LICENSE-SDK
+++ b/licenses/LICENSE-SDK
@@ -216,6 +216,14 @@ ASM uses a 3-clause BSD license. For details, see licenses/asm-license.txt.
------------------------------------------------------------------------
+commonmark-java License (used by the optional groovy-markdown module
+and by the groovydoc component for markdown processing)
+
+This product bundles the commonmark jar, which is available under a
+"2-clause BSD" license. For details, see licenses/commonmark-license.txt.
+
+------------------------------------------------------------------------
+
Hamcrest License (needed when using optional JUnit dependency)
This product bundles the Hamcrest jar, which is available under a
@@ -249,6 +257,22 @@ which are available under a BSD License. For details, see licenses/jline3-licen
------------------------------------------------------------------------
+JNA License (dependency used with groovysh)
+
+This product bundles the JNA jar, which is dual-licensed under the
+Apache License 2.0 and the LGPL v2.1. It is distributed here under
+the Apache License 2.0, the text of which appears at the top of this file.
+
+------------------------------------------------------------------------
+
+JQuery License (dependency of the optional TestNG dependency, used
+for its report generation)
+
+This product bundles the jquery webjar, which is available under the
+MIT License. For details, see licenses/jquery-js-license.txt.
+
+------------------------------------------------------------------------
+
JSR166y License (optionally used by the optional GPars dependency)
This product bundles the jsr166y jar (containing works from
@@ -288,6 +312,15 @@ Eclipse Public License v2.0. For details, see licenses/junit5-license.txt.
------------------------------------------------------------------------
+MXParser License (dependency of the optional XStream dependency
+used when serializing AST as XML)
+
+This product bundles the MXParser jar, which is available under the
+Indiana University Extreme! Lab Software License, Version 1.2.
+For details, see licenses/mxparser-license.txt.
+
+------------------------------------------------------------------------
+
normalize.css License
The stylesheet.css file (originally normalize.css) is referenced
@@ -308,6 +341,40 @@ licenses/prism-license.txt
------------------------------------------------------------------------
+Reactive Streams License (dependency of the optional RxJava and
+Project Reactor dependencies)
+
+This product bundles the reactive-streams jar, which is available under
+the MIT No Attribution (MIT-0) License. For details, see
+licenses/reactive-streams-license.txt.
+
+------------------------------------------------------------------------
+
+SLF4J License (the slf4j-api and jcl-over-slf4j jars are dependencies
+of several optional modules including groovy-testng and Maven-based Grape)
+
+This product bundles the slf4j-api and jcl-over-slf4j jars, which are
+available under the MIT License. For details, see licenses/slf4j-license.txt.
+
+------------------------------------------------------------------------
+
+Stax2 API License (dependency of the Woodstox library used by the
+optional Maven-based Grape support)
+
+This product bundles the stax2-api jar, which is available under a
+"2-clause BSD" license. For details, see licenses/stax2-license.txt.
+
+------------------------------------------------------------------------
+
+TreeLayout License (used by groovyConsole for its AST browser
+tree layout)
+
+This product bundles the org.abego.treelayout.core jar, which is
+available under a "3-clause BSD" license. For details, see
+licenses/treelayout-license.txt.
+
+------------------------------------------------------------------------
+
XStream License (optional dependency when serializing AST as XML)
This product bundles the XStream jar, which is available under a
diff --git a/licenses/commonmark-BINZIP.txt b/licenses/commonmark-BINZIP.txt
new file mode 100644
index 0000000000..e1479b70a6
--- /dev/null
+++ b/licenses/commonmark-BINZIP.txt
@@ -0,0 +1,5 @@
+commonmark-java License (used by the optional groovy-markdown module
+and by the groovydoc component for markdown processing)
+
+This product bundles the commonmark jar, which is available under a
+"2-clause BSD" license. For details, see licenses/commonmark-license.txt.
diff --git a/licenses/commonmark-license.txt b/licenses/commonmark-license.txt
new file mode 100644
index 0000000000..b09e367cef
--- /dev/null
+++ b/licenses/commonmark-license.txt
@@ -0,0 +1,23 @@
+Copyright (c) 2015, Atlassian Pty Ltd
+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.
+
+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 HOLDER 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/licenses/jna-BINZIP.txt b/licenses/jna-BINZIP.txt
new file mode 100644
index 0000000000..52686d1664
--- /dev/null
+++ b/licenses/jna-BINZIP.txt
@@ -0,0 +1,5 @@
+JNA License (dependency used with groovysh)
+
+This product bundles the JNA jar, which is dual-licensed under the
+Apache License 2.0 and the LGPL v2.1. It is distributed here under
+the Apache License 2.0, the text of which appears at the top of this file.
diff --git a/licenses/jquery-js-DOC-SRC.txt b/licenses/jquery-js-DOC-SRC.txt
index 22d0dd80e9..01c04fa4c6 100644
--- a/licenses/jquery-js-DOC-SRC.txt
+++ b/licenses/jquery-js-DOC-SRC.txt
@@ -2,7 +2,7 @@ JQuery License
The following file is used within documentation:
- src/spec/assets/css/jquery-2.1.1.min.js
+ src/spec/doc/assets/js/jquery-2.1.1.min.js
This file is made available under the following MIT license:
licenses/jquery-js-license.txt
\ No newline at end of file
diff --git a/licenses/jquery-ui-DOC.txt b/licenses/jquery-ui-DOC.txt
new file mode 100644
index 0000000000..f824a69e14
--- /dev/null
+++ b/licenses/jquery-ui-DOC.txt
@@ -0,0 +1,6 @@
+JQuery and JQuery UI Licenses (bundled by the JDK javadoc tool)
+
+The API documentation under html/api is produced by the JDK javadoc
+tool, which bundles its own copies of the JQuery and JQuery UI
+JavaScript libraries. Their MIT licenses are provided by the tool in
+the generated html/api/legal directory (jquery.md and jqueryUI.md).
\ No newline at end of file
diff --git a/licenses/jquery-webjar-BINZIP.txt b/licenses/jquery-webjar-BINZIP.txt
new file mode 100644
index 0000000000..5d7f0c6cdf
--- /dev/null
+++ b/licenses/jquery-webjar-BINZIP.txt
@@ -0,0 +1,5 @@
+JQuery License (dependency of the optional TestNG dependency, used
+for its report generation)
+
+This product bundles the jquery webjar, which is available under the
+MIT License. For details, see licenses/jquery-js-license.txt.
diff --git a/licenses/mxparser-BINZIP.txt b/licenses/mxparser-BINZIP.txt
new file mode 100644
index 0000000000..6d202afeee
--- /dev/null
+++ b/licenses/mxparser-BINZIP.txt
@@ -0,0 +1,6 @@
+MXParser License (dependency of the optional XStream dependency
+used when serializing AST as XML)
+
+This product bundles the MXParser jar, which is available under the
+Indiana University Extreme! Lab Software License, Version 1.2.
+For details, see licenses/mxparser-license.txt.
diff --git a/licenses/mxparser-license.txt b/licenses/mxparser-license.txt
new file mode 100644
index 0000000000..77f8f84c86
--- /dev/null
+++ b/licenses/mxparser-license.txt
@@ -0,0 +1,56 @@
+Indiana University Extreme! Lab Software License, Version 1.2
+
+Copyright (C) 2003 The Trustees of Indiana University.
+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) All redistributions of source code must retain the above
+ copyright notice, the list of authors in the original source
+ code, this list of conditions and the disclaimer listed in this
+ license;
+
+2) All redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the disclaimer
+ listed in this license in the documentation and/or other
+ materials provided with the distribution;
+
+3) Any documentation included with all redistributions must include
+ the following acknowledgement:
+
+ "This product includes software developed by the Indiana
+ University Extreme! Lab. For further information please visit
+ http://www.extreme.indiana.edu/"
+
+ Alternatively, this acknowledgment may appear in the software
+ itself, and wherever such third-party acknowledgments normally
+ appear.
+
+4) The name "Indiana University" or "Indiana University
+ Extreme! Lab" shall not be used to endorse or promote
+ products derived from this software without prior written
+ permission from Indiana University. For written permission,
+ please contact http://www.extreme.indiana.edu/.
+
+5) Products derived from this software may not use "Indiana
+ University" name nor may "Indiana University" appear in their name,
+ without prior written permission of the Indiana University.
+
+Indiana University provides no reassurances that the source code
+provided does not infringe the patent or any other intellectual
+property rights of any other entity. Indiana University disclaims any
+liability to any recipient for claims brought by any other entity
+based on infringement of intellectual property rights or otherwise.
+
+LICENSEE UNDERSTANDS THAT SOFTWARE IS PROVIDED "AS IS" FOR WHICH
+NO WARRANTIES AS TO CAPABILITIES OR ACCURACY ARE MADE. INDIANA
+UNIVERSITY GIVES NO WARRANTIES AND MAKES NO REPRESENTATION THAT
+SOFTWARE IS FREE OF INFRINGEMENT OF THIRD PARTY PATENT, COPYRIGHT, OR
+OTHER PROPRIETARY RIGHTS. INDIANA UNIVERSITY MAKES NO WARRANTIES THAT
+SOFTWARE IS FREE FROM "BUGS", "VIRUSES", "TROJAN HORSES", "TRAP
+DOORS", "WORMS", OR OTHER HARMFUL CODE. LICENSEE ASSUMES THE ENTIRE
+RISK AS TO THE PERFORMANCE OF SOFTWARE AND/OR ASSOCIATED MATERIALS,
+AND TO THE PERFORMANCE AND VALIDITY OF INFORMATION GENERATED USING
+SOFTWARE.
diff --git a/licenses/reactive-streams-BINZIP.txt b/licenses/reactive-streams-BINZIP.txt
new file mode 100644
index 0000000000..7ac697668c
--- /dev/null
+++ b/licenses/reactive-streams-BINZIP.txt
@@ -0,0 +1,6 @@
+Reactive Streams License (dependency of the optional RxJava and
+Project Reactor dependencies)
+
+This product bundles the reactive-streams jar, which is available under
+the MIT No Attribution (MIT-0) License. For details, see
+licenses/reactive-streams-license.txt.
diff --git a/licenses/reactive-streams-license.txt b/licenses/reactive-streams-license.txt
new file mode 100644
index 0000000000..116ca79eca
--- /dev/null
+++ b/licenses/reactive-streams-license.txt
@@ -0,0 +1,18 @@
+MIT No Attribution
+
+Copyright 2014 Reactive Streams
+
+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.
+
+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.
diff --git a/licenses/slf4j-BINZIP.txt b/licenses/slf4j-BINZIP.txt
new file mode 100644
index 0000000000..f9972fcf32
--- /dev/null
+++ b/licenses/slf4j-BINZIP.txt
@@ -0,0 +1,5 @@
+SLF4J License (the slf4j-api and jcl-over-slf4j jars are dependencies
+of several optional modules including groovy-testng and Maven-based Grape)
+
+This product bundles the slf4j-api and jcl-over-slf4j jars, which are
+available under the MIT License. For details, see licenses/slf4j-license.txt.
diff --git a/licenses/slf4j-license.txt b/licenses/slf4j-license.txt
new file mode 100644
index 0000000000..1a3d053237
--- /dev/null
+++ b/licenses/slf4j-license.txt
@@ -0,0 +1,24 @@
+Copyright (c) 2004-2022 QOS.ch Sarl (Switzerland)
+All rights reserved.
+
+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.
+
+
+
diff --git a/licenses/stax2-BINZIP.txt b/licenses/stax2-BINZIP.txt
new file mode 100644
index 0000000000..6fa064579e
--- /dev/null
+++ b/licenses/stax2-BINZIP.txt
@@ -0,0 +1,5 @@
+Stax2 API License (dependency of the Woodstox library used by the
+optional Maven-based Grape support)
+
+This product bundles the stax2-api jar, which is available under a
+"2-clause BSD" license. For details, see licenses/stax2-license.txt.
diff --git a/licenses/stax2-license.txt b/licenses/stax2-license.txt
new file mode 100644
index 0000000000..c571902722
--- /dev/null
+++ b/licenses/stax2-license.txt
@@ -0,0 +1,25 @@
+BSD 2-Clause License
+
+Copyright (c) 2008+, FasterXML, LLC
+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.
+
+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 HOLDER 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/licenses/treelayout-BINZIP.txt b/licenses/treelayout-BINZIP.txt
new file mode 100644
index 0000000000..adcd48626a
--- /dev/null
+++ b/licenses/treelayout-BINZIP.txt
@@ -0,0 +1,6 @@
+TreeLayout License (used by groovyConsole for its AST browser
+tree layout)
+
+This product bundles the org.abego.treelayout.core jar, which is
+available under a "3-clause BSD" license. For details, see
+licenses/treelayout-license.txt.
diff --git a/licenses/treelayout-license.txt b/licenses/treelayout-license.txt
new file mode 100644
index 0000000000..1620af43b3
--- /dev/null
+++ b/licenses/treelayout-license.txt
@@ -0,0 +1,27 @@
+[The "BSD license"]
+Copyright (c) 2011, abego Software GmbH, Germany (http://www.abego.org)
+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 abego Software GmbH 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 HOLDER 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/subprojects/groovy-binary/build.gradle b/subprojects/groovy-binary/build.gradle
index 558b7ac2ec..60f02f3493 100644
--- a/subprojects/groovy-binary/build.gradle
+++ b/subprojects/groovy-binary/build.gradle
@@ -118,14 +118,25 @@ distribution {
}
into('licenses') {
from rootProject.file('licenses')
+ // keep in sync with the licenses/*.txt files referenced from LICENSE-BINZIP
include 'antlr4-license.txt'
include 'asm-license.txt'
+ include 'commonmark-license.txt'
include 'hamcrest-license.txt'
- include 'jline2-license.txt'
+ include 'jline3-license.txt'
+ include 'jquery-js-license.txt'
include 'jsr166y-license.txt'
include 'jsr223-license.txt'
+ include 'jsvg-license.txt'
include 'junit4-license.txt'
include 'junit5-license.txt'
+ include 'mxparser-license.txt'
+ include 'normalize-stylesheet-license.txt'
+ include 'prism-license.txt'
+ include 'reactive-streams-license.txt'
+ include 'slf4j-license.txt'
+ include 'stax2-license.txt'
+ include 'treelayout-license.txt'
include 'xstream-license.txt'
}
}
@@ -148,9 +159,11 @@ distribution {
}
into('licenses') {
from rootProject.file('licenses')
+ // keep in sync with the licenses/*.txt files referenced from LICENSE-DOC
include 'asciidoc-style-license.txt'
include 'jquery-js-license.txt'
include 'normalize-stylesheet-license.txt'
+ include 'prism-license.txt'
}
from rootProject.file("licenses/LICENSE-DOC")
from rootProject.file("notices/NOTICE-BASE")
@@ -170,7 +183,9 @@ distribution {
'**/*.iws', // used by Intellij IDEA
'.settings', // used by Eclipse
'.classpath', // used by Eclipse
- '.gradle' // used by Gradle
+ '.gradle', // used by Gradle
+ '**/*.class' // a source release should never bundle bytecode
+ // even from stale output dirs in a dirty checkout
if (project.projectDir.name == 'performance') {
// The dashboard is only for the gh-pages published view
// (it bundles third-party JS); it plays no part in
@@ -210,7 +225,8 @@ distribution {
'.settings', // used by Eclipse
'.classpath', // used by Eclipse
'.gradle', // used by Gradle
- '*.gpg' // used by Gradle
+ '*.gpg', // used by Gradle
+ '**/*.class' // a source release should never bundle bytecode
}
}
}
diff --git a/subprojects/groovy-groovydoc/LICENSE b/subprojects/groovy-groovydoc/LICENSE
index f9e136b70b..133d98e44a 100644
--- a/subprojects/groovy-groovydoc/LICENSE
+++ b/subprojects/groovy-groovydoc/LICENSE
@@ -228,3 +228,47 @@ 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.
+
+------------------------------------------------------------------------
+
+PRISM LICENSE
+
+The following files are used to provide client-side syntax highlighting
+of code snippets in the generated documentation:
+
+ org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/prism.js
+ org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/prism.min.css
+ org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/prism-dark.min.css
+ org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/prism-csv.min.js
+ org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/prism-groovy.min.js
+ org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/prism-java.min.js
+ org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/prism-javadoclike.min.js
+ org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/prism-javascript.min.js
+ org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/prism-json.min.js
+ org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/prism-markdown.min.js
+ org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/prism-properties.min.js
+ org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/prism-regex.min.js
+ org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/prism-sql.min.js
+ org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/prism-toml.min.js
+ org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/prism-xml-doc.min.js
+ org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/prism-yaml.min.js
+
+Copyright (c) 2012 Lea Verou
+
+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.