Browse Source

Use osdetector-gradle-plugin:1.2.1; Fix authentication methods for sonatype

zhangkun83 10 years ago
parent
commit
f1496fdafc
1 changed files with 3 additions and 11 deletions
  1. 3 11
      protoc-artifacts/build.gradle

+ 3 - 11
protoc-artifacts/build.gradle

@@ -11,16 +11,14 @@ version = '3.0.0-alpha-3-pre'
 buildscript {
 buildscript {
   repositories {
   repositories {
     mavenCentral()
     mavenCentral()
-    mavenLocal()
   }
   }
   dependencies {
   dependencies {
-    classpath 'com.google.gradle:osdetector-gradle-plugin:0.1.0-SNAPSHOT'
+    classpath 'com.google.gradle:osdetector-gradle-plugin:1.2.1'
   }
   }
 }
 }
 
 
 repositories {
 repositories {
   mavenCentral()
   mavenCentral()
-  mavenLocal()
 }
 }
 
 
 signing {
 signing {
@@ -53,17 +51,11 @@ uploadArchives.repositories.mavenDeployer {
   beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
   beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
 
 
   repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
   repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
-    if (rootProject.hasProperty("ossrhUsername")
-        && rootProject.hasProperty("ossrhPassword")) {
-      authentication(userName: ossrhUsername, password: ossrhPassword)
-    }
+    authentication(userName: sonatypeUsername, password: sonatypePassword)
   }
   }
 
 
   snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") {
   snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") {
-    if (rootProject.hasProperty("ossrhUsername")
-        && rootProject.hasProperty("ossrhPassword")) {
-      authentication(userName: ossrhUsername, password: ossrhPassword)
-    }
+    authentication(userName: sonatypeUsername, password: sonatypePassword)
   }
   }
 }
 }