Skip to content

Commit

Permalink
tidy up licenses/notices wrt no longer needing groovy-all jar
Browse files Browse the repository at this point in the history
  • Loading branch information
paulk-asert committed Jul 25, 2018
1 parent 77f74f3 commit c6d8ebf
Show file tree
Hide file tree
Showing 17 changed files with 33 additions and 293 deletions.
3 changes: 2 additions & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -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
9 changes: 3 additions & 6 deletions gradle/assemble.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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 {
Expand All @@ -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,
Expand Down
244 changes: 0 additions & 244 deletions licenses/LICENSE-ALLJARJAR

This file was deleted.

15 changes: 8 additions & 7 deletions licenses/LICENSE-BINZIP
Original file line number Diff line number Diff line change
Expand Up @@ -226,22 +226,22 @@ 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.

------------------------------------------------------------------------

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.

------------------------------------------------------------------------

Expand All @@ -262,22 +262,23 @@ 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.

------------------------------------------------------------------------

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.
3 changes: 2 additions & 1 deletion licenses/LICENSE-DOC
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading

0 comments on commit c6d8ebf

Please sign in to comment.