This is an automated email from the ASF dual-hosted git repository. rhoughton 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 2c26de8 GEODE-7916: use updated gradle plugin declarations (#4856) 2c26de8 is described below commit 2c26de89f1c78ddaab01531843826498b87f9eea Author: Robert Houghton <rhough...@pivotal.io> AuthorDate: Fri Mar 27 00:08:29 2020 -0700 GEODE-7916: use updated gradle plugin declarations (#4856) Also rev the versions of those plugins. --- build.gradle | 44 ++++++++++--------------- geode-assembly/build.gradle | 8 +++-- gradle/standard-subproject-configuration.gradle | 4 +-- 3 files changed, 23 insertions(+), 33 deletions(-) diff --git a/build.gradle b/build.gradle index 99ef2a3..8b66008 100755 --- a/build.gradle +++ b/build.gradle @@ -15,41 +15,28 @@ * limitations under the License. */ -buildscript { - repositories { - maven { url "https://plugins.gradle.org/m2/" } - maven { url "https://dl.bintray.com/palantir/releases" } - jcenter() - } - - dependencies { - classpath 'com.diffplug.spotless:spotless-plugin-gradle:3.21.1' - classpath 'com.github.ben-manes:gradle-versions-plugin:0.21.0' - classpath 'com.netflix.nebula:gradle-lint-plugin:11.4.4' - classpath 'com.netflix.nebula:nebula-project-plugin:6.0.2' - classpath 'gradle.plugin.com.palantir.gradle.docker:gradle-docker:0.22.1' - classpath 'io.spring.gradle:dependency-management-plugin:1.0.7.RELEASE' - classpath 'org.ajoberstar.grgit:grgit-gradle:3.1.1' - classpath 'org.nosphere.apache:creadur-rat-gradle:0.4.0' - classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.7' - } +plugins { + id "wrapper" + id "nebula.facet" version "6.0.2" apply false + id "base" + id "idea" + id "eclipse" + id "com.diffplug.gradle.spotless" version "3.28.0" apply false + id "com.github.ben-manes.versions" version "0.28.0" apply false + id "nebula.lint" version "16.4.0" apply false + id "com.palantir.docker" version "0.22.1" apply false + id "io.spring.dependency-management" version "1.0.9.RELEASE" apply false + id "org.ajoberstar.grgit" version "4.0.1" apply false + id "org.nosphere.apache.rat" version "0.6.0" apply false + id "org.sonarqube" version "2.8" apply false } -apply plugin: 'wrapper' -apply plugin: 'nebula.facet' -apply plugin: 'java-library' -apply plugin: 'idea' -apply plugin: 'eclipse' apply from: "${scriptDir}/lint.gradle" apply from: "${scriptDir}/resolve-dependencies.gradle" apply from: "${scriptDir}/sonar.gradle" apply from: "${scriptDir}/rat.gradle" -sourceCompatibility = 1.8 -targetCompatibility = 1.8 -compileJava.options.encoding = 'UTF-8' - wrapper { gradleVersion = minimumGradleVersion distributionType = "all" @@ -125,6 +112,9 @@ tasks.register('writeBuildInfo') { } } } +tasks.register('test') { + description "An all-project target for unit tests" +} tasks.register('devBuild') { description "A convenience target for a typical developer workflow: apply spotless and assemble all classes." diff --git a/geode-assembly/build.gradle b/geode-assembly/build.gradle index 15ee18b..2f7d68d 100755 --- a/geode-assembly/build.gradle +++ b/geode-assembly/build.gradle @@ -494,11 +494,13 @@ tasks.register('docs', Javadoc) { include 'org/apache/geode/**/' doLast { - parent.subprojects.each { project -> + rootProject.subprojects.each { project -> copy { - from project.sourceSets.main.resources.srcDirs - into docsDir + if (project.hasProperty('sourceSets')) { + from project.sourceSets.main.resources.srcDirs + } include 'javadoc-images/*' + into docsDir } } } diff --git a/gradle/standard-subproject-configuration.gradle b/gradle/standard-subproject-configuration.gradle index 5215aaa..9cfea36 100644 --- a/gradle/standard-subproject-configuration.gradle +++ b/gradle/standard-subproject-configuration.gradle @@ -33,9 +33,7 @@ def thisProjectScoped = project } } - - -rootProject.tasks.named('classes').configure { +thisProjectScoped.tasks.named('assemble').configure { // This is a semi-lazy hook so that our test sources are compiled most of the time. dependsOn( [