From 9dfd6dd795223a4bf19e2c33eb8850de1f29d234 Mon Sep 17 00:00:00 2001
From: Antti Luomi <antti.luomi@id.ethz.ch>
Date: Thu, 31 May 2018 16:33:19 +0200
Subject: [PATCH] SSDM-6643: Fix dependencies
---
openbis_standard_technologies/query-api.gradle | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/openbis_standard_technologies/query-api.gradle b/openbis_standard_technologies/query-api.gradle
index a14a307986a..bde79e7962c 100644
--- a/openbis_standard_technologies/query-api.gradle
+++ b/openbis_standard_technologies/query-api.gradle
@@ -167,19 +167,14 @@ publishing {
}
}
-task "generateDescriptorFileForIvyApiV3" {
- dependsOn "prepublish", "apiV3Jar"
- ext.destination=""
-}
-
task prepublish {
doLast {
if (publishRevision == "-1") {
- throw new GradleException("No publish revision defined. Run this task like: ./gradlew :clean :publishApiV3 -PpublishRevision=S277 -PrepositoryRoot=/Users/juanf/git/openbis/ivy-repository")
+ throw new GradleException("No publish revision defined. Run this task like: ./gradlew clean publishApiV3 -PpublishRevision=S277 -PrepositoryRoot=/Users/juanf/git/openbis/ivy-repository")
}
if (repositoryRoot == "/non-existent") {
- throw new GradleException("No repository root defined. Run this task like: ./gradlew :clean :publishApiV3 -PpublishRevision=S277 -PrepositoryRoot=/Users/juanf/git/openbis/ivy-repository")
+ throw new GradleException("No repository root defined. Run this task like: ./gradlew clean publishApiV3 -PpublishRevision=S277 -PrepositoryRoot=/Users/juanf/git/openbis/ivy-repository")
}
}
}
@@ -187,7 +182,7 @@ task prepublish {
def publishDir=new File("${repositoryRoot}/openbis/openbis-v3-api/${publishRevision}")
task publishApiV3(type: Sync) {
- dependsOn "generateDescriptorFileForIvyApiV3"
+ dependsOn "prepublish", "generateDescriptorFileForIvyApiV3Publication", "apiV3Jar"
doFirst {
publishDir.mkdirs()
}
--
GitLab