diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/IntegrationTestPlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/IntegrationTestPlugin.groovy index 059fdfbc8b..743dec49ac 100644 --- a/buildSrc/src/main/groovy/io/spring/gradle/convention/IntegrationTestPlugin.groovy +++ b/buildSrc/src/main/groovy/io/spring/gradle/convention/IntegrationTestPlugin.groovy @@ -52,6 +52,15 @@ public class IntegrationTestPlugin implements Plugin { // ensure we don't add if no tests to avoid adding Gretty return } + project.sourceSets { + integrationTest { + java.srcDir project.file('src/integration-test/java') + resources.srcDir project.file('src/integration-test/resources') + compileClasspath = project.sourceSets.main.output + project.sourceSets.test.output + project.configurations.integrationTestCompileClasspath + runtimeClasspath = output + compileClasspath + project.configurations.integrationTestRuntimeClasspath + } + } + project.configurations { integrationTestCompile { extendsFrom testImplementation @@ -69,15 +78,6 @@ public class IntegrationTestPlugin implements Plugin { } } - project.sourceSets { - integrationTest { - java.srcDir project.file('src/integration-test/java') - resources.srcDir project.file('src/integration-test/resources') - compileClasspath = project.sourceSets.main.output + project.sourceSets.test.output + project.configurations.integrationTestCompileClasspath - runtimeClasspath = output + compileClasspath + project.configurations.integrationTestRuntimeClasspath - } - } - Task integrationTestTask = project.tasks.create("integrationTest", Test) { group = 'Verification' description = 'Runs the integration tests.'