groovy-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pa...@apache.org
Subject [3/3] incubator-groovy git commit: further L&N tweaks (generate subproject L&N files)
Date Mon, 20 Jul 2015 11:11:08 GMT
further L&N tweaks (generate subproject L&N files)


Project: http://git-wip-us.apache.org/repos/asf/incubator-groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-groovy/commit/decbe8d9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-groovy/tree/decbe8d9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-groovy/diff/decbe8d9

Branch: refs/heads/GROOVY_2_4_X
Commit: decbe8d970cb0716885cac26ed37d8354a1a7232
Parents: 48020d1
Author: Paul King <paulk@asert.com.au>
Authored: Mon Jul 20 21:03:25 2015 +1000
Committer: paulk <paulk@asert.com.au>
Committed: Mon Jul 20 21:10:43 2015 +1000

----------------------------------------------------------------------
 LICENSE                                         |  35 +++---
 NOTICE                                          |  11 +-
 gradle/assemble.gradle                          | 104 ++++++++++++------
 licenses/LICENSE-ALLJARJAR                      |  91 ++++------------
 licenses/LICENSE-BINZIP                         | 106 +++++--------------
 licenses/LICENSE-DOC                            |  18 ++--
 licenses/LICENSE-JARJAR                         |  10 +-
 licenses/jline-BINZIP.txt                       |  37 -------
 licenses/jline-patch-ALLJARJAR-SRC.txt          |  13 ---
 licenses/jline2-BINZIP.txt                      |  37 +++++++
 licenses/jline2-patch-ALLJARJAR.txt             |  13 +++
 licenses/jline2-patch-SRC.txt                   |  13 +++
 licenses/jsr223-ALLJARJAR-SRC.txt               |  44 --------
 licenses/jsr223-ALLJARJAR.txt                   |  44 ++++++++
 licenses/jsr223-SRC.txt                         |  44 ++++++++
 .../normalize-stylesheet-ALLJARJAR-DOC-SRC.txt  |  24 +++++
 ...rmalize-stylesheet-css-ALLJARJAR-DOC-SRC.txt |  26 -----
 ...normalize-stylesheet-groovy-docgenerator.txt |  25 +++++
 .../normalize-stylesheet-groovy-groovydoc.txt   |  25 +++++
 notices/NOTICE-ALLJARJAR                        |  19 ++--
 notices/NOTICE-BINZIP                           |  17 ++-
 notices/NOTICE-GROOIDJARJAR                     |  19 +++-
 notices/jline-BINZIP.txt                        |   3 -
 notices/jline-patch-ALLJARJAR-SRC.txt           |   3 -
 notices/jline2-BINZIP.txt                       |   3 +
 notices/jline2-patch-ALLJARJAR-SRC.txt          |   3 +
 notices/silkicons-ALLJARJAR-SRC.txt             |   4 +
 subprojects/groovy-console/NOTICE               |  10 ++
 subprojects/groovy-docgenerator/LICENSE         |   9 +-
 subprojects/groovy-docgenerator/NOTICE          |   2 +-
 subprojects/groovy-groovydoc/LICENSE            |   9 +-
 subprojects/groovy-groovydoc/NOTICE             |   2 +-
 subprojects/groovy-groovysh/LICENSE             |  15 ++-
 subprojects/groovy-groovysh/NOTICE              |   4 +-
 subprojects/groovy-jsr223/LICENSE               |  15 +--
 subprojects/groovy-jsr223/NOTICE                |   2 +-
 36 files changed, 464 insertions(+), 395 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/decbe8d9/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index ce18f2d..08e7e82 100644
--- a/LICENSE
+++ b/LICENSE
@@ -201,7 +201,8 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 
----------------------------------------------------------------------
+--------------------------------------------------------------------
+
 ASCIIDOC LICENSE
 
 The following file is used within documentation:
@@ -230,12 +231,13 @@ 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.
 
----------------------------------------------------------------------
-JLine License
+--------------------------------------------------------------------
+
+JLine2 Patch License
 
 The following file in the optional groovy-groovysh component:
 
-    org.codehaus.groovy.tools.shell.completion/FileNameCompleter.java
+    subprojects/groovy-groovysh/org/codehaus/groovy/tools/shell/completion/FileNameCompleter.java
 
 was derived from JLine 2.12, and the following patch:
 https://github.com/jline/jline2/issues/90
@@ -245,7 +247,8 @@ This software is distributable under the BSD license. See the terms of the
 BSD license in the documentation provided with this software.
 http://www.opensource.org/licenses/bsd-license.php
 
----------------------------------------------------------------------
+--------------------------------------------------------------------
+
 JQUERY LICENSE
 
 The following file is used within documentation:
@@ -273,14 +276,15 @@ 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 files in the optional groovy-jsr223 component:
 
-    src/main/org/codehaus/groovy/jsr223/GroovyCompiledScript.java
-    src/main/org/codehaus/groovy/jsr223/GroovyScriptEngineFactory.java
-    src/main/org/codehaus/groovy/jsr223/GroovyScriptEngineImpl.java
+    subprojects/groovy-jsr223/src/main/org/codehaus/groovy/jsr223/GroovyCompiledScript.java
+    subprojects/groovy-jsr223/src/main/org/codehaus/groovy/jsr223/GroovyScriptEngineFactory.java
+    subprojects/groovy-jsr223/src/main/org/codehaus/groovy/jsr223/GroovyScriptEngineImpl.java
 
 were derived from reference implementation files developed by Sun in
 collaboration with the Groovy community. The reference implementation
@@ -318,13 +322,13 @@ 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 following file (two usages) is used with documentation:
+--------------------------------------------------------------------
+
+NORMALIZE.CSS LICENSE
 
-    org/codehaus/groovy/tools/stylesheet.css
-    org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/stylesheet.css
+The stylesheet.css file (originally normalize.css) is used by the
+groovydoc and docgenerator components for groovy-jdk/gapi documentation.
 
 Copyright (c) Nicolas Gallagher and Jonathan Neal
 
@@ -344,5 +348,4 @@ 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.
----------------------------------------------------------------------
+SOFTWARE.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/decbe8d9/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index a96359b..78bf778 100644
--- a/NOTICE
+++ b/NOTICE
@@ -8,8 +8,8 @@ This product includes/uses software/assets from asciidoctor.org
 use is granted under the terms of the MIT License
 Copyright (c) 2012-2014 Dan Allen, Ryan Waldron and the Asciidoctor Project
 
-This product includes/uses a source file from Jline2 (https://github.com/jline/jline2)
-Distributed under the BSD license
+This product includes/uses a source file adapted from Jline2 (https://github.com/jline/jline2)
+which is distributable under the BSD license and has the following notice
 Copyright (c) 2002-2012, the original author or authors. All rights reserved.
 
 This product includes/uses software/assets from jquery.org
@@ -22,4 +22,9 @@ Copyright 2006 Sun Microsystems, Inc. All rights reserved.
 
 This product includes/uses the git.io/normalize.css stylesheet
 which is distributed under the MIT license
-Copyright (c) Nicolas Gallagher and Jonathan Neal
\ No newline at end of file
+Copyright (c) Nicolas Gallagher and Jonathan Neal
+
+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/incubator-groovy/blob/decbe8d9/gradle/assemble.gradle
----------------------------------------------------------------------
diff --git a/gradle/assemble.gradle b/gradle/assemble.gradle
index 26dd71f..33ada5b 100644
--- a/gradle/assemble.gradle
+++ b/gradle/assemble.gradle
@@ -572,41 +572,55 @@ task dist(type: Zip, dependsOn: [distBin, distSrc, distDoc, syncDoc]) {
 }
 
 task updateLicenses {
-    description = 'Updates the LICENSE (SRC), LICENSE-ALLJARJAR, LICENSE-BINZIP, LICENSE-DOC and LICENSE-JARJAR files'
+    description = 'Updates the various LICENSE files'
     ext.licensesDir = "${projectDir}/licenses"
     ext.licenseBaseFile = "${licensesDir}/LICENSE-BASE"
 
     ext.licenseSrcFile = "${projectDir}/LICENSE"
+    ext.licenseDocGeneratorFile = "${projectDir}/subprojects/groovy-docgenerator/LICENSE"
+    ext.licenseGroovyDocFile = "${projectDir}/subprojects/groovy-groovydoc/LICENSE"
+    ext.licenseGroovyshFile = "${projectDir}/subprojects/groovy-groovysh/LICENSE"
+    ext.licenseJsr223File = "${projectDir}/subprojects/groovy-jsr223/LICENSE"
     ext.licenseAllJarJarFile = "${licensesDir}/LICENSE-ALLJARJAR"
     ext.licenseBinZipFile = "${licensesDir}/LICENSE-BINZIP"
     ext.licenseDocFile = "${licensesDir}/LICENSE-DOC"
     ext.licenseJarJarFile = "${licensesDir}/LICENSE-JARJAR"
     inputs.files(licenseBaseFile, fileTree(licensesDir).include('*.txt'))
-    outputs.files(licenseAllJarJarFile, licenseBinZipFile, licenseDocFile, licenseJarJarFile, licenseSrcFile)
+    outputs.files(licenseAllJarJarFile, licenseBinZipFile, licenseDocFile,
+            licenseJarJarFile, licenseSrcFile, licenseDocGeneratorFile,
+            licenseGroovyDocFile, licenseGroovyshFile, licenseJsr223File)
 
     doLast {
-        def srcFiles = [file(licenseBaseFile)] + fileTree(licensesDir).include('*-SRC*.txt').sort { it.name }
-        def docFiles = [file(licenseBaseFile)] + fileTree(licensesDir).include('*-DOC*.txt').sort { it.name }
-        def jarjarFiles = [file(licenseBaseFile)] + fileTree(licensesDir).include('*-JARJAR*.txt').sort { it.name }
-        def allJarjarFiles = [file(licenseBaseFile)] + fileTree(licensesDir) {
-            include '*-SRC*.txt'
+        def srcFiles = fileTree(licensesDir).include('*-SRC*.txt').sort { it.name }
+        def docFiles = fileTree(licensesDir).include('*-DOC*.txt').sort { it.name }
+        def jarjarFiles = fileTree(licensesDir).include('*-JARJAR*.txt').sort { it.name }
+        def allJarjarFiles = fileTree(licensesDir) {
             include '*-JARJAR*.txt'
             include '*-ALLJARJAR*.txt'
         }.sort { it.name }
-        def binzipFiles = [file(licenseBaseFile)] + fileTree(licensesDir) {
-            include '*-SRC*.txt'
+        def binzipFiles = fileTree(licensesDir) {
             include '*-JARJAR*.txt'
             include '*-ALLJARJAR*.txt'
             include '*-BINZIP*.txt'
         }.sort { it.name }
-        [(licenseAllJarJarFile): allJarjarFiles,
-         (licenseBinZipFile)   : binzipFiles,
-         (licenseDocFile)      : docFiles,
-         (licenseJarJarFile)   : jarjarFiles,
-         (licenseSrcFile)      : srcFiles].each { outFile, inFiles ->
+        def docgeneratorFiles = fileTree(licensesDir).include('normalize-stylesheet-groovy-docgenerator.txt')
+        def groovydocFiles = fileTree(licensesDir).include('normalize-stylesheet-groovy-groovydoc.txt')
+        def groovyshFiles = fileTree(licensesDir).include('jline2-patch-ALLJARJAR.txt')
+        def jsr223Files = fileTree(licensesDir).include('jsr223-ALLJARJAR.txt')
+        [
+                (licenseAllJarJarFile)  : allJarjarFiles,
+                (licenseBinZipFile)     : binzipFiles,
+                (licenseDocFile)        : docFiles,
+                (licenseJarJarFile)     : jarjarFiles,
+                (licenseSrcFile)        : srcFiles,
+                (licenseDocGeneratorFile): docgeneratorFiles,
+                (licenseGroovyDocFile)   : groovydocFiles,
+                (licenseGroovyshFile)    : groovyshFiles,
+                (licenseJsr223File)      : jsr223Files,
+        ].each { outFile, inFiles ->
             file(outFile).withWriter('utf-8') { writer ->
-                writer << inFiles.collect {
-                    it.text.trim()
+                writer << ([file(licenseBaseFile)] + inFiles).collect {
+                    it.text.replaceAll(/[\n\r]*$/, '')
                 }.join('\n\n--------------------------------------------------------------------\n\n')
             }
         }
@@ -614,11 +628,16 @@ task updateLicenses {
 }
 
 task updateNotices {
-    description = 'Updates the NOTICE (SRC), NOTICE-ALLJARJAR, NOTICE-BINZIP, NOTICE-DOC and NOTICE-JARJAR files'
+    description = 'Updates the various NOTICE files'
     ext.noticesDir = "${projectDir}/notices"
     ext.noticeBaseFile = "${noticesDir}/NOTICE-BASE"
 
     ext.noticeSrcFile = "${projectDir}/NOTICE"
+    ext.noticeDocGeneratorFile = "${projectDir}/subprojects/groovy-docgenerator/NOTICE"
+    ext.noticeGroovyDocFile = "${projectDir}/subprojects/groovy-groovydoc/NOTICE"
+    ext.noticeGroovyConsoleFile = "${projectDir}/subprojects/groovy-console/NOTICE"
+    ext.noticeGroovyshFile = "${projectDir}/subprojects/groovy-groovysh/NOTICE"
+    ext.noticeJsr223File = "${projectDir}/subprojects/groovy-jsr223/NOTICE"
     ext.noticeAllJarJarFile = "${noticesDir}/NOTICE-ALLJARJAR"
     ext.noticeBinZipFile = "${noticesDir}/NOTICE-BINZIP"
     ext.noticeDocFile = "${noticesDir}/NOTICE-DOC"
@@ -626,37 +645,52 @@ task updateNotices {
     ext.noticeGrooidJarJarFile = "${noticesDir}/NOTICE-GROOIDJARJAR"
     ext.noticeJarJarFile = "${noticesDir}/NOTICE-JARJAR"
     inputs.files(noticeBaseFile, fileTree(noticesDir).include('*.txt'))
-    outputs.files(noticeAllJarJarFile, noticeBinZipFile, noticeDocFile, noticeGrooidFile, noticeGrooidJarJarFile, noticeJarJarFile, noticeSrcFile)
+    outputs.files(noticeAllJarJarFile, noticeBinZipFile, noticeDocFile, noticeGrooidFile,
+            noticeGrooidJarJarFile, noticeJarJarFile, noticeSrcFile, noticeDocGeneratorFile,
+            noticeGroovyDocFile, noticeGroovyshFile, noticeJsr223File, noticeGroovyConsoleFile)
 
     doLast {
-        def srcFiles = [file(noticeBaseFile)] + fileTree(noticesDir).include('*-SRC*.txt').sort { it.name }
-        def docFiles = [file(noticeBaseFile)] + fileTree(noticesDir).include('*-DOC*.txt').sort { it.name }
-        def grooidFiles = [file(noticeBaseFile)] + fileTree(noticesDir).include('*-GROOID*.txt').sort { it.name }
-        def jarjarFiles = [file(noticeBaseFile)] + fileTree(noticesDir).include('*-JARJAR*.txt').sort { it.name }
-        def grooidJarjarFiles = [file(noticeBaseFile)] + fileTree(noticesDir) {
+        def srcFiles = fileTree(noticesDir).include('*-SRC*.txt').sort { it.name }
+        def docFiles = fileTree(noticesDir).include('*-DOC*.txt').sort { it.name }
+        def grooidFiles = fileTree(noticesDir).include('*-GROOID*.txt').sort { it.name }
+        def jarjarFiles = fileTree(noticesDir).include('*-JARJAR*.txt').sort { it.name }
+        def grooidJarjarFiles = fileTree(noticesDir) {
             include '*-JARJAR*.txt'
+            include '*-ALLJARJAR*.txt'
             include '*-GROOID*.txt'
         }.sort { it.name }
-        def allJarjarFiles = [file(noticeBaseFile)] + fileTree(noticesDir) {
-            include '*-SRC*.txt'
+        def allJarjarFiles = fileTree(noticesDir) {
             include '*-JARJAR*.txt'
             include '*-ALLJARJAR*.txt'
         }.sort { it.name }
-        def binzipFiles = [file(noticeBaseFile)] + fileTree(noticesDir) {
-            include '*-SRC*.txt'
+        def binzipFiles = fileTree(noticesDir) {
             include '*-JARJAR*.txt'
             include '*-ALLJARJAR*.txt'
             include '*-BINZIP*.txt'
         }.sort { it.name }
-        [(noticeAllJarJarFile)   : allJarjarFiles,
-         (noticeBinZipFile)      : binzipFiles,
-         (noticeDocFile)         : docFiles,
-         (noticeGrooidFile)      : grooidFiles,
-         (noticeGrooidJarJarFile): grooidJarjarFiles,
-         (noticeJarJarFile)      : jarjarFiles,
-         (noticeSrcFile)         : srcFiles].each { outFile, inFiles ->
+        def docgeneratorFiles = fileTree(noticesDir).include('normalize-stylesheet-css-ALLJARJAR-DOC-SRC.txt')
+        def groovyconsoleFiles = fileTree(noticesDir).include('silkicons-ALLJARJAR-SRC.txt')
+        def groovydocFiles = fileTree(noticesDir).include('normalize-stylesheet-css-ALLJARJAR-DOC-SRC.txt')
+        def groovyshFiles = fileTree(noticesDir).include('jline2-patch-ALLJARJAR-SRC.txt')
+        def jsr223Files = fileTree(noticesDir).include('jsr223-ALLJARJAR-SRC.txt')
+        [
+                (noticeAllJarJarFile): allJarjarFiles,
+                (noticeBinZipFile): binzipFiles,
+                (noticeDocFile): docFiles,
+                (noticeGrooidFile): grooidFiles,
+                (noticeGrooidJarJarFile): grooidJarjarFiles,
+                (noticeJarJarFile): jarjarFiles,
+                (noticeSrcFile): srcFiles,
+                (noticeDocGeneratorFile): docgeneratorFiles,
+                (noticeGroovyConsoleFile): groovyconsoleFiles,
+                (noticeGroovyDocFile): groovydocFiles,
+                (noticeGroovyshFile): groovyshFiles,
+                (noticeJsr223File): jsr223Files,
+        ].each { outFile, inFiles ->
             file(outFile).withWriter('utf-8') { writer ->
-                writer << inFiles.collect { it.text.trim() }.join('\n\n')
+                writer << ([file(noticeBaseFile)] + inFiles).collect {
+                    it.text.replaceAll(/[\n\r]*$/, '')
+                }.join('\n\n')
             }
         }
     }

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/decbe8d9/licenses/LICENSE-ALLJARJAR
----------------------------------------------------------------------
diff --git a/licenses/LICENSE-ALLJARJAR b/licenses/LICENSE-ALLJARJAR
index cf17be6..3fd6436 100644
--- a/licenses/LICENSE-ALLJARJAR
+++ b/licenses/LICENSE-ALLJARJAR
@@ -201,7 +201,8 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 
----------------------------------------------------------------------
+--------------------------------------------------------------------
+
 ANTLR 2 License
 
 We reserve no legal rights to the ANTLR--it is fully in the public domain. An individual or company may do
@@ -226,36 +227,8 @@ version 3 or later (this part is not included in the binary JAR files). See [1]
 
 https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=750643#80%22
 
----------------------------------------------------------------------
-ASCIIDOC LICENSE
-
-The following file is used within documentation:
-
-    src/spec/assets/css/style.css
-
-The MIT License
-
-Copyright (C) 2012-2015 Dan Allen, Ryan Waldron and the Asciidoctor Project
-
-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.
+--------------------------------------------------------------------
 
----------------------------------------------------------------------
 ASM 4 License
 
 Copyright (c) 2000-2011 INRIA, France Telecom
@@ -288,12 +261,13 @@ 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.
 
----------------------------------------------------------------------
-JLine Patch License
+--------------------------------------------------------------------
+
+JLine2 Patch License
 
-The following file in the optional groovy-groovysh component:
+The following class within this product:
 
-    org.codehaus.groovy.tools.shell.completion/FileNameCompleter.java
+    org.codehaus.groovy.tools.shell.completion.FileNameCompleter
 
 was derived from JLine 2.12, and the following patch:
 https://github.com/jline/jline2/issues/90
@@ -303,42 +277,15 @@ This software is distributable under the BSD license. See the terms of the
 BSD license in the documentation provided with this software.
 http://www.opensource.org/licenses/bsd-license.php
 
----------------------------------------------------------------------
-JQUERY LICENSE
-
-The following file is used within documentation:
-
-    src/spec/assets/css/jquery-2.1.1.min.js
-
-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 files in the optional groovy-jsr223 component:
+The following classes within this product:
 
-    subprojects/groovy-jsr223/src/main/org/codehaus/groovy/jsr223/GroovyCompiledScript.java
-    subprojects/groovy-jsr223/src/main/org/codehaus/groovy/jsr223/GroovyScriptEngineFactory.java
-    subprojects/groovy-jsr223/src/main/org/codehaus/groovy/jsr223/GroovyScriptEngineImpl.java
+    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
@@ -377,13 +324,12 @@ 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 following file (two usages) is used with documentation:
+NORMALIZE.CSS LICENSE
 
-    subprojects/groovy-docgenerator/src/main/resources/org/codehaus/groovy/tools/stylesheet.css
-    subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/stylesheet.css
+The stylesheet.css file (originally normalize.css) is used by the
+groovydoc and docgenerator components for groovy-jdk/gapi documentation.
 
 Copyright (c) Nicolas Gallagher and Jonathan Neal
 
@@ -403,5 +349,4 @@ 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.
----------------------------------------------------------------------
+SOFTWARE.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/decbe8d9/licenses/LICENSE-BINZIP
----------------------------------------------------------------------
diff --git a/licenses/LICENSE-BINZIP b/licenses/LICENSE-BINZIP
index a039909..bd156a4 100644
--- a/licenses/LICENSE-BINZIP
+++ b/licenses/LICENSE-BINZIP
@@ -201,7 +201,8 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 
----------------------------------------------------------------------
+--------------------------------------------------------------------
+
 ANTLR 2 License
 
 We reserve no legal rights to the ANTLR--it is fully in the public domain. An individual or company may do
@@ -226,36 +227,8 @@ version 3 or later (this part is not included in the binary JAR files). See [1]
 
 https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=750643#80%22
 
----------------------------------------------------------------------
-ASCIIDOC LICENSE
-
-The following file is used within documentation:
-
-    src/spec/assets/css/style.css
-
-The MIT License
-
-Copyright (C) 2012-2015 Dan Allen, Ryan Waldron and the Asciidoctor Project
-
-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.
-
----------------------------------------------------------------------
 ASM 4 License
 
 Copyright (c) 2000-2011 INRIA, France Telecom
@@ -288,7 +261,8 @@ 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.
 
----------------------------------------------------------------------
+--------------------------------------------------------------------
+
 Hamcrest License
 
 BSD License
@@ -319,8 +293,9 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
 WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 DAMAGE.
 
----------------------------------------------------------------------
-JLine License
+--------------------------------------------------------------------
+
+JLine2 License
 
 Copyright (c) 2002-2012, the original author or authors.
 All rights reserved.
@@ -357,12 +332,13 @@ 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.
 
----------------------------------------------------------------------
-JLine Patch License
+--------------------------------------------------------------------
+
+JLine2 Patch License
 
-The following file in the optional groovy-groovysh component:
+The following class within this product:
 
-    org.codehaus.groovy.tools.shell.completion/FileNameCompleter.java
+    org.codehaus.groovy.tools.shell.completion.FileNameCompleter
 
 was derived from JLine 2.12, and the following patch:
 https://github.com/jline/jline2/issues/90
@@ -372,42 +348,15 @@ This software is distributable under the BSD license. See the terms of the
 BSD license in the documentation provided with this software.
 http://www.opensource.org/licenses/bsd-license.php
 
----------------------------------------------------------------------
-JQUERY LICENSE
-
-The following file is used within documentation:
-
-    src/spec/assets/css/jquery-2.1.1.min.js
-
-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 files in the optional groovy-jsr223 component:
+The following classes within this product:
 
-    subprojects/groovy-jsr223/src/main/org/codehaus/groovy/jsr223/GroovyCompiledScript.java
-    subprojects/groovy-jsr223/src/main/org/codehaus/groovy/jsr223/GroovyScriptEngineFactory.java
-    subprojects/groovy-jsr223/src/main/org/codehaus/groovy/jsr223/GroovyScriptEngineImpl.java
+    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
@@ -446,7 +395,8 @@ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 DAMAGE.
 
----------------------------------------------------------------------
+--------------------------------------------------------------------
+
 JUnit License
 
 Eclipse Public License - v 1.0
@@ -677,13 +627,12 @@ Eclipse Public License - v 1.0
    one year after the cause of action arose. Each party waives its rights
    to a jury trial in any resulting litigation.
 
----------------------------------------------------------------------
-NORMALIZE.CSS LICENSE
+--------------------------------------------------------------------
 
-The following file (two usages) is used with documentation:
+NORMALIZE.CSS LICENSE
 
-    subprojects/groovy-docgenerator/src/main/resources/org/codehaus/groovy/tools/stylesheet.css
-    subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/stylesheet.css
+The stylesheet.css file (originally normalize.css) is used by the
+groovydoc and docgenerator components for groovy-jdk/gapi documentation.
 
 Copyright (c) Nicolas Gallagher and Jonathan Neal
 
@@ -704,7 +653,9 @@ 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.
----------------------------------------------------------------------
+
+--------------------------------------------------------------------
+
 XSTREAM is made available under a BSD license
 
 Copyright (c) 2003-2006, Joe Walnes
@@ -734,5 +685,4 @@ TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
 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.
----------------------------------------------------------------------
+DAMAGE.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/decbe8d9/licenses/LICENSE-DOC
----------------------------------------------------------------------
diff --git a/licenses/LICENSE-DOC b/licenses/LICENSE-DOC
index 51de03a..9b199e5 100644
--- a/licenses/LICENSE-DOC
+++ b/licenses/LICENSE-DOC
@@ -201,7 +201,8 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 
----------------------------------------------------------------------
+--------------------------------------------------------------------
+
 ASCIIDOC LICENSE
 
 The following file is used within documentation:
@@ -230,7 +231,8 @@ 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
 
 The following file is used within documentation:
@@ -258,13 +260,12 @@ 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.
 
----------------------------------------------------------------------
-NORMALIZE.CSS LICENSE
+--------------------------------------------------------------------
 
-The following file (two usages) is used with documentation:
+NORMALIZE.CSS LICENSE
 
-    subprojects/groovy-docgenerator/src/main/resources/org/codehaus/groovy/tools/stylesheet.css
-    subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/stylesheet.css
+The stylesheet.css file (originally normalize.css) is used by the
+groovydoc and docgenerator components for groovy-jdk/gapi documentation.
 
 Copyright (c) Nicolas Gallagher and Jonathan Neal
 
@@ -284,5 +285,4 @@ 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.
----------------------------------------------------------------------
+SOFTWARE.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/decbe8d9/licenses/LICENSE-JARJAR
----------------------------------------------------------------------
diff --git a/licenses/LICENSE-JARJAR b/licenses/LICENSE-JARJAR
index 7f2d293..b4801eb 100644
--- a/licenses/LICENSE-JARJAR
+++ b/licenses/LICENSE-JARJAR
@@ -201,7 +201,8 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 
----------------------------------------------------------------------
+--------------------------------------------------------------------
+
 ANTLR 2 License
 
 We reserve no legal rights to the ANTLR--it is fully in the public domain. An individual or company may do
@@ -226,7 +227,8 @@ version 3 or later (this part is not included in the binary JAR files). See [1]
 
 https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=750643#80%22
 
----------------------------------------------------------------------
+--------------------------------------------------------------------
+
 ASM 4 License
 
 Copyright (c) 2000-2011 INRIA, France Telecom
@@ -257,6 +259,4 @@ 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.
-
----------------------------------------------------------------------
+THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/decbe8d9/licenses/jline-BINZIP.txt
----------------------------------------------------------------------
diff --git a/licenses/jline-BINZIP.txt b/licenses/jline-BINZIP.txt
deleted file mode 100644
index c4bfec0..0000000
--- a/licenses/jline-BINZIP.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-JLine License
-
-Copyright (c) 2002-2012, the original author or authors.
-All rights reserved.
-
-http://www.opensource.org/licenses/bsd-license.php
-
-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 JLine 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.
-

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/decbe8d9/licenses/jline-patch-ALLJARJAR-SRC.txt
----------------------------------------------------------------------
diff --git a/licenses/jline-patch-ALLJARJAR-SRC.txt b/licenses/jline-patch-ALLJARJAR-SRC.txt
deleted file mode 100644
index 60f6609..0000000
--- a/licenses/jline-patch-ALLJARJAR-SRC.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-JLine Patch License
-
-The following file in the optional groovy-groovysh component:
-
-    org/codehaus/groovy/tools/shell/completion/FileNameCompleter.java
-
-was derived from JLine 2.12, and the following patch:
-https://github.com/jline/jline2/issues/90
-
-Copyright (c) 2002-2012, the original author or authors.
-This software is distributable under the BSD license. See the terms of the
-BSD license in the documentation provided with this software.
-http://www.opensource.org/licenses/bsd-license.php

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/decbe8d9/licenses/jline2-BINZIP.txt
----------------------------------------------------------------------
diff --git a/licenses/jline2-BINZIP.txt b/licenses/jline2-BINZIP.txt
new file mode 100644
index 0000000..0a5b698
--- /dev/null
+++ b/licenses/jline2-BINZIP.txt
@@ -0,0 +1,37 @@
+JLine2 License
+
+Copyright (c) 2002-2012, the original author or authors.
+All rights reserved.
+
+http://www.opensource.org/licenses/bsd-license.php
+
+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 JLine 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.
+

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/decbe8d9/licenses/jline2-patch-ALLJARJAR.txt
----------------------------------------------------------------------
diff --git a/licenses/jline2-patch-ALLJARJAR.txt b/licenses/jline2-patch-ALLJARJAR.txt
new file mode 100644
index 0000000..edbc414
--- /dev/null
+++ b/licenses/jline2-patch-ALLJARJAR.txt
@@ -0,0 +1,13 @@
+JLine2 Patch License
+
+The following class within this product:
+
+    org.codehaus.groovy.tools.shell.completion.FileNameCompleter
+
+was derived from JLine 2.12, and the following patch:
+https://github.com/jline/jline2/issues/90
+
+Copyright (c) 2002-2012, the original author or authors.
+This software is distributable under the BSD license. See the terms of the
+BSD license in the documentation provided with this software.
+http://www.opensource.org/licenses/bsd-license.php

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/decbe8d9/licenses/jline2-patch-SRC.txt
----------------------------------------------------------------------
diff --git a/licenses/jline2-patch-SRC.txt b/licenses/jline2-patch-SRC.txt
new file mode 100644
index 0000000..36a7d38
--- /dev/null
+++ b/licenses/jline2-patch-SRC.txt
@@ -0,0 +1,13 @@
+JLine2 Patch License
+
+The following file in the optional groovy-groovysh component:
+
+    subprojects/groovy-groovysh/org/codehaus/groovy/tools/shell/completion/FileNameCompleter.java
+
+was derived from JLine 2.12, and the following patch:
+https://github.com/jline/jline2/issues/90
+
+Copyright (c) 2002-2012, the original author or authors.
+This software is distributable under the BSD license. See the terms of the
+BSD license in the documentation provided with this software.
+http://www.opensource.org/licenses/bsd-license.php

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/decbe8d9/licenses/jsr223-ALLJARJAR-SRC.txt
----------------------------------------------------------------------
diff --git a/licenses/jsr223-ALLJARJAR-SRC.txt b/licenses/jsr223-ALLJARJAR-SRC.txt
deleted file mode 100644
index 91e7faf..0000000
--- a/licenses/jsr223-ALLJARJAR-SRC.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-JSR223 License
-
-The following files in the optional groovy-jsr223 component:
-
-    subprojects/groovy-jsr223/src/main/org/codehaus/groovy/jsr223/GroovyCompiledScript.java
-    subprojects/groovy-jsr223/src/main/org/codehaus/groovy/jsr223/GroovyScriptEngineFactory.java
-    subprojects/groovy-jsr223/src/main/org/codehaus/groovy/jsr223/GroovyScriptEngineImpl.java
-
-were derived from reference implementation files developed by Sun in
-collaboration with the Groovy community. The reference implementation
-files had the following license:
-
-Copyright (c) 2006, Sun Microsystems, Inc.
-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.

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/decbe8d9/licenses/jsr223-ALLJARJAR.txt
----------------------------------------------------------------------
diff --git a/licenses/jsr223-ALLJARJAR.txt b/licenses/jsr223-ALLJARJAR.txt
new file mode 100644
index 0000000..20ae87c
--- /dev/null
+++ b/licenses/jsr223-ALLJARJAR.txt
@@ -0,0 +1,44 @@
+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
+files had the following license:
+
+Copyright (c) 2006, Sun Microsystems, Inc.
+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.

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/decbe8d9/licenses/jsr223-SRC.txt
----------------------------------------------------------------------
diff --git a/licenses/jsr223-SRC.txt b/licenses/jsr223-SRC.txt
new file mode 100644
index 0000000..91e7faf
--- /dev/null
+++ b/licenses/jsr223-SRC.txt
@@ -0,0 +1,44 @@
+JSR223 License
+
+The following files in the optional groovy-jsr223 component:
+
+    subprojects/groovy-jsr223/src/main/org/codehaus/groovy/jsr223/GroovyCompiledScript.java
+    subprojects/groovy-jsr223/src/main/org/codehaus/groovy/jsr223/GroovyScriptEngineFactory.java
+    subprojects/groovy-jsr223/src/main/org/codehaus/groovy/jsr223/GroovyScriptEngineImpl.java
+
+were derived from reference implementation files developed by Sun in
+collaboration with the Groovy community. The reference implementation
+files had the following license:
+
+Copyright (c) 2006, Sun Microsystems, Inc.
+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.

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/decbe8d9/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
new file mode 100644
index 0000000..f2d4f1c
--- /dev/null
+++ b/licenses/normalize-stylesheet-ALLJARJAR-DOC-SRC.txt
@@ -0,0 +1,24 @@
+NORMALIZE.CSS LICENSE
+
+The stylesheet.css file (originally normalize.css) is used by the
+groovydoc and docgenerator components for groovy-jdk/gapi documentation.
+
+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.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/decbe8d9/licenses/normalize-stylesheet-css-ALLJARJAR-DOC-SRC.txt
----------------------------------------------------------------------
diff --git a/licenses/normalize-stylesheet-css-ALLJARJAR-DOC-SRC.txt b/licenses/normalize-stylesheet-css-ALLJARJAR-DOC-SRC.txt
deleted file mode 100644
index da68b0b..0000000
--- a/licenses/normalize-stylesheet-css-ALLJARJAR-DOC-SRC.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-NORMALIZE.CSS LICENSE
-
-The following file (two usages) is used with documentation:
-
-    subprojects/groovy-docgenerator/src/main/resources/org/codehaus/groovy/tools/stylesheet.css
-    subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/stylesheet.css
-
-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.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/decbe8d9/licenses/normalize-stylesheet-groovy-docgenerator.txt
----------------------------------------------------------------------
diff --git a/licenses/normalize-stylesheet-groovy-docgenerator.txt b/licenses/normalize-stylesheet-groovy-docgenerator.txt
new file mode 100644
index 0000000..d0a6133
--- /dev/null
+++ b/licenses/normalize-stylesheet-groovy-docgenerator.txt
@@ -0,0 +1,25 @@
+NORMALIZE.CSS LICENSE
+
+The following file is used with documentation:
+
+    org/codehaus/groovy/tools/stylesheet.css
+
+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.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/decbe8d9/licenses/normalize-stylesheet-groovy-groovydoc.txt
----------------------------------------------------------------------
diff --git a/licenses/normalize-stylesheet-groovy-groovydoc.txt b/licenses/normalize-stylesheet-groovy-groovydoc.txt
new file mode 100644
index 0000000..e200fa6
--- /dev/null
+++ b/licenses/normalize-stylesheet-groovy-groovydoc.txt
@@ -0,0 +1,25 @@
+NORMALIZE.CSS LICENSE
+
+The following file is used with documentation:
+
+    org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/stylesheet.css
+
+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.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/decbe8d9/notices/NOTICE-ALLJARJAR
----------------------------------------------------------------------
diff --git a/notices/NOTICE-ALLJARJAR b/notices/NOTICE-ALLJARJAR
index 90e0eb4..1af43c8 100644
--- a/notices/NOTICE-ALLJARJAR
+++ b/notices/NOTICE-ALLJARJAR
@@ -7,25 +7,22 @@ The Apache Software Foundation (http://www.apache.org/).
 This product includes/uses ANTLR (http://www.antlr2.org/)
 Developed by Terence Parr 1989-2006
 
-This product includes/uses software/assets from asciidoctor.org
-use is granted under the terms of the MIT License
-Copyright (c) 2012-2014 Dan Allen, Ryan Waldron and the Asciidoctor Project
-
 This product includes/uses ASM (http://asm.ow2.org/)
 Copyright (c) 2000-2011 INRIA, France Telecom. All rights reserved.
 
-This product includes/uses a source file from Jline2 (https://github.com/jline/jline2)
-Distributed under the BSD license
+This product includes/uses a source file adapted from Jline2 (https://github.com/jline/jline2)
+which is distributable under the BSD license and has the following notice
 Copyright (c) 2002-2012, the original author or authors. All rights reserved.
 
-This product includes/uses software/assets from jquery.org
-use is granted under the terms of the MIT License
-Copyright jQuery Foundation and other contributors, https://jquery.org/
-
 This product includes/uses source files adapted from the JSR-223 reference
 implementation which has the following notice
 Copyright 2006 Sun Microsystems, Inc. All rights reserved.
 
 This product includes/uses the git.io/normalize.css stylesheet
 which is distributed under the MIT license
-Copyright (c) Nicolas Gallagher and Jonathan Neal
\ No newline at end of file
+Copyright (c) Nicolas Gallagher and Jonathan Neal
+
+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/incubator-groovy/blob/decbe8d9/notices/NOTICE-BINZIP
----------------------------------------------------------------------
diff --git a/notices/NOTICE-BINZIP b/notices/NOTICE-BINZIP
index 8fdcef5..82a53ca 100644
--- a/notices/NOTICE-BINZIP
+++ b/notices/NOTICE-BINZIP
@@ -7,10 +7,6 @@ The Apache Software Foundation (http://www.apache.org/).
 This product includes/uses ANTLR (http://www.antlr2.org/)
 Developed by Terence Parr 1989-2006
 
-This product includes/uses software/assets from asciidoctor.org
-use is granted under the terms of the MIT License
-Copyright (c) 2012-2014 Dan Allen, Ryan Waldron and the Asciidoctor Project
-
 This product includes/uses ASM (http://asm.ow2.org/)
 Copyright (c) 2000-2011 INRIA, France Telecom. All rights reserved.
 
@@ -22,14 +18,10 @@ This product bundles the Jline2 jar (https://github.com/jline/jline2)
 which is distributed under the BSD license
 Copyright (c) 2002-2012, the original author or authors. All rights reserved.
 
-This product includes/uses a source file from Jline2 (https://github.com/jline/jline2)
-Distributed under the BSD license
+This product includes/uses a source file adapted from Jline2 (https://github.com/jline/jline2)
+which is distributable under the BSD license and has the following notice
 Copyright (c) 2002-2012, the original author or authors. All rights reserved.
 
-This product includes/uses software/assets from jquery.org
-use is granted under the terms of the MIT License
-Copyright jQuery Foundation and other contributors, https://jquery.org/
-
 This product includes/uses source files adapted from the JSR-223 reference
 implementation which has the following notice
 Copyright 2006 Sun Microsystems, Inc. All rights reserved.
@@ -57,6 +49,11 @@ Contribution License Agreement" and for which the following copyright notices ap
 This product bundles the QDox jar (https://github.com/paul-hammant/qdox)
 Copyright 2002-2009 Joe Walnes and QDox Project Team
 
+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/
+
 This product bundles the XStream jar (https://x-stream.github.io)
 which is made available under a BSD license. Copyright (c) 2003-2006, Joe Walnes.
 Copyright (c) 2006-2009, 2011 XStream Committers. All rights reserved.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/decbe8d9/notices/NOTICE-GROOIDJARJAR
----------------------------------------------------------------------
diff --git a/notices/NOTICE-GROOIDJARJAR b/notices/NOTICE-GROOIDJARJAR
index e8b8e34..72d1655 100644
--- a/notices/NOTICE-GROOIDJARJAR
+++ b/notices/NOTICE-GROOIDJARJAR
@@ -10,6 +10,18 @@ Developed by Terence Parr 1989-2006
 This product includes/uses ASM (http://asm.ow2.org/)
 Copyright (c) 2000-2011 INRIA, France Telecom. All rights reserved.
 
+This product includes/uses a source file adapted from Jline2 (https://github.com/jline/jline2)
+which is distributable under the BSD license and has the following notice
+Copyright (c) 2002-2012, the original author or authors. All rights reserved.
+
+This product includes/uses source files adapted from the JSR-223 reference
+implementation which has the following notice
+Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+
+This product includes/uses the git.io/normalize.css stylesheet
+which is distributed under the MIT license
+Copyright (c) Nicolas Gallagher and Jonathan Neal
+
 This product embeds the OpenBeans jar within its grooid jar artifacts
 OpenBeans includes/uses files from Apache Harmony and the following notice applies
 Copyright 2006, 2010 The Apache Software Foundation.
@@ -18,4 +30,9 @@ licensed to the Apache Software Foundation under the "Software Grant and Corpora
 Contribution License Agreement" and for which the following copyright notices apply
     (C) Copyright 2005 Intel Corporation
     (C) Copyright 2005-2006 Intel Corporation
-    (C) Copyright 2006 Intel Corporation
\ No newline at end of file
+    (C) Copyright 2006 Intel Corporation
+
+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/incubator-groovy/blob/decbe8d9/notices/jline-BINZIP.txt
----------------------------------------------------------------------
diff --git a/notices/jline-BINZIP.txt b/notices/jline-BINZIP.txt
deleted file mode 100644
index 115d7ff..0000000
--- a/notices/jline-BINZIP.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-This product bundles the Jline2 jar (https://github.com/jline/jline2)
-which is distributed under the BSD license
-Copyright (c) 2002-2012, the original author or authors. All rights reserved.

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/decbe8d9/notices/jline-patch-ALLJARJAR-SRC.txt
----------------------------------------------------------------------
diff --git a/notices/jline-patch-ALLJARJAR-SRC.txt b/notices/jline-patch-ALLJARJAR-SRC.txt
deleted file mode 100644
index a334bbd..0000000
--- a/notices/jline-patch-ALLJARJAR-SRC.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-This product includes/uses a source file from Jline2 (https://github.com/jline/jline2)
-Distributed under the BSD license
-Copyright (c) 2002-2012, the original author or authors. All rights reserved.

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/decbe8d9/notices/jline2-BINZIP.txt
----------------------------------------------------------------------
diff --git a/notices/jline2-BINZIP.txt b/notices/jline2-BINZIP.txt
new file mode 100644
index 0000000..115d7ff
--- /dev/null
+++ b/notices/jline2-BINZIP.txt
@@ -0,0 +1,3 @@
+This product bundles the Jline2 jar (https://github.com/jline/jline2)
+which is distributed under the BSD license
+Copyright (c) 2002-2012, the original author or authors. All rights reserved.

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/decbe8d9/notices/jline2-patch-ALLJARJAR-SRC.txt
----------------------------------------------------------------------
diff --git a/notices/jline2-patch-ALLJARJAR-SRC.txt b/notices/jline2-patch-ALLJARJAR-SRC.txt
new file mode 100644
index 0000000..fbf6a15
--- /dev/null
+++ b/notices/jline2-patch-ALLJARJAR-SRC.txt
@@ -0,0 +1,3 @@
+This product includes/uses a source file adapted from Jline2 (https://github.com/jline/jline2)
+which is distributable under the BSD license and has the following notice
+Copyright (c) 2002-2012, the original author or authors. All rights reserved.

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/decbe8d9/notices/silkicons-ALLJARJAR-SRC.txt
----------------------------------------------------------------------
diff --git a/notices/silkicons-ALLJARJAR-SRC.txt b/notices/silkicons-ALLJARJAR-SRC.txt
new file mode 100644
index 0000000..ccef93f
--- /dev/null
+++ b/notices/silkicons-ALLJARJAR-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

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/decbe8d9/subprojects/groovy-console/NOTICE
----------------------------------------------------------------------
diff --git a/subprojects/groovy-console/NOTICE b/subprojects/groovy-console/NOTICE
new file mode 100644
index 0000000..6023986
--- /dev/null
+++ b/subprojects/groovy-console/NOTICE
@@ -0,0 +1,10 @@
+Apache Groovy
+Copyright 2003-2015 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/
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/decbe8d9/subprojects/groovy-docgenerator/LICENSE
----------------------------------------------------------------------
diff --git a/subprojects/groovy-docgenerator/LICENSE b/subprojects/groovy-docgenerator/LICENSE
index c98e1d1..56d1400 100644
--- a/subprojects/groovy-docgenerator/LICENSE
+++ b/subprojects/groovy-docgenerator/LICENSE
@@ -200,12 +200,14 @@
    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.
----------------------------------------------------------------------
+
+--------------------------------------------------------------------
+
 NORMALIZE.CSS LICENSE
 
 The following file is used with documentation:
 
-    src/main/resources/org/codehaus/groovy/tools/stylesheet.css
+    org/codehaus/groovy/tools/stylesheet.css
 
 Copyright (c) Nicolas Gallagher and Jonathan Neal
 
@@ -225,5 +227,4 @@ 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.
----------------------------------------------------------------------
+SOFTWARE.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/decbe8d9/subprojects/groovy-docgenerator/NOTICE
----------------------------------------------------------------------
diff --git a/subprojects/groovy-docgenerator/NOTICE b/subprojects/groovy-docgenerator/NOTICE
index 97e79fb..5d50aef 100644
--- a/subprojects/groovy-docgenerator/NOTICE
+++ b/subprojects/groovy-docgenerator/NOTICE
@@ -6,4 +6,4 @@ The Apache Software Foundation (http://www.apache.org/).
 
 This product includes/uses the git.io/normalize.css stylesheet
 which is distributed under the MIT license
-Copyright (c) Nicolas Gallagher and Jonathan Neal
+Copyright (c) Nicolas Gallagher and Jonathan Neal
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/decbe8d9/subprojects/groovy-groovydoc/LICENSE
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovydoc/LICENSE b/subprojects/groovy-groovydoc/LICENSE
index 0202a52..5291f0e 100644
--- a/subprojects/groovy-groovydoc/LICENSE
+++ b/subprojects/groovy-groovydoc/LICENSE
@@ -200,12 +200,14 @@
    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.
----------------------------------------------------------------------
+
+--------------------------------------------------------------------
+
 NORMALIZE.CSS LICENSE
 
 The following file is used with documentation:
 
-    src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/stylesheet.css
+    org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/stylesheet.css
 
 Copyright (c) Nicolas Gallagher and Jonathan Neal
 
@@ -225,5 +227,4 @@ 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.
----------------------------------------------------------------------
+SOFTWARE.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/decbe8d9/subprojects/groovy-groovydoc/NOTICE
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovydoc/NOTICE b/subprojects/groovy-groovydoc/NOTICE
index 97e79fb..5d50aef 100644
--- a/subprojects/groovy-groovydoc/NOTICE
+++ b/subprojects/groovy-groovydoc/NOTICE
@@ -6,4 +6,4 @@ The Apache Software Foundation (http://www.apache.org/).
 
 This product includes/uses the git.io/normalize.css stylesheet
 which is distributed under the MIT license
-Copyright (c) Nicolas Gallagher and Jonathan Neal
+Copyright (c) Nicolas Gallagher and Jonathan Neal
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/decbe8d9/subprojects/groovy-groovysh/LICENSE
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovysh/LICENSE b/subprojects/groovy-groovysh/LICENSE
index 21ab37b..06cbd00 100644
--- a/subprojects/groovy-groovysh/LICENSE
+++ b/subprojects/groovy-groovysh/LICENSE
@@ -200,12 +200,14 @@
    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.
----------------------------------------------------------------------
-JLine Patch License
 
-The following file in the optional groovy-groovysh component:
+--------------------------------------------------------------------
 
-    org.codehaus.groovy.tools.shell.completion/FileNameCompleter.java
+JLine2 Patch License
+
+The following class within this product:
+
+    org.codehaus.groovy.tools.shell.completion.FileNameCompleter
 
 was derived from JLine 2.12, and the following patch:
 https://github.com/jline/jline2/issues/90
@@ -213,7 +215,4 @@ https://github.com/jline/jline2/issues/90
 Copyright (c) 2002-2012, the original author or authors.
 This software is distributable under the BSD license. See the terms of the
 BSD license in the documentation provided with this software.
-http://www.opensource.org/licenses/bsd-license.php
-
----------------------------------------------------------------------
-
+http://www.opensource.org/licenses/bsd-license.php
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/decbe8d9/subprojects/groovy-groovysh/NOTICE
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovysh/NOTICE b/subprojects/groovy-groovysh/NOTICE
index 0dac283..6c0659e 100644
--- a/subprojects/groovy-groovysh/NOTICE
+++ b/subprojects/groovy-groovysh/NOTICE
@@ -4,6 +4,6 @@ Copyright 2003-2015 The Apache Software Foundation
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 
-This product includes/uses a source file adapted from the JLine project
+This product includes/uses a source file adapted from Jline2 (https://github.com/jline/jline2)
 which is distributable under the BSD license and has the following notice
-Copyright (c) 2002-2012, the original author or authors.
+Copyright (c) 2002-2012, the original author or authors. All rights reserved.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/decbe8d9/subprojects/groovy-jsr223/LICENSE
----------------------------------------------------------------------
diff --git a/subprojects/groovy-jsr223/LICENSE b/subprojects/groovy-jsr223/LICENSE
index 8fda1ca..c854df4 100644
--- a/subprojects/groovy-jsr223/LICENSE
+++ b/subprojects/groovy-jsr223/LICENSE
@@ -200,14 +200,16 @@
    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.
----------------------------------------------------------------------
+
+--------------------------------------------------------------------
+
 JSR223 License
 
-The following files in the optional groovy-jsr223 component:
+The following classes within this product:
 
-    src/main/org/codehaus/groovy/jsr223/GroovyCompiledScript.java
-    src/main/org/codehaus/groovy/jsr223/GroovyScriptEngineFactory.java
-    src/main/org/codehaus/groovy/jsr223/GroovyScriptEngineImpl.java
+    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
@@ -244,5 +246,4 @@ 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.
----------------------------------------------------------------------
+DAMAGE.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/decbe8d9/subprojects/groovy-jsr223/NOTICE
----------------------------------------------------------------------
diff --git a/subprojects/groovy-jsr223/NOTICE b/subprojects/groovy-jsr223/NOTICE
index bf3e2af..b6cb3c7 100644
--- a/subprojects/groovy-jsr223/NOTICE
+++ b/subprojects/groovy-jsr223/NOTICE
@@ -6,4 +6,4 @@ The Apache Software Foundation (http://www.apache.org/).
 
 This product includes/uses source files adapted from the JSR-223 reference
 implementation which has the following notice
-Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+Copyright 2006 Sun Microsystems, Inc. All rights reserved.
\ No newline at end of file


Mime
View raw message