From 0c0ead404f3cadafa743c3ddf49e52d78bc43b0d Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <marcin.grzejszczak@gmail.com>
Date: Mon, 25 Nov 2019 23:45:02 +0100
Subject: [PATCH] Trying to fix Gradle plugin... again...

---
 .../gradle/release.gradle                              | 10 ++++++++--
 .../spring-cloud-contract-gradle-plugin/pom.xml        |  2 ++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/gradle/release.gradle b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/gradle/release.gradle
index 0071d2ee56..03729ceeea 100644
--- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/gradle/release.gradle
+++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/gradle/release.gradle
@@ -88,8 +88,8 @@ afterEvaluate {
 					beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
 				}
 				// Target repository
-				String repoUserName = isReleaseToCentral ? sonatypeUsername : repoUser
-				String repoPass = isReleaseToCentral ? sonatypePassword : repoPass
+				String repoUserName = isReleaseToCentral ? getProp("SONATYPE_USER") : repoUser
+				String repoPass = isReleaseToCentral ? getProp("SONATYPE_PASSWORD") : repoPass
 				repository(url: repoUrl) {
 					authentication(userName: repoUserName, password: repoPass)
 				}
@@ -135,3 +135,9 @@ afterEvaluate {
 		}
 	}
 }
+
+String getProp(String propName) {
+	return hasProperty(propName) ?
+			(getProperty(propName) ?: System.properties[propName]) : System.properties[propName] ?:
+			System.getenv(propName)
+}
diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/pom.xml
index 8a0b075476..cdeb730ad6 100644
--- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/pom.xml
+++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/pom.xml
@@ -228,6 +228,8 @@
 										<argument>${gradle.task}</argument>
 										<argument>-PverifierVersion=${project.version}</argument>
 										<argument>-Pcentral</argument>
+										<argument>-PsonatypeUsername=${env.SONATYPE_USER}</argument>
+										<argument>-PsonatypePassword=${env.SONATYPE_PASSWORD}</argument>
 										<argument>publishPlugins</argument>
 									</arguments>
 								</configuration>