You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2015/07/17 13:49:53 UTC
incubator-groovy git commit: some LICENSE improvements (further
tweaks)
Repository: incubator-groovy
Updated Branches:
refs/heads/master 3df7d7239 -> 84cec1342
some LICENSE improvements (further tweaks)
Project: http://git-wip-us.apache.org/repos/asf/incubator-groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-groovy/commit/84cec134
Tree: http://git-wip-us.apache.org/repos/asf/incubator-groovy/tree/84cec134
Diff: http://git-wip-us.apache.org/repos/asf/incubator-groovy/diff/84cec134
Branch: refs/heads/master
Commit: 84cec13423fc9c398b8698c6cfb99b3f47f3afa7
Parents: 3df7d72
Author: Paul King <pa...@asert.com.au>
Authored: Fri Jul 17 21:49:14 2015 +1000
Committer: Paul King <pa...@asert.com.au>
Committed: Fri Jul 17 21:49:14 2015 +1000
----------------------------------------------------------------------
gradle/assemble.gradle | 28 ++++++++++++--------
notices/NOTICE-BASE | 5 ++++
notices/NOTICE-JARJARALL | 4 +++
notices/NOTICE-JSR223 | 9 -------
subprojects/groovy-groovysh/NOTICE | 9 +++++++
.../shell/completion/FileNameCompleter.groovy | 3 +++
subprojects/groovy-jsr223/NOTICE | 9 +++++++
7 files changed, 47 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/84cec134/gradle/assemble.gradle
----------------------------------------------------------------------
diff --git a/gradle/assemble.gradle b/gradle/assemble.gradle
index 467ddec..0951285 100644
--- a/gradle/assemble.gradle
+++ b/gradle/assemble.gradle
@@ -24,7 +24,6 @@ group = 'org.codehaus.groovy'
archivesBaseName = 'groovy'
ext.srcSpec = copySpec {
- from("$projectDir/licenses/LICENSE-BASE")
from(projectDir) {
exclude 'target',
'benchmark',
@@ -51,7 +50,6 @@ ext.srcSpec = copySpec {
'.gradle', // used by Gradle
'buildSrc/.gradle' // used by Gradle
}
- rename { String filename -> filename == 'LICENSE-BASE' ? 'LICENSE' : filename }
}
ext.docSpec = copySpec {
@@ -130,12 +128,12 @@ jar {
dependsOn('dgmConverter')
metaInf {
from("$projectDir/licenses/LICENSE-JARJAR")
- from 'NOTICE'
+ from("$projectDir/notices/NOTICE-JARJAR")
from 'DISCLAIMER'
from('src/main/META-INF/groovy-release-info.properties') {
filter(rootProject.propertiesFilter, org.apache.tools.ant.filters.ReplaceTokens)
}
- rename { String filename -> filename == 'LICENSE-JARJAR' ? 'LICENSE' : filename }
+ rename { String filename -> filename == 'LICENSE-JARJAR' ? 'LICENSE' : filename == 'NOTICE-JARJAR' ? 'NOTICE' : filename }
}
exclude '**/package-info.class', 'META-INF/groovy-release-info.properties'
@@ -252,16 +250,20 @@ allprojects {
}
}
-subprojects {
+subprojects { sp ->
jar {
metaInf {
from "${rootProject.projectDir}/licenses/LICENSE-BASE"
- from "${rootProject.projectDir}/NOTICE"
+ if (file("${projectDir}/NOTICE").exists()) {
+ from "${projectDir}/NOTICE"
+ } else {
+ from "${rootProject.projectDir}/notices/NOTICE-BASE"
+ }
from "${rootProject.projectDir}/DISCLAIMER"
from("${rootProject.projectDir}/src/main/META-INF/groovy-release-info.properties") {
filter(rootProject.propertiesFilter, org.apache.tools.ant.filters.ReplaceTokens)
}
- rename { String filename -> filename == 'LICENSE-BASE' ? 'LICENSE' : filename }
+ rename { String filename -> filename == 'LICENSE-BASE' ? 'LICENSE' : filename == 'NOTICE-BASE' ? 'NOTICE' : filename }
}
exclude '**/package-info.class', 'META-INF/groovy-release-info.properties'
}
@@ -332,6 +334,11 @@ task jarAll(type: Jar, dependsOn: replaceJarWithJarJar) {
def manifestPath = "$ext.metaInfDir/MANIFEST.MF"
manifest.writeTo(manifestPath)
copy {
+ from("$projectDir/notices/NOTICE-JARJARALL")
+ into owner.ext.metaInfDir
+ rename('NOTICE-JARJARALL', 'NOTICE')
+ }
+ copy {
from(mergeModuleDescriptors())
into "$owner.ext.metaInfDir/services"
}
@@ -440,10 +447,9 @@ task groovydocAllJar(type: Jar, dependsOn: groovydocAll) {
ext.distSpec = copySpec {
from("$projectDir/licenses/LICENSE-BINZIP")
- from("$projectDir") {
- include 'NOTICE', 'DISCLAIMER'
- }
- rename { String filename -> filename == 'LICENSE-BINZIP' ? 'LICENSE' : filename }
+ from("$projectDir/notices/NOTICE-BINZIP")
+ from("$projectDir/DISCLAIMER")
+ rename { String filename -> filename == 'LICENSE-BINZIP' ? 'LICENSE' : filename == 'NOTICE-BINZIP' ? 'NOTICE' : filename }
into('lib') {
from jar.archivePath
from {
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/84cec134/notices/NOTICE-BASE
----------------------------------------------------------------------
diff --git a/notices/NOTICE-BASE b/notices/NOTICE-BASE
new file mode 100644
index 0000000..9c7e0c2
--- /dev/null
+++ b/notices/NOTICE-BASE
@@ -0,0 +1,5 @@
+Apache Groovy
+Copyright 2003-2015 The Apache Software Foundation
+
+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/84cec134/notices/NOTICE-JARJARALL
----------------------------------------------------------------------
diff --git a/notices/NOTICE-JARJARALL b/notices/NOTICE-JARJARALL
index 78a0580..4b1e3b0 100644
--- a/notices/NOTICE-JARJARALL
+++ b/notices/NOTICE-JARJARALL
@@ -14,3 +14,7 @@ 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 Jline (http://jline.sourceforge.net)
+Distributed under the BSD license
+Copyright (c) 2002-2006, Marc Prud'hommeaux <mw...@cornell.edu>
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/84cec134/notices/NOTICE-JSR223
----------------------------------------------------------------------
diff --git a/notices/NOTICE-JSR223 b/notices/NOTICE-JSR223
deleted file mode 100644
index bf3e2af..0000000
--- a/notices/NOTICE-JSR223
+++ /dev/null
@@ -1,9 +0,0 @@
-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 includes/uses source files adapted from the JSR-223 reference
-implementation which has the following notice
-Copyright 2006 Sun Microsystems, Inc. All rights reserved.
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/84cec134/subprojects/groovy-groovysh/NOTICE
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovysh/NOTICE b/subprojects/groovy-groovysh/NOTICE
new file mode 100644
index 0000000..0dac283
--- /dev/null
+++ b/subprojects/groovy-groovysh/NOTICE
@@ -0,0 +1,9 @@
+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 includes/uses a source file adapted from the JLine project
+which is distributable under the BSD license and has the following notice
+Copyright (c) 2002-2012, the original author or authors.
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/84cec134/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/FileNameCompleter.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/FileNameCompleter.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/FileNameCompleter.groovy
index 6af805d..9a7b99a 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/FileNameCompleter.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/FileNameCompleter.groovy
@@ -36,6 +36,9 @@ import static jline.internal.Preconditions.checkNotNull
/**
* PATCHED copy from jline 2.12, with
* https://github.com/jline/jline2/issues/90 (no trailing blank)
+ * NOTE: we hope to work with the jline project to have this functionality
+ * absorbed into a future jline release and then remove this file, so keep
+ * that in mind if you are thinking of changing this file.
*
* A file name completer takes the buffer and issues a list of
* potential completions.
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/84cec134/subprojects/groovy-jsr223/NOTICE
----------------------------------------------------------------------
diff --git a/subprojects/groovy-jsr223/NOTICE b/subprojects/groovy-jsr223/NOTICE
new file mode 100644
index 0000000..bf3e2af
--- /dev/null
+++ b/subprojects/groovy-jsr223/NOTICE
@@ -0,0 +1,9 @@
+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 includes/uses source files adapted from the JSR-223 reference
+implementation which has the following notice
+Copyright 2006 Sun Microsystems, Inc. All rights reserved.