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 0167fdfe9901f6b17fb27569f6a34387a96cc4ea Author: Udo Kohlmeyer <ukohlme...@pivotal.io> AuthorDate: Wed Apr 11 11:03:29 2018 -0700 WIP fixing up more gradle 4.x issues --- .gitignore | 2 ++ build.gradle | 8 ++++---- extensions/geode-modules-assembly/build.gradle | 10 +++++----- geode-assembly/build.gradle | 8 ++++---- gradle.properties | 6 +++++- gradle/rat.gradle | 1 + gradle/wrapper/gradle-wrapper.properties | 2 +- 7 files changed, 22 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index ddb360b..ae1f32a 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,5 @@ geode-pulse/screenshots/ /jpf.properties .git-together + +.gradletasknamecache diff --git a/build.gradle b/build.gradle index e2624b8..65ddf55 100755 --- a/build.gradle +++ b/build.gradle @@ -24,11 +24,11 @@ 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.0.1' - classpath "com.diffplug.spotless:spotless-plugin-gradle:3.10.0" - classpath "me.champeau.gradle:jmh-gradle-plugin:0.3.1" + classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.6.1' + classpath "com.diffplug.gradle.spotless:spotless:3.10.0" + classpath "me.champeau.gradle:jmh-gradle-plugin:0.4.4" classpath "com.pedjak.gradle.plugins:dockerized-test:0.5.6-SNAPSHOT" 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 a62109d..78f2f5e 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 @@ -37,6 +32,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 == '' @@ -214,6 +212,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/geode-assembly/build.gradle b/geode-assembly/build.gradle index 20b7a07..3279708 100755 --- a/geode-assembly/build.gradle +++ b/geode-assembly/build.gradle @@ -424,9 +424,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) + } } } } @@ -458,7 +458,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 ad3dbce..c8d8ed9 100755 --- a/gradle.properties +++ b/gradle.properties @@ -42,7 +42,11 @@ 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 +org.gradle.workers.max=4 + +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 2fad278..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-3.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-bin.zip -- To stop receiving notification emails like this one, please contact u...@apache.org.