[geode] 01/01: GEODE-4791: backing out upgrade to 4.5.1 due to an incompatibility with dockerized-test library, which only supports gradle 4.2

[ud...@apache.org]

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

udo pushed a commit to branch feature/GEODE-4791
in repository https://gitbox.apache.org/repos/asf/geode.git

commit e09c4091382e1c6bfafbb77de86029bb08fcccea
Author: Udo <uk...@pivotal.io>
AuthorDate: Thu Mar 8 16:17:32 2018 -0800

    GEODE-4791: backing out upgrade to 4.5.1 due to an incompatibility with dockerized-test library, which only supports gradle 4.2
---
 build.gradle                                   | 2 +-
 extensions/geode-modules-assembly/build.gradle | 7 ++-----
 gradle.properties                              | 4 ++--
 gradle/wrapper/gradle-wrapper.properties       | 2 +-
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/build.gradle b/build.gradle
index d9dc03c..56005a2 100755
--- a/build.gradle
+++ b/build.gradle
@@ -27,7 +27,7 @@ buildscript {
     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"
+    classpath "com.pedjak.gradle.plugins:dockerized-test:0.5.5"
     classpath 'com.github.ben-manes:gradle-versions-plugin:0.17.0'
   }
 }
diff --git a/extensions/geode-modules-assembly/build.gradle b/extensions/geode-modules-assembly/build.gradle
index 59398ce..6abd47b 100644
--- a/extensions/geode-modules-assembly/build.gradle
+++ b/extensions/geode-modules-assembly/build.gradle
@@ -22,11 +22,6 @@ configurations {
   moduleDistOutputs
 }
 
-dependencies {
-  slf4jDeps 'org.slf4j:slf4j-api:' + project.'slf4j-api.version'
-  slf4jDeps 'org.slf4j:slf4j-jdk14:' + project.'slf4j-api.version'
-}
-
 jar.enabled = true
 extraArchive {
   sources = false
@@ -202,6 +197,8 @@ task distTcServer30(type: Zip, dependsOn: [':extensions/geode-modules:assemble',
 }
 
 dependencies {
+  slf4jDeps 'org.slf4j:slf4j-api:' + project.'slf4j-api.version'
+  slf4jDeps 'org.slf4j:slf4j-jdk14:' + project.'slf4j-api.version'
   moduleDistOutputs distTcServer.outputs.files
   moduleDistOutputs distTcServer30.outputs.files
   moduleDistOutputs distAppServer.outputs.files
diff --git a/gradle.properties b/gradle.properties
index cf0f05d..30c92af 100755
--- a/gradle.properties
+++ b/gradle.properties
@@ -42,11 +42,11 @@ productOrg = Apache Software Foundation (ASF)
 org.gradle.daemon = true
 org.gradle.jvmargs = -Xmx2048m
 
-org.gradle.parallel=false
+org.gradle.parallel=true
 org.gradle.configureondemand=true
 org.gradle.workers.max=4
 
-minimumGradleVersion = 4.5.1
+minimumGradleVersion = 4.2.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/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 4d000bd..4516ad8 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-4.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.2.1-bin.zip

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