tweak assembly of LICENSE and NOTICE files

LICENSE

@@ -199,4 +199,23 @@
  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.
+ limitations under the License.
+
+ APPENDIX: Third-party dependency license terms.
+
+ Apache Groovy includes some subcomponents and dependencies with separate
+ copyright notices and license terms. Your use of the source code for
+ these dependencies is subject to the terms and conditions of the
+ following licenses.
+
+ For the following files in the 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
+ See JSR223-LICENSE.txt
+
+ For ANTLR, see ANTLR-LICENSE.txt
+
+ For ASM, see ASM-LICENSE.txt
+
+ For Apache Commons CLI, see CLI-LICENSE.txt

NOTICE

@@ -1,14 +1,6 @@
- =========================================================================
- == NOTICE file corresponding to the section 4 d of ==
- == the Apache License, Version 2.0, ==
- == in this case for the Groovy Language distribution. ==
- =========================================================================
+ Apache Groovy
+ Copyright 2003-2015 The Apache Software Foundation
 
- Groovy Language
- Copyright 2003-2015 The respective authors and developers
- Developers and Contributors are listed in the project POM file
- and Gradle build file
-
- This product includes software developed by
- The Groovy community (http:https://groovy.codehaus.org/).
+ This product includes software developed at
+ The Apache Software Foundation (http:https://www.apache.org/).
 

gradle/assemble.gradle

@@ -135,7 +135,8 @@ ext.subprojectOsgiManifest = {
 jar {
  dependsOn('dgmConverter')
  metaInf {
- from 'LICENSE.txt'
+ from 'LICENSE'
+ from 'NOTICE'
  from('src/main/META-INF/groovy-release-info.properties') {
  filter(rootProject.propertiesFilter, org.apache.tools.ant.filters.ReplaceTokens)
  }
@@ -181,7 +182,7 @@ allprojects {
  } && ['asm-attr', 'asm-util', 'asm-analysis'].every { !file.name.startsWith(it) }
  }.each { jarjarFile ->
  // GROOVY-7386 : excludes needed below to stop copy of incorrect maven meta info
- zipfileset(src: jarjarFile, excludes: 'META-INF/maven/commons-cli/commons-cli/*')
+ zipfileset(src: jarjarFile, excludes: 'META-INF/maven/commons-cli/commons-cli/*,META-INF/*')
  }
 
  zipfileset(src: configurations.runtime.files.find { file -> file.name.startsWith('asm-util') },
@@ -258,7 +259,8 @@ allprojects {
 subprojects {
  jar {
  metaInf {
- from "${rootProject.projectDir}/LICENSE.txt"
+ from "${rootProject.projectDir}/LICENSE"
+ from "${rootProject.projectDir}/NOTICE"
  from("${rootProject.projectDir}/src/main/META-INF/groovy-release-info.properties") {
  filter(rootProject.propertiesFilter, org.apache.tools.ant.filters.ReplaceTokens)
  }