Update publishing

Author: graemerocher

build.gradle

@@ -18,11 +18,11 @@ project.ext {
 
     projectMajorVersion = "6"
     projectMinorVersion = "1"
-    projectPatchVersion = "13"
-    //releaseType = "RELEASE"
+    projectPatchVersion = "12"
+    releaseType = "RELEASE"
 //    releaseType = "M2"
     // releaseType = "RC1"
-    releaseType = "BUILD-SNAPSHOT"
+//    releaseType = "BUILD-SNAPSHOT"
 
     // overall project version
     projectVersion = "${projectMajorVersion}.${projectMinorVersion}.${projectPatchVersion}"
@@ -73,7 +73,6 @@ allprojects {
         all {
             resolutionStrategy {
                 force "org.codehaus.groovy:groovy:$groovyVersion"
-                force "org.codehaus.groovy:groovy-dateutil:$groovyVersion"
                 force "org.codehaus.groovy:groovy-xml:$groovyVersion"
                 force "org.codehaus.groovy:groovy-templates:$groovyVersion"
             }
@@ -146,7 +145,6 @@ subprojects {
 
         if (isStandardGroovyMavenProject) {
             documentation "org.fusesource.jansi:jansi:1.11"
-            documentation "org.codehaus.groovy:groovy-dateutil:$groovyVersion"
             documentation 'info.picocli:picocli:3.8.0'
             compile group: 'org.codehaus.groovy', name: 'groovy', version: groovyVersion
 

travis-publish.sh

@@ -1,9 +1,14 @@
 #!/bin/bash
 
-echo "Publishing..."
+echo "Publishing for branch $TRAVIS_BRANCH JDK: $TRAVIS_JDK_VERSION"
 
 EXIT_STATUS=0
 
+# Only JDK8 execution will publish the release
+if [ "${TRAVIS_JDK_VERSION}" == "openjdk11" ] ; then
+  exit $EXIT_STATUS
+fi
+
 if [[ $TRAVIS_REPO_SLUG == "grails/grails-data-mapping" && $TRAVIS_PULL_REQUEST == 'false' && $EXIT_STATUS -eq 0 ]]; then
 
   echo "Publishing archives"
@@ -13,20 +18,10 @@ if [[ $TRAVIS_REPO_SLUG == "grails/grails-data-mapping" && $TRAVIS_PULL_REQUEST
 
   export GRADLE_OPTS="-XX:MaxPermSize=1024m -Xmx1500m -Dfile.encoding=UTF-8"
 
-  gpg --keyserver keyserver.ubuntu.com --recv-key $SIGNING_KEY
-  if [[ $TRAVIS_TAG =~ ^v[[:digit:]] ]]; then
-    # for releases we upload to Bintray and Sonatype OSS
-    ./gradlew --stop
-    ./gradlew -Psigning.keyId="$SIGNING_KEY" -Psigning.password="$SIGNING_PASSPHRASE" -Psigning.secretKeyRingFile="${TRAVIS_BUILD_DIR}/secring.gpg" uploadArchives || EXIT_STATUS=$?
-
-    if [[ $EXIT_STATUS -eq 0 ]]; then
-        ./gradlew --stop
-        ./gradlew -Psigning.keyId="$SIGNING_KEY" -Psigning.password="$SIGNING_PASSPHRASE" -Psigning.secretKeyRingFile="${TRAVIS_BUILD_DIR}/secring.gpg" publish || EXIT_STATUS=$?
-    fi
+  if [[ -n $TRAVIS_TAG ]]; then
+      ./gradlew publish bintrayUpload --no-daemon --stacktrace || EXIT_STATUS=$?
   else
-    # for snapshots only to repo.grails.org
-    ./gradlew --stop
-    ./gradlew -Psigning.keyId="$SIGNING_KEY" -Psigning.password="$SIGNING_PASSPHRASE" -Psigning.secretKeyRingFile="${TRAVIS_BUILD_DIR}/secring.gpg" publish  || EXIT_STATUS=$?
+      ./gradlew publish --no-daemon --stacktrace || EXIT_STATUS=$?
   fi
 
   if [[ $EXIT_STATUS -eq 0 ]]; then
@@ -44,25 +39,6 @@ if [[ $TRAVIS_REPO_SLUG == "grails/grails-data-mapping" && $TRAVIS_PULL_REQUEST
         git push
         cd ..
 
-        echo "Triggering Hibernate 4 build"
-        git clone https://${GH_TOKEN}@github.com/grails/gorm-hibernate4.git gorm-hibernate4
-        cd gorm-hibernate4
-        echo "$(date)" > .snapshot
-        git add .snapshot
-        git commit -m "New Core Snapshot: $(date)"
-        git push
-        cd ..
-
-
-        echo "Triggering REST Client build"
-        git clone https://${GH_TOKEN}@github.com/grails/gorm-rest-client.git gorm-rest-client
-        cd gorm-rest-client
-        echo "$(date)" > .snapshot
-        git add .snapshot
-        git commit -m "New Core Snapshot: $(date)"
-        git push
-        cd ..
-
         echo "Triggering Neo4j build"
         git clone https://${GH_TOKEN}@github.com/grails/gorm-neo4j.git gorm-neo4j
         cd gorm-neo4j
@@ -85,21 +61,25 @@ if [[ $TRAVIS_REPO_SLUG == "grails/grails-data-mapping" && $TRAVIS_PULL_REQUEST
         # If there is a tag present then this becomes the latest
         if [[ $TRAVIS_TAG =~ ^v[[:digit:]] ]]; then
             echo "Triggering documentation build"
-            git clone https://${GH_TOKEN}@github.com/grails/gorm-docs.git gorm-docs
+            git clone -b 6.1.x https://${GH_TOKEN}@github.com/grails/gorm-docs.git gorm-docs
             cd gorm-docs
 
-            if [[ $TRAVIS_TAG =~ [M\d|RC\d] ]]; then            
-               echo "gormVersion=${TRAVIS_TAG:1}" > gradle.properties  
-            else 
+            if [[ $TRAVIS_TAG =~ [M\d|RC\d] ]]; then
+               echo "gormVersion=${TRAVIS_TAG:1}" > gradle.properties
+            else
                echo "gormVersion=${TRAVIS_TAG:1}.RELEASE" > gradle.properties
-            fi            
+            fi
 
             git add gradle.properties
             git commit -m "Release $TRAVIS_TAG docs"
             git tag $TRAVIS_TAG
             git push --tags
             git push
             cd ..
+
+            if [[ $EXIT_STATUS -eq 0 ]]; then
+                ./gradlew synchronizeWithMavenCentral --no-daemon
+            fi
         fi
 
   else
@@ -111,4 +91,4 @@ fi
 if [[ $EXIT_STATUS -eq 0 ]]; then
   echo "Publishing Successful."
 fi
-exit $EXIT_STATUS
+exit $EXIT_STATUS