From db833104e4274e0a3e7a5b013f37c1ddfd1d4915 Mon Sep 17 00:00:00 2001 From: Rob Winch Date: Fri, 24 Apr 2015 11:20:50 -0500 Subject: [PATCH] LDAP-311: Add spring-data-commons to samples and test projects --- samples/odm/build.gradle | 3 ++- samples/plain/build.gradle | 3 ++- samples/user-admin/build.gradle | 1 + test/integration-tests-spring25/build.gradle | 3 ++- test/integration-tests-spring30/build.gradle | 4 ++++ test/integration-tests/build.gradle | 3 ++- 6 files changed, 13 insertions(+), 4 deletions(-) diff --git a/samples/odm/build.gradle b/samples/odm/build.gradle index 87635a77..0fa1910e 100644 --- a/samples/odm/build.gradle +++ b/samples/odm/build.gradle @@ -4,7 +4,8 @@ dependencies { compile project(':spring-ldap-test'), 'javax.servlet:jstl:1.2', "org.springframework:spring-context:$springVersion", - "org.springframework:spring-webmvc:$springVersion" + "org.springframework:spring-webmvc:$springVersion", + "org.springframework.data:spring-data-commons:$springDataVersion" provided "javax.servlet:servlet-api:2.5" diff --git a/samples/plain/build.gradle b/samples/plain/build.gradle index 87635a77..0fa1910e 100644 --- a/samples/plain/build.gradle +++ b/samples/plain/build.gradle @@ -4,7 +4,8 @@ dependencies { compile project(':spring-ldap-test'), 'javax.servlet:jstl:1.2', "org.springframework:spring-context:$springVersion", - "org.springframework:spring-webmvc:$springVersion" + "org.springframework:spring-webmvc:$springVersion", + "org.springframework.data:spring-data-commons:$springDataVersion" provided "javax.servlet:servlet-api:2.5" diff --git a/samples/user-admin/build.gradle b/samples/user-admin/build.gradle index 33061a02..c1b4474c 100644 --- a/samples/user-admin/build.gradle +++ b/samples/user-admin/build.gradle @@ -5,6 +5,7 @@ dependencies { 'javax.servlet:jstl:1.2', "org.springframework:spring-context:$springVersion", "org.springframework:spring-webmvc:$springVersion", + "org.springframework.data:spring-data-commons:$springDataVersion", "com.fasterxml.jackson.core:jackson-databind:2.2.3", "com.google.guava:guava:15.0" diff --git a/test/integration-tests-spring25/build.gradle b/test/integration-tests-spring25/build.gradle index 95a5330f..21c3b86a 100644 --- a/test/integration-tests-spring25/build.gradle +++ b/test/integration-tests-spring25/build.gradle @@ -18,7 +18,8 @@ dependencies { exclude group: "junit", module:"junit" } - testCompile "org.springframework:spring-test:$spring25Version", + testCompile "org.springframework.data:spring-data-commons:$springDataVersion", + "org.springframework:spring-test:$spring25Version", "org.springframework:spring-context:$spring25Version", "org.springframework:spring-core:$spring25Version", "org.springframework:spring-tx:$spring25Version", diff --git a/test/integration-tests-spring30/build.gradle b/test/integration-tests-spring30/build.gradle index 290d3e83..1063207a 100644 --- a/test/integration-tests-spring30/build.gradle +++ b/test/integration-tests-spring30/build.gradle @@ -25,4 +25,8 @@ dependencies { "org.springframework:spring-beans:$spring30Version", "junit:junit:$junitVersion", "org.slf4j:slf4j-log4j12:$slf4jVersion" + + testCompile("org.springframework.data:spring-data-commons:$springDataVersion") { + exclude group: "org.springframework" + } } diff --git a/test/integration-tests/build.gradle b/test/integration-tests/build.gradle index b4fa0536..f8ed19d5 100644 --- a/test/integration-tests/build.gradle +++ b/test/integration-tests/build.gradle @@ -28,7 +28,8 @@ dependencies { compile project(":spring-ldap-test"), project(":spring-ldap-core-tiger") - compile "com.mysema.querydsl:querydsl-apt:$queryDslVersion" + compile "com.mysema.querydsl:querydsl-apt:$queryDslVersion", + "org.springframework.data:spring-data-commons:$springDataVersion" compile("org.springframework.security:spring-security-core:$springSecurityVersion") { exclude group: "org.springframework", module: "spring-expression"