Repository: incubator-groovy Updated Branches: refs/heads/GROOVY_2_4_X b785cbf8e -> 3822e8197
tweak assembly of LICENSE and NOTICE 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/3822e819 Tree: http://git-wip-us.apache.org/repos/asf/incubator-groovy/tree/3822e819 Diff: http://git-wip-us.apache.org/repos/asf/incubator-groovy/diff/3822e819 Branch: refs/heads/GROOVY_2_4_X Commit: 3822e81975ed7e4e764228dad1328b44523a0584 Parents: b785cbf Author: Paul King <[email protected]> Authored: Sat May 2 13:00:05 2015 +1000 Committer: Paul King <[email protected]> Committed: Sat May 2 13:03:20 2015 +1000 ---------------------------------------------------------------------- LICENSE | 21 ++++++++++++++++++++- NOTICE | 16 ++++------------ gradle/assemble.gradle | 8 +++++--- 3 files changed, 29 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/3822e819/LICENSE ---------------------------------------------------------------------- diff --git a/LICENSE b/LICENSE index 7a4a3ea..21626bc 100644 --- a/LICENSE +++ b/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. \ No newline at end of file + 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 http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/3822e819/NOTICE ---------------------------------------------------------------------- diff --git a/NOTICE b/NOTICE index 4fb9b5c..74961ed 100644 --- a/NOTICE +++ b/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://groovy.codehaus.org/). + This product includes software developed at + The Apache Software Foundation (http://www.apache.org/). http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/3822e819/gradle/assemble.gradle ---------------------------------------------------------------------- diff --git a/gradle/assemble.gradle b/gradle/assemble.gradle index 8622f72..4f2ac7d 100644 --- a/gradle/assemble.gradle +++ b/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) }
