diff --git a/README.adoc b/README.adoc index 6ee4074c..13c95b2a 100644 --- a/README.adoc +++ b/README.adoc @@ -97,7 +97,7 @@ Then ensure you have added the following dependencies: ---- org.springframework.session - spring-session + spring-session-data-redis {spring-session-version} @@ -105,21 +105,6 @@ Then ensure you have added the following dependencies: spring-web {spring-version} - - org.springframework.data - spring-data-redis - 1.3.0.RELEASE - - - redis.clients - jedis - 2.4.1 - - - org.apache.commons - commons-pool2 - 2.2 - ---- === Building with Gradle @@ -166,11 +151,8 @@ Then ensure you have added the following dependencies: [subs="verbatim,attributes"] ---- dependencies { - compile "org.springframework.session:spring-session:{spring-session-version}", - "org.springframework:spring-web:{spring-version}", - "org.springframework.data:spring-data-redis:1.3.0.RELEASE", - "redis.clients:jedis:2.4.1", - "org.apache.commons:commons-pool2:2.2" + compile "org.springframework.session:spring-session-data-redis:{spring-session-version}", + "org.springframework:spring-web:{spring-version}" } ---- diff --git a/gradle/java.gradle b/gradle/java.gradle index e24bfbe1..e2802c40 100644 --- a/gradle/java.gradle +++ b/gradle/java.gradle @@ -16,6 +16,10 @@ ext.groovyVersion = '2.0.5' ext.seleniumVersion = '2.33.0' ext.spockVersion = '0.7-groovy-2.0' ext.gebVersion = '0.9.0' +ext.jedisVersion = '2.4.1' +ext.commonsPoolVersion = '2.2' +ext.embeddedRedisVersion = '0.2' +ext.springDataRedisVersion = '1.3.0.RELEASE' ext.spockDependencies = [ dependencies.create("org.spockframework:spock-core:$spockVersion") { diff --git a/samples/web/build.gradle b/samples/web/build.gradle index b0a06558..8e1d8e5f 100644 --- a/samples/web/build.gradle +++ b/samples/web/build.gradle @@ -7,11 +7,8 @@ sonarRunner { } dependencies { - compile project(':spring-session'), + compile project(':spring-session-data-redis'), "org.springframework:spring-web:$springVersion", - "org.springframework.data:spring-data-redis:1.3.0.RELEASE", - "redis.clients:jedis:2.4.1", - "org.apache.commons:commons-pool2:2.2", "redis.embedded:embedded-redis:0.2", jstlDependencies diff --git a/settings.gradle b/settings.gradle index 812021e2..d214b4eb 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,4 +1,5 @@ rootProject.name = 'spring-session-build' include 'spring-session' -include 'samples:web' \ No newline at end of file +include 'spring-session-data-redis' +include 'samples:web' diff --git a/spring-session-data-redis/build.gradle b/spring-session-data-redis/build.gradle new file mode 100644 index 00000000..37795804 --- /dev/null +++ b/spring-session-data-redis/build.gradle @@ -0,0 +1,9 @@ +apply from: JAVA_GRADLE +apply from: MAVEN_GRADLE + +dependencies { + compile project(':spring-session'), + "org.springframework.data:spring-data-redis:$springDataRedisVersion", + "redis.clients:jedis:$jedisVersion", + "org.apache.commons:commons-pool2:$commonsPoolVersion" +} \ No newline at end of file diff --git a/spring-session/build.gradle b/spring-session/build.gradle index 7654f555..192e24ea 100644 --- a/spring-session/build.gradle +++ b/spring-session/build.gradle @@ -10,7 +10,7 @@ configurations { } dependencies { - optional "org.springframework.data:spring-data-redis:1.3.0.RELEASE" + optional "org.springframework.data:spring-data-redis:$springDataRedisVersion" provided "javax.servlet:javax.servlet-api:$servletApiVersion" integrationTestCompile "redis.clients:jedis:2.4.1", "org.apache.commons:commons-pool2:2.2",