L&N tweaks: typos and cosmetics

apache · Jul 23, 2015 · 0d5bf05 · 0d5bf05
1 parent 6a9032f
commit 0d5bf05
Show file tree

Hide file tree

Showing 12 changed files with 15 additions and 14 deletions.
diff --git a/LICENSE b/LICENSE
@@ -253,4 +253,4 @@ 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. Details: licenses/normalize-stylesheet-license.txt
diff --git a/gradle/assemble.gradle b/gradle/assemble.gradle
@@ -666,15 +666,15 @@ task updateLicenses {
                 (licenseJsr223File)      : jsr223Files,
         ].each { outFile, inFiles ->
             file(outFile).withWriter('utf-8') { writer ->
-                writer << ([file(licenseBaseFile)] + inFiles).collect { it.text.replaceAll(/[\n\r]*$/, '') }.join(licenseHdr)
+                writer << ([file(licenseBaseFile)] + inFiles).collect { it.text.replaceAll(/[\n\r]*$/, '') }.join(licenseHdr) + '\n'
             }
         }
         file(licenseSdkFile).withWriter { writer ->
             writer << [
                     file(licenseBinZipFile).text,
                     "This convenience zip embeds Groovy's src and doc zips.\nSee also src/LICENSE " +
                             "and doc/LICENSE files for additional license information."
-            ].join(licenseHdr)
+            ].join(licenseHdr) + '\n'
         }
     }
 }

diff --git a/licenses/LICENSE-ALLJARJAR b/licenses/LICENSE-ALLJARJAR
@@ -247,4 +247,4 @@ 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. Details: licenses/normalize-stylesheet-license.txt
diff --git a/licenses/LICENSE-BINZIP b/licenses/LICENSE-BINZIP
@@ -283,4 +283,4 @@ It is made available under a MIT License. Details: licenses/normalize-stylesheet
 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.
diff --git a/licenses/LICENSE-DOC b/licenses/LICENSE-DOC
@@ -226,4 +226,4 @@ 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. Details: licenses/normalize-stylesheet-license.txt
diff --git a/licenses/LICENSE-JARJAR b/licenses/LICENSE-JARJAR
@@ -212,4 +212,4 @@ See licenses/antlr2-license.txt for details.
 
 ASM 4 License
 
-ASM 4 uses a 3-clause BSD license. For details, see licenses/asm-license.txt.
+ASM 4 uses a 3-clause BSD license. For details, see licenses/asm-license.txt.
diff --git a/licenses/LICENSE-SDK b/licenses/LICENSE-SDK
@@ -285,7 +285,8 @@ 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.
 
+
 ------------------------------------------------------------------------
 
 This convenience zip embeds Groovy's src and doc zips.
-See also src/LICENSE and doc/LICENSE files for additional license information.
+See also src/LICENSE and doc/LICENSE files for additional license information.
diff --git a/notices/readme.txt b/notices/readme.txt
@@ -3,8 +3,8 @@ See the assemble.gradle file (updateNotices task) for details on how this is don
 Snippets have predefined suffix values in their name to determine which files they go into.
 NOTICE (the one for source), NOTICE-DOC, NOTICE-GROOID and NOTICE-JARJAR
 get snippets containing SRC, DOC, GROOID and JARJAR respectively.
-NOTICE-GROOIDJARJAR gets ALLJARJAR, JARJAR and GROOID snippets.
+NOTICE-GROOIDJARJAR gets JARJAR and GROOID snippets.
 NOTICE-ALLJARJAR gets JARJAR and ALLJARJAR snippets.
-NOTICE-BINZIP gets JARJAR, ALLJARJAR and BINZIP snippets.
+NOTICE-BINZIP gets GROOID, JARJAR, ALLJARJAR and BINZIP snippets.
 In addition, NOTICE files are generated for these subprojects:
 groovy-console
diff --git a/subprojects/groovy-docgenerator/LICENSE b/subprojects/groovy-docgenerator/LICENSE
@@ -227,4 +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.
diff --git a/subprojects/groovy-groovydoc/LICENSE b/subprojects/groovy-groovydoc/LICENSE
@@ -227,4 +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.
diff --git a/subprojects/groovy-groovysh/LICENSE b/subprojects/groovy-groovysh/LICENSE
@@ -212,4 +212,4 @@ The following class within this product:
 was derived from JLine 2.12, and the following patch:
 https://github.com/jline/jline2/issues/90
 JLine2 is made available under a BSD License.
-For details, see licenses/jline2-license.
+For details, see licenses/jline2-license.
diff --git a/subprojects/groovy-jsr223/LICENSE b/subprojects/groovy-jsr223/LICENSE
@@ -213,4 +213,4 @@ The following classes within this product:
 
 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
+has a BSD-style license. Details can be found in: licenses/jsr223-license.txt