Merge branch 'ss/revert-to-automatic-signing' into release-0.1.7

Author: Shelnutt2

build.gradle

@@ -139,6 +139,20 @@ artifacts {
     archives javadocJar
 }
 
+import org.gradle.plugins.signing.Sign
+gradle.taskGraph.whenReady { taskGraph ->
+    if (taskGraph.allTasks.any { it instanceof Sign }) {
+        allprojects { ext."signing.keyId" = System.getenv('GPG_KEY_ID') }
+        allprojects { ext."signing.secretKeyRingFile" = System.getenv('GPG_KEY_LOCATION') }
+        allprojects { ext."signing.password" = System.getenv('GPG_PASSPHRASE') }
+    }
+    // Do not sign archives by default (a local build without gpg keyring should succeed)
+    if (taskGraph.allTasks.any { it.name == 'build' || it.name == 'assemble'  || it.name == 'publishToMavenLocal'}) {
+        tasks.findAll { it.name == 'signArchives' || it.name == 'signDocsJar' || it.name == 'signTestJar' || it.name == 'signMavenJavaPublication'}.each { task ->
+            task.enabled = false
+        }
+    }
+}
 
 publishing {
     publications {
@@ -187,14 +201,6 @@ publishing {
     }
 }
 
-ext.isReleaseVersion = getProjectProperty('TILEDB_JAVA_RELEASE').toBoolean()
-tasks.withType(Sign) {
-    onlyIf { isReleaseVersion }
-    allprojects { ext."signing.keyId" = System.getenv('GPG_KEY_ID') }
-    allprojects { ext."signing.secretKeyRingFile" = System.getenv('GPG_KEY_LOCATION') }
-    allprojects { ext."signing.password" = System.getenv('GPG_PASSPHRASE') }
-}
-
 signing {
     sign publishing.publications.mavenJava
     sign configurations.archives

ci/upload_to_maven.sh

@@ -6,7 +6,6 @@ echo "${GPG_SECRET_KEYS_ENC}" | base64 --decode > ${ENCRYPTED_GPG_KEY_LOCATION}
 openssl aes-256-cbc -K $encrypted_a2869fb015d7_key -iv $encrypted_a2869fb015d7_iv -in $ENCRYPTED_GPG_KEY_LOCATION -out $GPG_KEY_LOCATION -d
 ./gradlew properties -q | grep "version:" | awk '{print $2}'
 export PROJECT_VERSION=$(./gradlew properties -q | grep "version:" | awk '{print $2}')
-export ORG_GRADLE_PROJECT_TILEDB_JAVA_RELEASE=true
 # Upload only snapshots to sonatype oss so it can make its way to maven central
 ./gradlew publishMavenJavaPublicationToMavenRepository
 

gradle.properties

@@ -1,4 +1,3 @@
-TILEDB_JAVA_RELEASE=false
 TILEDB_GIT_REPOSITORY=https://github.com/TileDB-Inc/TileDB
 TILEDB_GIT_TAG=1.6.2
 TILEDB_VERBOSE=OFF