From ef025b182dbaeecb8f99856af87170a77511c8b3 Mon Sep 17 00:00:00 2001
From: Jake Bolewski <jakebolewski@gmail.com>
Date: Fri, 19 Jul 2019 15:20:08 -0600
Subject: [PATCH 1/3] simplify signing with a relese gradle property

---
 build.gradle      | 22 ++++++++--------------
 gradle.properties |  1 +
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/build.gradle b/build.gradle
index 383d51ff..b96d410c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -139,20 +139,6 @@ 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' }) {
-        tasks.findAll { it.name == 'signArchives' || it.name == 'signDocsJar' || it.name == 'signTestJar' }.each { task ->
-            task.enabled = false
-        }
-    }
-}
 
 publishing {
     publications {
@@ -201,6 +187,14 @@ 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
diff --git a/gradle.properties b/gradle.properties
index b68f3ea6..a1648c9e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,4 @@
+TILEDB_JAVA_RELEASE=false
 TILEDB_GIT_REPOSITORY=https://github.com/TileDB-Inc/TileDB
 TILEDB_GIT_TAG=dev
 TILEDB_VERBOSE=OFF

From fe4c9f81fd09732cbce771aa80afcc0111cf1ed8 Mon Sep 17 00:00:00 2001
From: EC2 Default User <ec2-user@ip-172-31-38-128.ec2.internal>
Date: Fri, 19 Jul 2019 21:29:26 +0000
Subject: [PATCH 2/3] add enable release when publishing

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 5cc7aab1..364750dd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,6 +29,7 @@ matrix:
         CFLAGS="-march=x86-64"
         CPPFLAGS="-march=x86-64"
         PUBLISH=1
+        ORG_GRADLE_PROJECT_TILEDB_JAVA_RELEASE="true"
         ORG_GRADLE_PROJECT_TILEDB_S3="ON"
         ORG_GRADLE_PROJECT_TILEDB_SERIALIZATION="ON"
 

From d769e46c33a60e0ac9e75dbbce2f6ddd9f123c2a Mon Sep 17 00:00:00 2001
From: EC2 Default User <ec2-user@ip-172-31-38-128.ec2.internal>
Date: Fri, 19 Jul 2019 22:00:37 +0000
Subject: [PATCH 3/3] move release=true to upload_to_maven script

---
 .travis.yml           | 1 -
 ci/upload_to_maven.sh | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 364750dd..5cc7aab1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,7 +29,6 @@ matrix:
         CFLAGS="-march=x86-64"
         CPPFLAGS="-march=x86-64"
         PUBLISH=1
-        ORG_GRADLE_PROJECT_TILEDB_JAVA_RELEASE="true"
         ORG_GRADLE_PROJECT_TILEDB_S3="ON"
         ORG_GRADLE_PROJECT_TILEDB_SERIALIZATION="ON"
 
diff --git a/ci/upload_to_maven.sh b/ci/upload_to_maven.sh
index 8f57ab86..258f369b 100755
--- a/ci/upload_to_maven.sh
+++ b/ci/upload_to_maven.sh
@@ -6,6 +6,7 @@ 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