You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@groovy.apache.org by cc...@apache.org on 2015/06/06 13:33:32 UTC

incubator-groovy git commit: Use apache-groovy for basename of distribution artifacts

Repository: incubator-groovy
Updated Branches:
  refs/heads/GROOVY_2_4_X 1bbed25aa -> 55865b544


Use apache-groovy for basename of distribution artifacts


Project: http://git-wip-us.apache.org/repos/asf/incubator-groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-groovy/commit/55865b54
Tree: http://git-wip-us.apache.org/repos/asf/incubator-groovy/tree/55865b54
Diff: http://git-wip-us.apache.org/repos/asf/incubator-groovy/diff/55865b54

Branch: refs/heads/GROOVY_2_4_X
Commit: 55865b544da6372091b0818d77453d0a00fcdac0
Parents: 1bbed25
Author: Cedric Champeau <cc...@apache.org>
Authored: Sat Jun 6 13:32:49 2015 +0200
Committer: Cedric Champeau <cc...@apache.org>
Committed: Sat Jun 6 13:32:49 2015 +0200

----------------------------------------------------------------------
 gradle/assemble.gradle | 4 ++++
 gradle/bintray.gradle  | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/55865b54/gradle/assemble.gradle
----------------------------------------------------------------------
diff --git a/gradle/assemble.gradle b/gradle/assemble.gradle
index d4b69a1..b836b39 100644
--- a/gradle/assemble.gradle
+++ b/gradle/assemble.gradle
@@ -488,6 +488,7 @@ ext.distSpec = copySpec {
 }
 
 task distBin(type: Zip, dependsOn: [jar, jarAllAll, replaceJarWithJarJar]) {
+    baseName = 'apache-groovy'
     appendix = 'binary'
     into("groovy-$version") {
         with distSpec
@@ -496,6 +497,7 @@ task distBin(type: Zip, dependsOn: [jar, jarAllAll, replaceJarWithJarJar]) {
 }
 
 task distDoc(type: Zip, dependsOn: doc) {
+    baseName = 'apache-groovy'
     appendix = 'docs'
     into("groovy-$version")
     with docSpec
@@ -516,6 +518,7 @@ task syncDoc(type: Copy, dependsOn: doc) {
 }
 
 task distSrc(type: Zip) {
+    baseName = 'apache-groovy'
     appendix = 'src'
     classifier = 'incubating'
     into("groovy-$version")
@@ -539,6 +542,7 @@ task installGroovy(type: Sync, dependsOn: distBin) {
 
 task dist(type: Zip, dependsOn: [distBin, distSrc, distDoc, syncDoc]) {
     description = 'Generates the binary, sources, documentation and full distributions'
+    baseName = 'apache-groovy'
     appendix 'sdk'
     into "groovy-$version"
     with distSpec

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/55865b54/gradle/bintray.gradle
----------------------------------------------------------------------
diff --git a/gradle/bintray.gradle b/gradle/bintray.gradle
index 618dae4..5a0817b 100644
--- a/gradle/bintray.gradle
+++ b/gradle/bintray.gradle
@@ -72,7 +72,7 @@ artifactoryPublish {
                 gradleDeployDetails(new DefaultPublishArtifact("groovy-all", "pom", "pom", null,
                         curDate, file("$projectDir/target/poms/pom-all.xml")), 'artifacts', "org/codehaus/groovy/groovy-all/${version}/groovy-all-${version}.pom"),
                 gradleDeployDetails(new DefaultPublishArtifact("groovy-binary", "zip", "zip", null,
-                        curDate, file("$projectDir/target/distributions/groovy-binary-${version}.zip")), 'artifacts', "org/codehaus/groovy/groovy-binary/${version}/groovy-binary-${version}.zip"),
+                        curDate, distBin.archivePath), 'artifacts', "org/codehaus/groovy/groovy-binary/${version}/groovy-binary-${version}.zip"),
                 gradleDeployDetails(new DefaultPublishArtifact("groovy-binary", "pom", "pom", null,
                         curDate, file("$projectDir/target/poms/pom-binary.xml")), 'artifacts', "org/codehaus/groovy/groovy-binary/${version}/groovy-binary-${version}.pom"),