[geode] 02/03: WIP fixing up more gradle 4.x issues

[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 3c00fd0c2a402327fde21c13c3790306d284bd4a
Author: Udo Kohlmeyer <uk...@pivotal.io>
AuthorDate: Wed Apr 11 11:03:29 2018 -0700

    WIP fixing up more gradle 4.x issues
---
 .gitignore                                     | 2 ++
 build.gradle                                   | 6 +++---
 extensions/geode-modules-assembly/build.gradle | 8 +++-----
 geode-assembly/build.gradle                    | 8 ++++----
 gradle.properties                              | 2 +-
 gradle/rat.gradle                              | 1 +
 gradle/wrapper/gradle-wrapper.properties       | 2 +-
 7 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/.gitignore b/.gitignore
index af317b8..0bda1ca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,5 @@ out/
 *.orig
 geode-pulse/screenshots/
 /jpf.properties
+
+.gradletasknamecache
diff --git a/build.gradle b/build.gradle
index 1850d89..cbacc43 100755
--- a/build.gradle
+++ b/build.gradle
@@ -22,12 +22,12 @@ buildscript {
   }
 
   dependencies {
-    classpath "gradle.plugin.org.nosphere.apache:creadur-rat-gradle:0.2.0"
+    classpath "gradle.plugin.org.nosphere.apache:creadur-rat-gradle:0.3.1"
     classpath 'com.bmuschko:gradle-nexus-plugin:2.3.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.5"
+    classpath "me.champeau.gradle:jmh-gradle-plugin:0.4.4"
+    classpath "com.pedjak.gradle.plugins:dockerized-test:0.5.6"
     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 2bd2d3d..48d54f8 100644
--- a/extensions/geode-modules-assembly/build.gradle
+++ b/extensions/geode-modules-assembly/build.gradle
@@ -17,11 +17,6 @@
 
 import org.apache.tools.ant.filters.ReplaceTokens
 
-configurations {
-  slf4jDeps
-  moduleDistOutputs
-}
-
 jar.enabled = true
 extraArchive {
   sources = false
@@ -32,6 +27,9 @@ extraArchive {
 disableMavenPublishing()
 disableSigning()
 
+project.configurations.create('slf4jDeps')
+project.configurations.create('moduleDistOutputs')
+
 def getJarArtifact(module) {
   project(module).configurations.archives.artifacts.findAll {
     it instanceof PublishArtifact && it.type == 'jar' && it.classifier == ''
diff --git a/geode-assembly/build.gradle b/geode-assembly/build.gradle
index 9b4ed67..09665c8 100755
--- a/geode-assembly/build.gradle
+++ b/geode-assembly/build.gradle
@@ -419,9 +419,9 @@ distributions {
         from (project(":geode-pulse").configurations.archives.allArtifacts.files)
       }
 
-//      into ('tools/Modules') {
-//        from (project(':extensions:geode-modules-assembly').configurations.moduleDistOutputs.files)
-//      }
+      into ('tools/Modules') {
+        from (project(':extensions:geode-modules-assembly').configurations.moduleDistOutputs.files)
+      }
     }
   }
 }
@@ -444,7 +444,7 @@ flakyTest dependOnInstalledProduct
 build.dependsOn installDist
 
 installDist.dependsOn ':extensions:geode-modules-assembly:dist'
-distributedTest.dependsOn ':extensions/session-testing-war:war'
+distributedTest.dependsOn ':extensions:session-testing-war:war'
 distributedTest.dependsOn ':geode-old-versions:build'
 
 /**Print the names of all jar files in a fileTree */
diff --git a/gradle.properties b/gradle.properties
index 30c92af..c8d8ed9 100755
--- a/gradle.properties
+++ b/gradle.properties
@@ -46,7 +46,7 @@ org.gradle.parallel=true
 org.gradle.configureondemand=true
 org.gradle.workers.max=4
 
-minimumGradleVersion = 4.2.1
+minimumGradleVersion = 4.6
 # 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/rat.gradle b/gradle/rat.gradle
index b0012af..74ae2f9 100644
--- a/gradle/rat.gradle
+++ b/gradle/rat.gradle
@@ -39,6 +39,7 @@ rat {
     '**/build/**',
     '**/build-*/**',
     '.buildinfo',
+    '.gradletasknamecache',
 
     // Geode examples
     'geode-examples/.idea/**',
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 4516ad8..dcb0cb1 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.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-bin.zip

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