From 15d29d79824a177cb6acc7ee86f2c3e79ec4ecaf Mon Sep 17 00:00:00 2001 From: Clinton Date: Wed, 11 Oct 2017 12:41:11 +0100 Subject: [PATCH] Fixed the dozens of artifactory warnings at gradle initialisation. (#1862) * Fixed the dozens of artifactory warnings at gradle initialisation. --- build.gradle | 8 ++++++-- constants.properties | 2 +- .../net/corda/plugins/ProjectPublishExtension.groovy | 7 +++++++ 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 31740da52f..ca5904ba95 100644 --- a/build.gradle +++ b/build.gradle @@ -293,12 +293,16 @@ artifactory { publish { contextUrl = 'https://ci-artifactory.corda.r3cev.com/artifactory' repository { - repoKey = 'corda-releases' + repoKey = 'corda-dev' username = 'teamcity' password = System.getenv('CORDA_ARTIFACTORY_PASSWORD') } + defaults { - publications('corda-jfx', 'corda-mock', 'corda-rpc', 'corda-core', 'corda', 'cordform-common', 'corda-finance', 'corda-node', 'corda-node-api', 'corda-test-common', 'corda-test-utils', 'corda-jackson', 'corda-verifier', 'corda-webserver-impl', 'corda-webserver', 'corda-node-driver', 'corda-confidential-identities') + // Root project applies the plugin (for this block) but does not need to be published + if(project != rootProject) { + publications(project.extensions.publish.name()) + } } } } diff --git a/constants.properties b/constants.properties index f0fbe73c08..deebebf5d5 100644 --- a/constants.properties +++ b/constants.properties @@ -1,4 +1,4 @@ -gradlePluginsVersion=2.0.2 +gradlePluginsVersion=2.0.3 kotlinVersion=1.1.50 guavaVersion=21.0 bouncycastleVersion=1.57 diff --git a/gradle-plugins/publish-utils/src/main/groovy/net/corda/plugins/ProjectPublishExtension.groovy b/gradle-plugins/publish-utils/src/main/groovy/net/corda/plugins/ProjectPublishExtension.groovy index ee978bdbb8..97029028e3 100644 --- a/gradle-plugins/publish-utils/src/main/groovy/net/corda/plugins/ProjectPublishExtension.groovy +++ b/gradle-plugins/publish-utils/src/main/groovy/net/corda/plugins/ProjectPublishExtension.groovy @@ -15,6 +15,13 @@ class ProjectPublishExtension { task.setPublishName(name) } + /** + * Get the publishing name for this project. + */ + String name() { + return task.getPublishName() + } + /** * True when we do not want to publish default Java components */