Back to snapshot, use Artifactory for releases for the moment

grails · Feb 26, 2015 · d61515f · d61515f
1 parent ba86af6
commit d61515f
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 29 deletions.
diff --git a/build.gradle b/build.gradle
@@ -19,7 +19,7 @@ ext.providedDeps = []
 ext.provided = { providedDeps << it }
 ext {
     bintrayPublish = false
-    grailsVersion = '3.0.0.M2'
+    grailsVersion = '3.0.0.BUILD-SNAPSHOT'
     isBuildSnapshot = grailsVersion.endsWith(".BUILD-SNAPSHOT")
     isTravisBuild = System.getenv().get("TRAVIS") == 'true'
 
@@ -310,17 +310,20 @@ subprojects { project ->
 
         publishing {
 
-            if(isBuildSnapshot) {
-                repositories {
-                    maven {
-                        credentials {
-                            def u = System.getenv("ARTIFACTORY_USERNAME") ?: project.hasProperty("artifactoryPublishUsername") ? project.artifactoryPublishUsername : ''
-                            def p = System.getenv("ARTIFACTORY_PASSWORD") ?: project.hasProperty("artifactoryPublishPassword") ? project.artifactoryPublishPassword : ''
-                            username = u
-                            password = p
-                        }
+            repositories {
+                maven {
+                    credentials {
+                        def u = System.getenv("ARTIFACTORY_USERNAME") ?: project.hasProperty("artifactoryPublishUsername") ? project.artifactoryPublishUsername : ''
+                        def p = System.getenv("ARTIFACTORY_PASSWORD") ?: project.hasProperty("artifactoryPublishPassword") ? project.artifactoryPublishPassword : ''
+                        username = u
+                        password = p
+                    }
+                    if(isBuildSnapshot) {
                         url  "https://repo.grails.org/grails/libs-snapshots-local"
                     }
+                    else {
+                        url "https://repo.grails.org/grails/libs-releases-local"
+                    }
                 }
             }
 

diff --git a/grails-bom/build.gradle b/grails-bom/build.gradle
@@ -4,17 +4,20 @@ apply plugin: 'com.jfrog.bintray'
 
 publishing {
 
-    if(isBuildSnapshot) {
-        repositories {
-            maven {
-                credentials {
-                    def u = System.getenv("ARTIFACTORY_USERNAME") ?: project.hasProperty("artifactoryPublishUsername") ? project.artifactoryPublishUsername : ''
-                    def p = System.getenv("ARTIFACTORY_PASSWORD") ?: project.hasProperty("artifactoryPublishPassword") ? project.artifactoryPublishPassword : ''
-                    username = u
-                    password = p
-                }
+    repositories {
+        maven {
+            credentials {
+                def u = System.getenv("ARTIFACTORY_USERNAME") ?: project.hasProperty("artifactoryPublishUsername") ? project.artifactoryPublishUsername : ''
+                def p = System.getenv("ARTIFACTORY_PASSWORD") ?: project.hasProperty("artifactoryPublishPassword") ? project.artifactoryPublishPassword : ''
+                username = u
+                password = p
+            }
+            if(isBuildSnapshot) {
                 url  "https://repo.grails.org/grails/libs-snapshots-local"
             }
+            else {
+                url "https://repo.grails.org/grails/libs-releases-local"
+            }
         }
     }
 

diff --git a/grails-dependencies/build.gradle b/grails-dependencies/build.gradle
@@ -4,17 +4,20 @@ apply plugin: 'com.jfrog.bintray'
 
 publishing {
 
-    if(isBuildSnapshot) {
-        repositories {
-            maven {
-                credentials {
-                    def u = System.getenv("ARTIFACTORY_USERNAME") ?: project.hasProperty("artifactoryPublishUsername") ? project.artifactoryPublishUsername : ''
-                    def p = System.getenv("ARTIFACTORY_PASSWORD") ?: project.hasProperty("artifactoryPublishPassword") ? project.artifactoryPublishPassword : ''
-                    username = u
-                    password = p
-                }
+    repositories {
+        maven {
+            credentials {
+                def u = System.getenv("ARTIFACTORY_USERNAME") ?: project.hasProperty("artifactoryPublishUsername") ? project.artifactoryPublishUsername : ''
+                def p = System.getenv("ARTIFACTORY_PASSWORD") ?: project.hasProperty("artifactoryPublishPassword") ? project.artifactoryPublishPassword : ''
+                username = u
+                password = p
+            }
+            if(isBuildSnapshot) {
                 url  "https://repo.grails.org/grails/libs-snapshots-local"
             }
+            else {
+                url "https://repo.grails.org/grails/libs-releases-local"
+            }
         }
     }
 

diff --git a/travis-build.sh b/travis-build.sh
@@ -29,7 +29,7 @@ if [[ $TRAVIS_PULL_REQUEST == 'false' && $EXIT_STATUS -eq 0 ]]; then
     echo "Publishing archives"
 
     if [[ $TRAVIS_TAG =~ ^v[[:digit:]] ]]; then
-        ./gradlew bintrayUpload || EXIT_STATUS=$?
+        ./gradlew publish || EXIT_STATUS=$?
         ./gradlew assemble || EXIT_STATUS=$?
 
         version="$TRAVIS_TAG"