From bc525cf6ea194034a35f2f9df310266f0583ce6a Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Tue, 10 Jan 2017 11:40:29 -0500 Subject: [PATCH] Fix early sourceSets access in spring-io plugin https://build.spring.io/browse/INT-FATS5IC-46 SI places XML configs alongside with test classes for better navigation from IDE. For this purpose we configure `sourceSets.test.resources` for `src/test/java` as well. Looks like `spring-io-0.0.6` read such a configuration very early and we end up with a default value for `resources`. * Moving `sourceSets` before applying `spring-io` plugin makes everything working again --- build.gradle | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index 2a54d7ba9f..e333e44d5d 100644 --- a/build.gradle +++ b/build.gradle @@ -61,6 +61,14 @@ subprojects { subproject -> apply plugin: 'jacoco' apply plugin: 'checkstyle' + sourceSets { + test { + resources { + srcDirs = ['src/test/resources', 'src/test/java'] + } + } + } + if (project.hasProperty('platformVersion') && !(subproject.name ==~ /.*-bom/)) { apply plugin: 'spring-io' @@ -143,14 +151,6 @@ subprojects { subproject -> } } - sourceSets { - test { - resources { - srcDirs = ['src/test/resources', 'src/test/java'] - } - } - } - jacoco { toolVersion = "0.7.8" }