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 2018/01/03 12:21:52 UTC
[1/2] groovy git commit: distBin needs grooid jars plus hush warning
about INDEX.LIST
Repository: groovy
Updated Branches:
refs/heads/GROOVY_2_6_X f53e4d8c7 -> 7bdd68043
distBin needs grooid jars plus hush warning about INDEX.LIST
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/7bdd6804
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/7bdd6804
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/7bdd6804
Branch: refs/heads/GROOVY_2_6_X
Commit: 7bdd6804343a1a45efa96afa1286e6044037200a
Parents: 5dd21e1
Author: paulk <pa...@asert.com.au>
Authored: Wed Jan 3 22:19:21 2018 +1000
Committer: paulk <pa...@asert.com.au>
Committed: Wed Jan 3 22:21:37 2018 +1000
----------------------------------------------------------------------
gradle/assemble.gradle | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/7bdd6804/gradle/assemble.gradle
----------------------------------------------------------------------
diff --git a/gradle/assemble.gradle b/gradle/assemble.gradle
index fa13262..69a13f9 100644
--- a/gradle/assemble.gradle
+++ b/gradle/assemble.gradle
@@ -267,7 +267,7 @@ allprojects {
excludesPerLibrary = [
'*': ['META-INF/NOTICE']
]
- excludes = ['META-INF/NOTICE']
+ excludes = ['META-INF/NOTICE','META-INF/INDEX.LIST']
createManifest = false
includedResources = [
("$rootProject.projectDir/notices/${isRoot ? 'NOTICE-GROOIDJARJAR' : 'NOTICE-GROOID'}".toString()): 'META-INF/NOTICE'
@@ -414,6 +414,11 @@ task distBin(type: Zip) {
into("groovy-$version") {
with distSpec
}
+ allprojects {
+ if (project.name in ['groovy', 'groovy-test']) {
+ distBin.dependsOn(grooidjar)
+ }
+ }
}
task distDoc(type: Zip, dependsOn: doc) {
[2/2] groovy git commit: GROOVY-8429: Jar files under indy directory
of distribution miss the file extension(i.e. jar)
Posted by pa...@apache.org.
GROOVY-8429: Jar files under indy directory of distribution miss the file extension(i.e. jar)
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/5dd21e19
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/5dd21e19
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/5dd21e19
Branch: refs/heads/GROOVY_2_6_X
Commit: 5dd21e1901bf0c9d7f65ae48ee64029876b568cd
Parents: f53e4d8
Author: paulk <pa...@asert.com.au>
Authored: Wed Jan 3 18:45:02 2018 +1000
Committer: paulk <pa...@asert.com.au>
Committed: Wed Jan 3 22:21:37 2018 +1000
----------------------------------------------------------------------
gradle/assemble.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/5dd21e19/gradle/assemble.gradle
----------------------------------------------------------------------
diff --git a/gradle/assemble.gradle b/gradle/assemble.gradle
index 530a39a..fa13262 100644
--- a/gradle/assemble.gradle
+++ b/gradle/assemble.gradle
@@ -342,7 +342,7 @@ ext.distSpec = copySpec {
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
from("$projectDir/licenses/LICENSE-BINZIP")
from("$projectDir/notices/NOTICE-BINZIP")
- rename '([A-Z]+)-(.*)', '$1'
+ rename '([A-Z]+)-BINZIP', '$1'
exclude { it.file.name =~ /-raw/ }
into('lib') {
from jarjar