From 6b0ab680e7bc272cfb9e31c9d9ad45c4e8b3f9a5 Mon Sep 17 00:00:00 2001 From: Armel Soro Date: Thu, 4 Mar 2021 00:30:44 +0100 Subject: [PATCH] chore(#213): Add defaults for publication-related tasks Otherwise, Gradle Configuration phase may not pass --- build.gradle | 6 +++--- callbacks/maoni-doorbell/build.gradle | 4 ++-- callbacks/maoni-email/build.gradle | 4 ++-- callbacks/maoni-github/build.gradle | 4 ++-- callbacks/maoni-jira/build.gradle | 4 ++-- callbacks/maoni-slack/build.gradle | 4 ++-- maoni-common/build.gradle | 4 ++-- maoni/build.gradle | 4 ++-- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/build.gradle b/build.gradle index 9c483fc0..500df298 100644 --- a/build.gradle +++ b/build.gradle @@ -154,9 +154,9 @@ nexusPublishing { // packageGroup = "org.rm3l" //defaults to 'project.group' repositories { sonatype { - stagingProfileId = sonatypeStagingProfileId ?: '' - username = ossrhUsername ?: '' - password = ossrhPassword ?: '' + stagingProfileId = project.ext.has('sonatypeStagingProfileId') ? project.ext.sonatypeStagingProfileId : '' + username = project.ext.has('ossrhUsername') ? project.ext.ossrhUsername : '' + password = project.ext.has('ossrhPassword') ? project.ext.ossrhPassword : '' } } } diff --git a/callbacks/maoni-doorbell/build.gradle b/callbacks/maoni-doorbell/build.gradle index a1e5acae..81462cde 100644 --- a/callbacks/maoni-doorbell/build.gradle +++ b/callbacks/maoni-doorbell/build.gradle @@ -158,8 +158,8 @@ publishing { name = "sonatype" url = "https://oss.sonatype.org/service/local/staging/deploy/maven2/" credentials { - username ossrhUsername - password ossrhPassword + username rootProject.ext.has('ossrhUsername') ? rootProject.ext.ossrhUsername : '' + password rootProject.ext.has('ossrhPassword') ? rootProject.ext.ossrhPassword : '' } } } diff --git a/callbacks/maoni-email/build.gradle b/callbacks/maoni-email/build.gradle index 5ed3233f..df127575 100644 --- a/callbacks/maoni-email/build.gradle +++ b/callbacks/maoni-email/build.gradle @@ -151,8 +151,8 @@ publishing { name = "sonatype" url = "https://oss.sonatype.org/service/local/staging/deploy/maven2/" credentials { - username ossrhUsername - password ossrhPassword + username rootProject.ext.has('ossrhUsername') ? rootProject.ext.ossrhUsername : '' + password rootProject.ext.has('ossrhPassword') ? rootProject.ext.ossrhPassword : '' } } } diff --git a/callbacks/maoni-github/build.gradle b/callbacks/maoni-github/build.gradle index 1dd60a8f..d1d60475 100644 --- a/callbacks/maoni-github/build.gradle +++ b/callbacks/maoni-github/build.gradle @@ -156,8 +156,8 @@ publishing { name = "sonatype" url = "https://oss.sonatype.org/service/local/staging/deploy/maven2/" credentials { - username ossrhUsername - password ossrhPassword + username rootProject.ext.has('ossrhUsername') ? rootProject.ext.ossrhUsername : '' + password rootProject.ext.has('ossrhPassword') ? rootProject.ext.ossrhPassword : '' } } } diff --git a/callbacks/maoni-jira/build.gradle b/callbacks/maoni-jira/build.gradle index b9e80ce4..6bce32b5 100644 --- a/callbacks/maoni-jira/build.gradle +++ b/callbacks/maoni-jira/build.gradle @@ -156,8 +156,8 @@ publishing { name = "sonatype" url = "https://oss.sonatype.org/service/local/staging/deploy/maven2/" credentials { - username ossrhUsername - password ossrhPassword + username rootProject.ext.has('ossrhUsername') ? rootProject.ext.ossrhUsername : '' + password rootProject.ext.has('ossrhPassword') ? rootProject.ext.ossrhPassword : '' } } } diff --git a/callbacks/maoni-slack/build.gradle b/callbacks/maoni-slack/build.gradle index 5ae0020a..7a74b480 100644 --- a/callbacks/maoni-slack/build.gradle +++ b/callbacks/maoni-slack/build.gradle @@ -157,8 +157,8 @@ publishing { name = "sonatype" url = "https://oss.sonatype.org/service/local/staging/deploy/maven2/" credentials { - username ossrhUsername - password ossrhPassword + username rootProject.ext.has('ossrhUsername') ? rootProject.ext.ossrhUsername : '' + password rootProject.ext.has('ossrhPassword') ? rootProject.ext.ossrhPassword : '' } } } diff --git a/maoni-common/build.gradle b/maoni-common/build.gradle index 778f27c1..d93d5233 100644 --- a/maoni-common/build.gradle +++ b/maoni-common/build.gradle @@ -148,8 +148,8 @@ publishing { name = "sonatype" url = "https://oss.sonatype.org/service/local/staging/deploy/maven2/" credentials { - username ossrhUsername - password ossrhPassword + username rootProject.ext.has('ossrhUsername') ? rootProject.ext.ossrhUsername : '' + password rootProject.ext.has('ossrhPassword') ? rootProject.ext.ossrhPassword : '' } } } diff --git a/maoni/build.gradle b/maoni/build.gradle index c8e772fd..63fffa2c 100644 --- a/maoni/build.gradle +++ b/maoni/build.gradle @@ -160,8 +160,8 @@ publishing { name = "sonatype" url = "https://oss.sonatype.org/service/local/staging/deploy/maven2/" credentials { - username ossrhUsername - password ossrhPassword + username rootProject.ext.has('ossrhUsername') ? rootProject.ext.ossrhUsername : '' + password rootProject.ext.has('ossrhPassword') ? rootProject.ext.ossrhPassword : '' } } }