Some fixes to allow publishing libs to artifactory. Distributions sti…

…ll broken.
dlethin · Apr 8, 2011 · 8ec8976 · 8ec8976
1 parent 690c756
commit 8ec8976
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/build.gradle b/build.gradle
@@ -511,7 +511,7 @@ uploadDists {
     dependsOn testedDists
     uploadDescriptor = false
     doFirst {
-        org.apache.ivy.util.url.CredentialsStore.INSTANCE.addCredentials('Artifactory Realm', 'repo.gradle.org', artifactoryUserName, artifactoryUserPassword)
+        org.apache.ivy.util.url.CredentialsStore.INSTANCE.addCredentials('Artifactory Realm', 'gradle.artifactoryonline.com', artifactoryUserName, artifactoryUserPassword)
         repositories.add(new org.apache.ivy.plugins.resolver.URLResolver()) {
             name = 'gradleReleases'
             addArtifactPattern("${version.distributionUrl}/[artifact]-[revision](-[classifier]).[ext]" as String)

diff --git a/buildSrc/src/main/groovy/org/gradle/build/Version.groovy b/buildSrc/src/main/groovy/org/gradle/build/Version.groovy
@@ -71,17 +71,17 @@ class Version {
 
     String getDistributionUrl() {
         if (release) {
-            'https://repo.gradle.org/gradle/distributions'
+            'https://gradle.artifactoryonline.com/gradle/distributions'
         } else {
-            'https://repo.gradle.org/gradle/distributions/gradle-snapshots'
+            'https://gradle.artifactoryonline.com/gradle/distributions/gradle-snapshots'
         }
     }
 
     String getLibsUrl() {
         if (release) {
-            'https://repo.gradle.org/gradle/libs-releases-local'
+            'https://gradle.artifactoryonline.com/gradle/libs-releases-local'
         } else {
-            'https://repo.gradle.org/gradle/libs-snapshots-local'
+            'https://gradle.artifactoryonline.com/gradle/libs-snapshots-local'
         }
     }
 }
diff --git a/gradle/publish.gradle b/gradle/publish.gradle
@@ -50,9 +50,9 @@ uploadArchives {
     dependsOn generatePom
     uploadDescriptor = false
     doFirst {
-        org.apache.ivy.util.url.CredentialsStore.INSTANCE.addCredentials('Artifactory Realm', 'repo.gradle.org', artifactoryUserName, artifactoryUserPassword)
+        org.apache.ivy.util.url.CredentialsStore.INSTANCE.addCredentials('Artifactory Realm', 'gradle.artifactoryonline.com', artifactoryUserName, artifactoryUserPassword)
         repositories.add(new org.apache.ivy.plugins.resolver.URLResolver()) {
-            name = 'gradleReleases'
+            name = 'gradleLibs'
             addArtifactPattern("${version.libsUrl}/${project.group.replaceAll('\\.', '/')}/${archivesBaseName}/[revision]/[artifact]-[revision](-[classifier]).[ext]" as String)
         }
     }