From 064f539977666a9e166a3aab3566bd5d06cb27c2 Mon Sep 17 00:00:00 2001
From: Aaron Coburn <acoburn@apache.org>
Date: Thu, 12 Dec 2019 13:18:44 -0500
Subject: [PATCH] Upgrade to gradle6

Resolves #625
---
 build.gradle                             | 5 ++++-
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 platform/bom/build.gradle                | 4 ++++
 settings.gradle                          | 4 ++++
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 309ae7fa9..10ec731eb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,6 @@ plugins {
     id 'com.github.hierynomus.license' version "$licenseVersion"
     id 'com.github.kt3k.coveralls' version "$coverallsVersion"
     id 'com.github.spotbugs' version "$spotbugsVersion"
-    id 'com.gradle.build-scan' version "$scanVersion"
     id 'net.researchgate.release' version "$releasesVersion"
     id 'org.owasp.dependencycheck' version "$owaspVersion"
     id 'org.sonarqube' version "$sonarVersion"
@@ -371,6 +370,10 @@ subprojects { subproj ->
         sign publishing.publications
     }
 
+    tasks.withType(Sign) {
+        onlyIf { !version.endsWith("SNAPSHOT") }
+    }
+
     processResources {
         outputs.upToDateWhen { false }
         filesMatching(['**/features.xml', '**/banner.txt']) {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 5028f28f8..94920145f 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/platform/bom/build.gradle b/platform/bom/build.gradle
index 8d5acd3d7..0fa419354 100644
--- a/platform/bom/build.gradle
+++ b/platform/bom/build.gradle
@@ -52,6 +52,10 @@ publishing {
     }
 }
 
+tasks.withType(GenerateModuleMetadata) {
+    enabled = false
+}
+
 java {
     // because this isn't built as a JPMS module
     if (project.hasProperty("jpms") && JavaVersion.current().isJava11Compatible()) {
diff --git a/settings.gradle b/settings.gradle
index aff02dab9..465305e14 100755
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,3 +1,7 @@
+plugins {
+    id "com.gradle.enterprise" version "$scanVersion"
+}
+
 rootProject.name = 'trellis'
 
 include ':trellis-api'