[geode] branch develop updated: GEODE-4791: Upgrading gradle from 3.5.1 to 4.5.1

[ud...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

udo pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/develop by this push:
     new 78df32f  GEODE-4791: Upgrading gradle from 3.5.1 to 4.5.1
78df32f is described below

commit 78df32fe7a8bfe7be7595472377b660d899953fa
Author: Udo <uk...@pivotal.io>
AuthorDate: Tue Mar 6 15:47:48 2018 -0800

    GEODE-4791: Upgrading gradle from 3.5.1 to 4.5.1
---
 build.gradle                             |  2 +-
 gradle.properties                        |  5 ++++-
 gradle/java.gradle                       | 11 +++++------
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/build.gradle b/build.gradle
index 66c89ec..d9dc03c 100755
--- a/build.gradle
+++ b/build.gradle
@@ -24,7 +24,7 @@ buildscript {
   dependencies {
     classpath "gradle.plugin.org.nosphere.apache:creadur-rat-gradle:0.2.0"
     classpath 'com.bmuschko:gradle-nexus-plugin:2.3.1'
-    classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.0.1'
+    classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.6.1'
     classpath "com.diffplug.gradle.spotless:spotless:2.2.0"
     classpath "me.champeau.gradle:jmh-gradle-plugin:0.3.1"
     classpath "com.pedjak.gradle.plugins:dockerized-test:0.5.4"
diff --git a/gradle.properties b/gradle.properties
index ad3dbce..9a9bc99 100755
--- a/gradle.properties
+++ b/gradle.properties
@@ -42,7 +42,10 @@ productOrg = Apache Software Foundation (ASF)
 org.gradle.daemon = true
 org.gradle.jvmargs = -Xmx2048m
 
-minimumGradleVersion = 3.5.1
+org.gradle.parallel=true
+org.gradle.configureondemand=true
+
+minimumGradleVersion = 4.5.1
 # Set this on the command line with -P or in ~/.gradle/gradle.properties
 # to change the buildDir location.  Use an absolute path.
 buildRoot=
diff --git a/gradle/java.gradle b/gradle/java.gradle
index 22fec1c..7f99604 100644
--- a/gradle/java.gradle
+++ b/gradle/java.gradle
@@ -54,12 +54,11 @@ subprojects {
             "Organization": productOrg
           )
         }
-
-        metaInf {
-          from("$rootDir/LICENSE")
-          if (jar.source.filter({ it.name.contains('NOTICE') }).empty) {
-            from("$rootDir/NOTICE")
-          }
+      }
+      jar.metaInf {
+        from("$rootDir/LICENSE")
+        if (jar.source.filter({ it.name.contains('NOTICE') }).empty) {
+          from("$rootDir/NOTICE")
         }
       }
     }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 2fad278..4d000bd 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.5.1-bin.zip

-- 
To stop receiving notification emails like this one, please contact
udo@apache.org.