Fix project to build successfully even credentials.

nitzanj · Amir Tocker · commit 4ab6ab096faf · 2017-06-11T13:55:45.000+03:00
diff --git a/cloudinary-android/build.gradle b/cloudinary-android/build.gradle
@@ -20,10 +20,6 @@ buildscript {
     })
 }
 
-signing {
-    sign configurations.archives
-}
-
 sourceCompatibility = 1.7
 targetCompatibility = 1.7
 tasks.withType(JavaCompile) {
@@ -74,11 +70,11 @@ uploadArchives {
             beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
 
             repository(url: publishRepo) {
-                authentication(userName: ossrhUsername, password: ossrhPassword)
+                authentication(userName: project.hasProperty("ossrhUsername") ? project.ext["ossrhUsername"] : "", password: project.hasProperty("ossrhPassword") ? project.ext["ossrhPassword"] : "")
             }
 
             snapshotRepository(url: snapshotRepo) {
-                authentication(userName: ossrhUsername, password: ossrhPassword)
+                authentication(userName: project.hasProperty("ossrhUsername") ? project.ext["ossrhUsername"] : "", password: project.hasProperty("ossrhPassword") ? project.ext["ossrhPassword"] : "")
             }
 
             pom.project {
diff --git a/cloudinary-core/build.gradle b/cloudinary-core/build.gradle
@@ -18,11 +18,11 @@ uploadArchives {
             beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
 
             repository(url: publishRepo) {
-                authentication(userName: ossrhUsername, password: ossrhPassword)
+                authentication(userName: project.hasProperty("ossrhUsername") ? project.ext["ossrhUsername"] : "", password: project.hasProperty("ossrhPassword") ? project.ext["ossrhPassword"] : "")
             }
 
             snapshotRepository(url: snapshotRepo) {
-                authentication(userName: ossrhUsername, password: ossrhPassword)
+                authentication(userName: project.hasProperty("ossrhUsername") ? project.ext["ossrhUsername"] : "", password: project.hasProperty("ossrhPassword") ? project.ext["ossrhPassword"] : "")
             }
 
             pom.project {
diff --git a/cloudinary-http42/build.gradle b/cloudinary-http42/build.gradle
@@ -30,11 +30,11 @@ uploadArchives {
             beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
 
             repository(url: publishRepo) {
-                authentication(userName: ossrhUsername, password: ossrhPassword)
+                authentication(userName: project.hasProperty("ossrhUsername") ? project.ext["ossrhUsername"] : "", password: project.hasProperty("ossrhPassword") ? project.ext["ossrhPassword"] : "")
             }
 
             snapshotRepository(url: snapshotRepo) {
-                authentication(userName: ossrhUsername, password: ossrhPassword)
+                authentication(userName: project.hasProperty("ossrhUsername") ? project.ext["ossrhUsername"] : "", password: project.hasProperty("ossrhPassword") ? project.ext["ossrhPassword"] : "")
             }
 
             pom.project {
diff --git a/cloudinary-http43/build.gradle b/cloudinary-http43/build.gradle
@@ -29,11 +29,11 @@ uploadArchives {
             beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
 
             repository(url: publishRepo) {
-                authentication(userName: ossrhUsername, password: ossrhPassword)
+                authentication(userName: project.hasProperty("ossrhUsername") ? project.ext["ossrhUsername"] : "", password: project.hasProperty("ossrhPassword") ? project.ext["ossrhPassword"] : "")
             }
 
             snapshotRepository(url: snapshotRepo) {
-                authentication(userName: ossrhUsername, password: ossrhPassword)
+                authentication(userName: project.hasProperty("ossrhUsername") ? project.ext["ossrhUsername"] : "", password: project.hasProperty("ossrhPassword") ? project.ext["ossrhPassword"] : "")
             }
 
             pom.project {
diff --git a/cloudinary-http44/build.gradle b/cloudinary-http44/build.gradle
@@ -29,11 +29,11 @@ uploadArchives {
             beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
 
             repository(url: publishRepo) {
-                authentication(userName: ossrhUsername, password: ossrhPassword)
+                authentication(userName: project.hasProperty("ossrhUsername") ? project.ext["ossrhUsername"] : "", password: project.hasProperty("ossrhPassword") ? project.ext["ossrhPassword"] : "")
             }
 
             snapshotRepository(url: snapshotRepo) {
-                authentication(userName: ossrhUsername, password: ossrhPassword)
+                authentication(userName: project.hasProperty("ossrhUsername") ? project.ext["ossrhUsername"] : "", password: project.hasProperty("ossrhPassword") ? project.ext["ossrhPassword"] : "")
             }
 
             pom.project {
diff --git a/cloudinary-taglib/build.gradle b/cloudinary-taglib/build.gradle
@@ -29,11 +29,11 @@ uploadArchives {
             beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
 
             repository(url: publishRepo) {
-                authentication(userName: ossrhUsername, password: ossrhPassword)
+                authentication(userName: project.hasProperty("ossrhUsername") ? project.ext["ossrhUsername"] : "", password: project.hasProperty("ossrhPassword") ? project.ext["ossrhPassword"] : "")
             }
 
             snapshotRepository(url: snapshotRepo) {
-                authentication(userName: ossrhUsername, password: ossrhPassword)
+                authentication(userName: project.hasProperty("ossrhUsername") ? project.ext["ossrhUsername"] : "", password: project.hasProperty("ossrhPassword") ? project.ext["ossrhPassword"] : "")
             }
 
             pom.project {
diff --git a/cloudinary-test-common/build.gradle b/cloudinary-test-common/build.gradle
@@ -19,11 +19,11 @@ uploadArchives {
             beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
 
             repository(url: publishRepo) {
-                authentication(userName: ossrhUsername, password: ossrhPassword)
+                authentication(userName: project.hasProperty("ossrhUsername") ? project.ext["ossrhUsername"] : "", password: project.hasProperty("ossrhPassword") ? project.ext["ossrhPassword"] : "")
             }
 
             snapshotRepository(url: snapshotRepo) {
-                authentication(userName: ossrhUsername, password: ossrhPassword)
+                authentication(userName: project.hasProperty("ossrhUsername") ? project.ext["ossrhUsername"] : "", password: project.hasProperty("ossrhPassword") ? project.ext["ossrhPassword"] : "")
             }
 
             pom.project {
diff --git a/gradle.properties b/gradle.properties
@@ -1,7 +1,7 @@
 publishRepo=http://localhost:8081/repository/maven-releases/
 snapshotRepo=http://localhost:8081/repository/maven-snapshots/
 publishGroupId=com.cloudinary
-projectVersion=1.12.2
+projectVersion=1.12.1-SNAPSHOT
 githubUrl=http://github.com/cloudinary/cloudinary_java
 scmConnection=scm:git:git://github.com/cloudinary/cloudinary_java.git
 scmDeveloperConnection=scm:git:git@github.com:cloudinary/cloudinary_java.git'

Original file line number	Diff line number	Diff line change
`@@ -18,11 +18,11 @@ uploadArchives {`
`18`	`18`	`beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }`
`19`	`19`
`20`	`20`	`repository(url: publishRepo) {`
`21`		`- authentication(userName: ossrhUsername, password: ossrhPassword)`
	`21`	`+ authentication(userName: project.hasProperty("ossrhUsername") ? project.ext["ossrhUsername"] : "", password: project.hasProperty("ossrhPassword") ? project.ext["ossrhPassword"] : "")`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`snapshotRepository(url: snapshotRepo) {`
`25`		`- authentication(userName: ossrhUsername, password: ossrhPassword)`
	`25`	`+ authentication(userName: project.hasProperty("ossrhUsername") ? project.ext["ossrhUsername"] : "", password: project.hasProperty("ossrhPassword") ? project.ext["ossrhPassword"] : "")`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`pom.project {`
Original file line number	Diff line number	Diff line change
`@@ -30,11 +30,11 @@ uploadArchives {`
`30`	`30`	`beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }`
`31`	`31`
`32`	`32`	`repository(url: publishRepo) {`
`33`		`- authentication(userName: ossrhUsername, password: ossrhPassword)`
	`33`	`+ authentication(userName: project.hasProperty("ossrhUsername") ? project.ext["ossrhUsername"] : "", password: project.hasProperty("ossrhPassword") ? project.ext["ossrhPassword"] : "")`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`snapshotRepository(url: snapshotRepo) {`
`37`		`- authentication(userName: ossrhUsername, password: ossrhPassword)`
	`37`	`+ authentication(userName: project.hasProperty("ossrhUsername") ? project.ext["ossrhUsername"] : "", password: project.hasProperty("ossrhPassword") ? project.ext["ossrhPassword"] : "")`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`pom.project {`
Original file line number	Diff line number	Diff line change
`@@ -29,11 +29,11 @@ uploadArchives {`
`29`	`29`	`beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }`
`30`	`30`
`31`	`31`	`repository(url: publishRepo) {`
`32`		`- authentication(userName: ossrhUsername, password: ossrhPassword)`
	`32`	`+ authentication(userName: project.hasProperty("ossrhUsername") ? project.ext["ossrhUsername"] : "", password: project.hasProperty("ossrhPassword") ? project.ext["ossrhPassword"] : "")`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`snapshotRepository(url: snapshotRepo) {`
`36`		`- authentication(userName: ossrhUsername, password: ossrhPassword)`
	`36`	`+ authentication(userName: project.hasProperty("ossrhUsername") ? project.ext["ossrhUsername"] : "", password: project.hasProperty("ossrhPassword") ? project.ext["ossrhPassword"] : "")`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`pom.project {`
Original file line number	Diff line number	Diff line change
`@@ -19,11 +19,11 @@ uploadArchives {`
`19`	`19`	`beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }`
`20`	`20`
`21`	`21`	`repository(url: publishRepo) {`
`22`		`- authentication(userName: ossrhUsername, password: ossrhPassword)`
	`22`	`+ authentication(userName: project.hasProperty("ossrhUsername") ? project.ext["ossrhUsername"] : "", password: project.hasProperty("ossrhPassword") ? project.ext["ossrhPassword"] : "")`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`snapshotRepository(url: snapshotRepo) {`
`26`		`- authentication(userName: ossrhUsername, password: ossrhPassword)`
	`26`	`+ authentication(userName: project.hasProperty("ossrhUsername") ? project.ext["ossrhUsername"] : "", password: project.hasProperty("ossrhPassword") ? project.ext["ossrhPassword"] : "")`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`pom.project {`