From cafa62589d0984f55a0b4b09cffc390db8b06238 Mon Sep 17 00:00:00 2001 From: Rob Winch Date: Wed, 2 Jul 2014 17:00:22 -0500 Subject: [PATCH] Do not apply maven plugin to samples --- gradle/java.gradle | 6 +----- spring-session/build.gradle | 5 +++++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/gradle/java.gradle b/gradle/java.gradle index 11a12060..d98cd82b 100644 --- a/gradle/java.gradle +++ b/gradle/java.gradle @@ -3,10 +3,10 @@ apply plugin: 'groovy' apply plugin: 'javadocHotfix' apply plugin: 'eclipse-wtp' apply plugin: 'propdeps' -apply plugin: 'propdeps-maven' apply plugin: 'propdeps-idea' apply plugin: 'propdeps-eclipse' + ext.jstlVersion = '1.2.1' ext.servletApiVersion = '3.0.1' ext.springSecurityVersion = '3.2.4.RELEASE' @@ -70,10 +70,6 @@ task integrationTest(type: Test, dependsOn: jar) { } } -project.conf2ScopeMappings.addMapping(MavenPlugin.TEST_COMPILE_PRIORITY + 1, project.configurations.getByName("integrationTestCompile"), Conf2ScopeMappingContainer.TEST) -project.conf2ScopeMappings.addMapping(MavenPlugin.TEST_COMPILE_PRIORITY + 2, project.configurations.getByName("integrationTestRuntime"), Conf2ScopeMappingContainer.TEST) -check.dependsOn integrationTest - project.idea.module { scopes.TEST.plus += [project.configurations.integrationTestRuntime] } \ No newline at end of file diff --git a/spring-session/build.gradle b/spring-session/build.gradle index 69d46b5e..d097194d 100644 --- a/spring-session/build.gradle +++ b/spring-session/build.gradle @@ -1,4 +1,9 @@ apply from: JAVA_GRADLE +apply plugin: 'propdeps-maven' + +project.conf2ScopeMappings.addMapping(MavenPlugin.TEST_COMPILE_PRIORITY + 1, project.configurations.getByName("integrationTestCompile"), Conf2ScopeMappingContainer.TEST) +project.conf2ScopeMappings.addMapping(MavenPlugin.TEST_COMPILE_PRIORITY + 2, project.configurations.getByName("integrationTestRuntime"), Conf2ScopeMappingContainer.TEST) +check.dependsOn integrationTest dependencies {