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 2018/07/25 16:37:28 UTC
groovy git commit: tidy up licenses/notices wrt no longer needing
groovy-all jar
Repository: groovy
Updated Branches:
refs/heads/master 77f74f3a0 -> c6d8ebffc
tidy up licenses/notices wrt no longer needing groovy-all jar
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/c6d8ebff
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/c6d8ebff
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/c6d8ebff
Branch: refs/heads/master
Commit: c6d8ebffc1017fad2049927b78f0295875b269ae
Parents: 77f74f3
Author: Paul King <pa...@asert.com.au>
Authored: Thu Jul 26 02:22:13 2018 +1000
Committer: Paul King <pa...@asert.com.au>
Committed: Thu Jul 26 02:22:13 2018 +1000
----------------------------------------------------------------------
LICENSE | 3 +-
gradle/assemble.gradle | 9 +-
licenses/LICENSE-ALLJARJAR | 244 -------------------
licenses/LICENSE-BINZIP | 15 +-
licenses/LICENSE-DOC | 3 +-
licenses/LICENSE-SDK | 15 +-
licenses/hamcrest-BINZIP.txt | 2 +-
licenses/jline2-BINZIP.txt | 2 +-
licenses/jsr166y-BINZIP.txt | 2 +-
licenses/jsr223-ALLJARJAR-SRC.txt | 11 -
licenses/jsr223-BINZIP-SRC.txt | 11 +
licenses/junit-BINZIP.txt | 4 +-
.../normalize-stylesheet-ALLJARJAR-DOC-SRC.txt | 5 -
.../normalize-stylesheet-BINZIP-DOC-SRC.txt | 6 +
licenses/readme.txt | 3 +-
licenses/xstream-BINZIP.txt | 2 +-
notices/NOTICE-ALLJARJAR | 16 --
notices/readme.txt | 3 +-
notices/silkicons-ALLJARJAR-SRC.txt | 4 -
notices/silkicons-BINZIP-SRC.txt | 4 +
20 files changed, 52 insertions(+), 312 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/c6d8ebff/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 49d39d5..a515d41 100644
--- a/LICENSE
+++ b/LICENSE
@@ -240,4 +240,5 @@ 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. Details: licenses/normalize-stylesheet-license.txt
+It is made available under a MIT License:
+licenses/normalize-stylesheet-license.txt
http://git-wip-us.apache.org/repos/asf/groovy/blob/c6d8ebff/gradle/assemble.gradle
----------------------------------------------------------------------
diff --git a/gradle/assemble.gradle b/gradle/assemble.gradle
index eba06b7..16727ca 100644
--- a/gradle/assemble.gradle
+++ b/gradle/assemble.gradle
@@ -533,12 +533,11 @@ task updateLicenses {
def jarjarFiles = fileTree(licensesDir).include('*-JARJAR*.txt').sort { it.name }
def binzipFiles = fileTree(licensesDir) {
include '*-JARJAR*.txt'
- include '*-ALLJARJAR*.txt'
include '*-BINZIP*.txt'
}.sort { it.name }
def docgeneratorFiles = fileTree(licensesDir).include('normalize-stylesheet-groovy-docgenerator.txt')
def groovydocFiles = fileTree(licensesDir).include('normalize-stylesheet-groovy-groovydoc.txt')
- def jsr223Files = fileTree(licensesDir).include('jsr223-ALLJARJAR-SRC.txt')
+ def jsr223Files = fileTree(licensesDir).include('jsr223-BINZIP-SRC.txt')
def licenseHdr = '\n\n------------------------------------------------------------------------\n\n'
[
(licenseBinZipFile) : binzipFiles,
@@ -572,14 +571,13 @@ task updateNotices {
ext.noticeSrcFile = "${projectDir}/NOTICE"
ext.noticeGroovyConsoleFile = "${projectDir}/subprojects/groovy-console/NOTICE"
- ext.noticeAllJarJarFile = "${noticesDir}/NOTICE-ALLJARJAR"
ext.noticeBinZipFile = "${noticesDir}/NOTICE-BINZIP"
ext.noticeGrooidFile = "${noticesDir}/NOTICE-GROOID"
ext.noticeGrooidJarJarFile = "${noticesDir}/NOTICE-GROOIDJARJAR"
ext.noticeJarJarFile = "${noticesDir}/NOTICE-JARJAR"
ext.noticeSdkFile = "${noticesDir}/NOTICE-SDK"
inputs.files(noticeBaseFile, fileTree(noticesDir).include('*.txt'))
- outputs.files(noticeAllJarJarFile, noticeBinZipFile, noticeGrooidFile, noticeGrooidJarJarFile,
+ outputs.files(noticeBinZipFile, noticeGrooidFile, noticeGrooidJarJarFile,
noticeJarJarFile, noticeSrcFile, noticeGroovyConsoleFile, noticeSdkFile)
doLast {
@@ -592,11 +590,10 @@ task updateNotices {
}.sort { it.name }
def binzipFiles = fileTree(noticesDir) {
include '*-JARJAR*.txt'
- include '*-ALLJARJAR*.txt'
include '*-GROOID*.txt'
include '*-BINZIP*.txt'
}.sort { it.name }
- def groovyconsoleFiles = fileTree(noticesDir).include('silkicons-ALLJARJAR-SRC.txt')
+ def groovyconsoleFiles = fileTree(noticesDir).include('silkicons-BINZIP-SRC.txt')
[
(noticeBinZipFile) : binzipFiles,
(noticeGrooidFile) : grooidFiles,
http://git-wip-us.apache.org/repos/asf/groovy/blob/c6d8ebff/licenses/LICENSE-ALLJARJAR
----------------------------------------------------------------------
diff --git a/licenses/LICENSE-ALLJARJAR b/licenses/LICENSE-ALLJARJAR
deleted file mode 100644
index 93e6366..0000000
--- a/licenses/LICENSE-ALLJARJAR
+++ /dev/null
@@ -1,244 +0,0 @@
-
- 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.
-
-------------------------------------------------------------------------
-
-ANTLR 2 License
-
-Antlr2 is released in the public domain.
-See licenses/antlr2-license.txt for details.
-
-------------------------------------------------------------------------
-
-ANTLR 4 License
-
-Antlr4 is released under a BSD 3-clause license.
-See licenses/antlr4-license.txt for details.
-
-------------------------------------------------------------------------
-
-ASM License
-
-ASM uses a 3-clause BSD license. For details, see licenses/asm-license.txt.
-
-------------------------------------------------------------------------
-
-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
-
-------------------------------------------------------------------------
-
-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. Details: licenses/normalize-stylesheet-license.txt
http://git-wip-us.apache.org/repos/asf/groovy/blob/c6d8ebff/licenses/LICENSE-BINZIP
----------------------------------------------------------------------
diff --git a/licenses/LICENSE-BINZIP b/licenses/LICENSE-BINZIP
index 065d20c..11ac39a 100644
--- a/licenses/LICENSE-BINZIP
+++ b/licenses/LICENSE-BINZIP
@@ -226,14 +226,14 @@ ASM uses a 3-clause BSD license. For details, see licenses/asm-license.txt.
Hamcrest License (needed when using optional JUnit dependency)
This product bundles the Hamcrest jar, which is available under a
-BSD license. For details, see licenses/hamcrest-license.
+BSD license. For details, see licenses/hamcrest-license.txt.
------------------------------------------------------------------------
JLine2 License (optional dependency used with groovysh)
This product bundles the JLine2 jar, which is available under a
-BSD License. For details, see licenses/jline2-license.
+BSD License. For details, see licenses/jline2-license.txt.
------------------------------------------------------------------------
@@ -241,7 +241,7 @@ JSR166y License (optionally used by the optional GPars dependency)
This product bundles the jsr166y jar (containing works from
the JSR-166 EG, Doug Lea, and Jason T. Greene) made available in
-the public domain. For details, see licenses/jsr166y-license.
+the public domain. For details, see licenses/jsr166y-license.txt.
------------------------------------------------------------------------
@@ -262,10 +262,10 @@ has a BSD-style license. Details can be found in: licenses/jsr223-license.txt
JUnit Licenses (optional dependencies when using Groovy for testing)
This product bundles the JUnit 4 jar, which is available under the
-Eclipse Public License v1.0. For details, see licenses/junit4-license.
+Eclipse Public License v1.0. For details, see licenses/junit4-license.txt.
This product bundles several JUnit 5 jars, which are available under the
-Eclipse Public License v2.0. For details, see licenses/junit5-license.
+Eclipse Public License v2.0. For details, see licenses/junit5-license.txt.
------------------------------------------------------------------------
@@ -273,11 +273,12 @@ 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. Details: licenses/normalize-stylesheet-license.txt
+It is made available under a MIT License:
+licenses/normalize-stylesheet-license.txt
------------------------------------------------------------------------
XStream License (optional dependency when serializing AST as XML)
This product bundles the XStream jar, which is available under a
-"3-clause BSD" license. For details, see licenses/xstream-license.
+"3-clause BSD" license. For details, see licenses/xstream-license.txt.
http://git-wip-us.apache.org/repos/asf/groovy/blob/c6d8ebff/licenses/LICENSE-DOC
----------------------------------------------------------------------
diff --git a/licenses/LICENSE-DOC b/licenses/LICENSE-DOC
index 26bec2f..b72eeb2 100644
--- a/licenses/LICENSE-DOC
+++ b/licenses/LICENSE-DOC
@@ -226,4 +226,5 @@ 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. Details: licenses/normalize-stylesheet-license.txt
+It is made available under a MIT License:
+licenses/normalize-stylesheet-license.txt
http://git-wip-us.apache.org/repos/asf/groovy/blob/c6d8ebff/licenses/LICENSE-SDK
----------------------------------------------------------------------
diff --git a/licenses/LICENSE-SDK b/licenses/LICENSE-SDK
index 2ba84ff..5f3386d 100644
--- a/licenses/LICENSE-SDK
+++ b/licenses/LICENSE-SDK
@@ -226,14 +226,14 @@ ASM uses a 3-clause BSD license. For details, see licenses/asm-license.txt.
Hamcrest License (needed when using optional JUnit dependency)
This product bundles the Hamcrest jar, which is available under a
-BSD license. For details, see licenses/hamcrest-license.
+BSD license. For details, see licenses/hamcrest-license.txt.
------------------------------------------------------------------------
JLine2 License (optional dependency used with groovysh)
This product bundles the JLine2 jar, which is available under a
-BSD License. For details, see licenses/jline2-license.
+BSD License. For details, see licenses/jline2-license.txt.
------------------------------------------------------------------------
@@ -241,7 +241,7 @@ JSR166y License (optionally used by the optional GPars dependency)
This product bundles the jsr166y jar (containing works from
the JSR-166 EG, Doug Lea, and Jason T. Greene) made available in
-the public domain. For details, see licenses/jsr166y-license.
+the public domain. For details, see licenses/jsr166y-license.txt.
------------------------------------------------------------------------
@@ -262,10 +262,10 @@ has a BSD-style license. Details can be found in: licenses/jsr223-license.txt
JUnit Licenses (optional dependencies when using Groovy for testing)
This product bundles the JUnit 4 jar, which is available under the
-Eclipse Public License v1.0. For details, see licenses/junit4-license.
+Eclipse Public License v1.0. For details, see licenses/junit4-license.txt.
This product bundles several JUnit 5 jars, which are available under the
-Eclipse Public License v2.0. For details, see licenses/junit5-license.
+Eclipse Public License v2.0. For details, see licenses/junit5-license.txt.
------------------------------------------------------------------------
@@ -273,14 +273,15 @@ 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. Details: licenses/normalize-stylesheet-license.txt
+It is made available under a MIT License:
+licenses/normalize-stylesheet-license.txt
------------------------------------------------------------------------
XStream License (optional dependency when serializing AST as XML)
This product bundles the XStream jar, which is available under a
-"3-clause BSD" license. For details, see licenses/xstream-license.
+"3-clause BSD" license. For details, see licenses/xstream-license.txt.
------------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/c6d8ebff/licenses/hamcrest-BINZIP.txt
----------------------------------------------------------------------
diff --git a/licenses/hamcrest-BINZIP.txt b/licenses/hamcrest-BINZIP.txt
index ac41d6b..8cdf32a 100644
--- a/licenses/hamcrest-BINZIP.txt
+++ b/licenses/hamcrest-BINZIP.txt
@@ -1,4 +1,4 @@
Hamcrest License (needed when using optional JUnit dependency)
This product bundles the Hamcrest jar, which is available under a
-BSD license. For details, see licenses/hamcrest-license.
+BSD license. For details, see licenses/hamcrest-license.txt.
http://git-wip-us.apache.org/repos/asf/groovy/blob/c6d8ebff/licenses/jline2-BINZIP.txt
----------------------------------------------------------------------
diff --git a/licenses/jline2-BINZIP.txt b/licenses/jline2-BINZIP.txt
index 68d4d9c..dd3b3ab 100644
--- a/licenses/jline2-BINZIP.txt
+++ b/licenses/jline2-BINZIP.txt
@@ -1,4 +1,4 @@
JLine2 License (optional dependency used with groovysh)
This product bundles the JLine2 jar, which is available under a
-BSD License. For details, see licenses/jline2-license.
+BSD License. For details, see licenses/jline2-license.txt.
http://git-wip-us.apache.org/repos/asf/groovy/blob/c6d8ebff/licenses/jsr166y-BINZIP.txt
----------------------------------------------------------------------
diff --git a/licenses/jsr166y-BINZIP.txt b/licenses/jsr166y-BINZIP.txt
index b97d03c..f4ffd07 100644
--- a/licenses/jsr166y-BINZIP.txt
+++ b/licenses/jsr166y-BINZIP.txt
@@ -2,4 +2,4 @@ JSR166y License (optionally used by the optional GPars dependency)
This product bundles the jsr166y jar (containing works from
the JSR-166 EG, Doug Lea, and Jason T. Greene) made available in
-the public domain. For details, see licenses/jsr166y-license.
+the public domain. For details, see licenses/jsr166y-license.txt.
http://git-wip-us.apache.org/repos/asf/groovy/blob/c6d8ebff/licenses/jsr223-ALLJARJAR-SRC.txt
----------------------------------------------------------------------
diff --git a/licenses/jsr223-ALLJARJAR-SRC.txt b/licenses/jsr223-ALLJARJAR-SRC.txt
deleted file mode 100644
index a9504cb..0000000
--- a/licenses/jsr223-ALLJARJAR-SRC.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-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
http://git-wip-us.apache.org/repos/asf/groovy/blob/c6d8ebff/licenses/jsr223-BINZIP-SRC.txt
----------------------------------------------------------------------
diff --git a/licenses/jsr223-BINZIP-SRC.txt b/licenses/jsr223-BINZIP-SRC.txt
new file mode 100644
index 0000000..a9504cb
--- /dev/null
+++ b/licenses/jsr223-BINZIP-SRC.txt
@@ -0,0 +1,11 @@
+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
http://git-wip-us.apache.org/repos/asf/groovy/blob/c6d8ebff/licenses/junit-BINZIP.txt
----------------------------------------------------------------------
diff --git a/licenses/junit-BINZIP.txt b/licenses/junit-BINZIP.txt
index 87a82c6..f3ac95f 100644
--- a/licenses/junit-BINZIP.txt
+++ b/licenses/junit-BINZIP.txt
@@ -1,7 +1,7 @@
JUnit Licenses (optional dependencies when using Groovy for testing)
This product bundles the JUnit 4 jar, which is available under the
-Eclipse Public License v1.0. For details, see licenses/junit4-license.
+Eclipse Public License v1.0. For details, see licenses/junit4-license.txt.
This product bundles several JUnit 5 jars, which are available under the
-Eclipse Public License v2.0. For details, see licenses/junit5-license.
+Eclipse Public License v2.0. For details, see licenses/junit5-license.txt.
http://git-wip-us.apache.org/repos/asf/groovy/blob/c6d8ebff/licenses/normalize-stylesheet-ALLJARJAR-DOC-SRC.txt
----------------------------------------------------------------------
diff --git a/licenses/normalize-stylesheet-ALLJARJAR-DOC-SRC.txt b/licenses/normalize-stylesheet-ALLJARJAR-DOC-SRC.txt
deleted file mode 100644
index ddb8aa2..0000000
--- a/licenses/normalize-stylesheet-ALLJARJAR-DOC-SRC.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-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. Details: licenses/normalize-stylesheet-license.txt
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/groovy/blob/c6d8ebff/licenses/normalize-stylesheet-BINZIP-DOC-SRC.txt
----------------------------------------------------------------------
diff --git a/licenses/normalize-stylesheet-BINZIP-DOC-SRC.txt b/licenses/normalize-stylesheet-BINZIP-DOC-SRC.txt
new file mode 100644
index 0000000..406e0a3
--- /dev/null
+++ b/licenses/normalize-stylesheet-BINZIP-DOC-SRC.txt
@@ -0,0 +1,6 @@
+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
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/groovy/blob/c6d8ebff/licenses/readme.txt
----------------------------------------------------------------------
diff --git a/licenses/readme.txt b/licenses/readme.txt
index 82bbb5f..8576c8e 100644
--- a/licenses/readme.txt
+++ b/licenses/readme.txt
@@ -3,7 +3,6 @@ See the assemble.gradle file (updateLicenses task) for details on how this is do
Snippets have predefined suffix values in their name to determine which files they go into.
LICENSE (the one for source), LICENSE-DOC and LICENSE-JARJAR
get snippets containing SRC, DOC and JARJAR respectively.
-LICENSE-ALLJARJAR gets JARJAR and ALLJARJAR snippets.
-LICENSE-BINZIP gets JARJAR, ALLJARJAR and BINZIP snippets.
+LICENSE-BINZIP gets JARJAR and BINZIP snippets.
In addition, LICENSE files are generated for these subprojects:
groovy-docgenerator, groovy-groovydoc, groovy-groovysh, groovy-jsr223
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/groovy/blob/c6d8ebff/licenses/xstream-BINZIP.txt
----------------------------------------------------------------------
diff --git a/licenses/xstream-BINZIP.txt b/licenses/xstream-BINZIP.txt
index 5b15c07..9785e82 100644
--- a/licenses/xstream-BINZIP.txt
+++ b/licenses/xstream-BINZIP.txt
@@ -1,4 +1,4 @@
XStream License (optional dependency when serializing AST as XML)
This product bundles the XStream jar, which is available under a
-"3-clause BSD" license. For details, see licenses/xstream-license.
\ No newline at end of file
+"3-clause BSD" license. For details, see licenses/xstream-license.txt.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/groovy/blob/c6d8ebff/notices/NOTICE-ALLJARJAR
----------------------------------------------------------------------
diff --git a/notices/NOTICE-ALLJARJAR b/notices/NOTICE-ALLJARJAR
deleted file mode 100644
index 450d991..0000000
--- a/notices/NOTICE-ALLJARJAR
+++ /dev/null
@@ -1,16 +0,0 @@
-Apache Groovy
-Copyright 2003-2017 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-This product includes/uses ANTLR2 (http://www.antlr2.org/)
-developed by Terence Parr 1989-2006
-
-This product includes/uses ANTLR4 (https://github.com/antlr/antlr4)
-Copyright (c) 2012-2017 The ANTLR Project. All rights reserved.
-
-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/
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/groovy/blob/c6d8ebff/notices/readme.txt
----------------------------------------------------------------------
diff --git a/notices/readme.txt b/notices/readme.txt
index 7a9f9a7..a207e76 100644
--- a/notices/readme.txt
+++ b/notices/readme.txt
@@ -4,7 +4,6 @@ Snippets have predefined suffix values in their name to determine which files th
NOTICE (the one for source), NOTICE-DOC, NOTICE-GROOID and NOTICE-JARJAR
get snippets containing SRC, DOC, GROOID and JARJAR respectively.
NOTICE-GROOIDJARJAR gets JARJAR and GROOID snippets.
-NOTICE-ALLJARJAR gets JARJAR and ALLJARJAR snippets.
-NOTICE-BINZIP gets GROOID, JARJAR, ALLJARJAR and BINZIP snippets.
+NOTICE-BINZIP gets GROOID, JARJAR and BINZIP snippets.
In addition, NOTICE files are generated for these subprojects:
groovy-console
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/groovy/blob/c6d8ebff/notices/silkicons-ALLJARJAR-SRC.txt
----------------------------------------------------------------------
diff --git a/notices/silkicons-ALLJARJAR-SRC.txt b/notices/silkicons-ALLJARJAR-SRC.txt
deleted file mode 100644
index ccef93f..0000000
--- a/notices/silkicons-ALLJARJAR-SRC.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-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/
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/groovy/blob/c6d8ebff/notices/silkicons-BINZIP-SRC.txt
----------------------------------------------------------------------
diff --git a/notices/silkicons-BINZIP-SRC.txt b/notices/silkicons-BINZIP-SRC.txt
new file mode 100644
index 0000000..ccef93f
--- /dev/null
+++ b/notices/silkicons-BINZIP-SRC.txt
@@ -0,0 +1,4 @@
+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/
\ No newline at end of file