Merged changes from master into Gradle upgrade. Fixed local publish b…

…roken by upgrade.
wiremock · Oct 3, 2016 · 83763f7 · 83763f7
2 parents 41b67dd + 294821a
commit 83763f7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/build.gradle b/build.gradle
@@ -245,9 +245,12 @@ publishing {
             URL repoUrl = shouldPublishLocally ? localRepo : URI.create('https://oss.sonatype.org/service/local/staging/deploy/maven2').toURL()
 
             url repoUrl
-            credentials {
-                username repoUser
-                password repoPassword
+
+            if (!shouldPublishLocally) {
+                credentials {
+                    username repoUser
+                    password repoPassword
+                }
             }
         }
     }
@@ -305,7 +308,7 @@ publishing {
 }
 
 task checkReleasePreconditions << {
-    def REQUIRED_GIT_BRANCH = 'new-admin-apis'
+    def REQUIRED_GIT_BRANCH = 'master'
 
     println "Using Java version: ${System.getProperty('java.runtime.version')}"
     assert System.getProperty('java.runtime.version').startsWith('1.7'), "Must release with Java 7 to avoid collection bug"
@@ -410,7 +413,7 @@ task 'bump-version-down' << {
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '2.5'
+    gradleVersion = '3.1'
 }
 
 task 'add-copyright-headers' << {

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,5 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-all.zip
+