Consistentely apply Spring Data BOM across Spring Session modules

Fixes gh-709
This commit is contained in:
John Blum
2017-01-13 17:54:44 -08:00
parent aa3536a71a
commit 536156a4ec
13 changed files with 84 additions and 69 deletions

View File

@@ -15,12 +15,13 @@ apply from: SAMPLE_GRADLE
group = 'samples'
ext['spring-data-releasetrain.version'] = springDataReleaseTrainVersion
dependencies {
compile project(':spring-session'),
"org.springframework.boot:spring-boot-starter-data-redis",
"org.springframework.boot:spring-boot-starter-web",
"org.springframework.boot:spring-boot-starter-thymeleaf",
compile project(':spring-session-data-redis'),
"org.springframework.boot:spring-boot-starter-security",
"org.springframework.boot:spring-boot-starter-thymeleaf",
"org.springframework.boot:spring-boot-starter-web",
"nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect",
"org.thymeleaf.extras:thymeleaf-extras-conditionalcomments",
"org.webjars:bootstrap:$bootstrapVersion",

View File

@@ -15,12 +15,13 @@ apply from: SAMPLE_GRADLE
group = 'samples'
ext['spring-data-releasetrain.version'] = springDataReleaseTrainVersion
dependencies {
compile project(':spring-session'),
"org.springframework.boot:spring-boot-starter-data-redis",
"org.springframework.boot:spring-boot-starter-web",
compile project(':spring-session-data-redis'),
"org.springframework.boot:spring-boot-starter-security",
"org.springframework.boot:spring-boot-starter-thymeleaf",
"org.springframework.boot:spring-boot-starter-web",
"nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect",
"org.thymeleaf.extras:thymeleaf-extras-conditionalcomments",
"org.webjars:bootstrap:$bootstrapVersion",

View File

@@ -9,14 +9,14 @@ buildscript {
}
apply from: JAVA_GRADLE
apply from: SAMPLE_GRADLE
apply plugin: "application"
apply plugin: 'org.springframework.boot'
apply from: SAMPLE_GRADLE
ext['spring-data-releasetrain.version'] = springDataReleaseTrainVersion
dependencies {
compile "org.springframework.data:spring-data-gemfire:$springDataGemFireVersion",
project(":spring-session"),
// project(':spring-session-data-gemfire'),
compile project(':spring-session-data-gemfire'),
"org.springframework.boot:spring-boot-starter-thymeleaf",
"org.springframework.boot:spring-boot-starter-web",
"org.webjars:bootstrap:$bootstrapVersion",
@@ -49,11 +49,13 @@ task runGemFireServer() {
String classpath = sourceSets.main.runtimeClasspath.collect { it }.join(File.pathSeparator)
String[] commandLine = ['java', '-server', '-ea', '-classpath', classpath,
"-Dgemfire.cache.server.port=$port",
//"-Dgemfire.log-file=gemfire-server.log",
"-Dgemfire.log-level=" + System.getProperty('gemfire.log.level', 'config'),
'sample.server.GemFireServer']
String[] commandLine = [
'java', '-server', '-ea', '-classpath', classpath,
"-Dgemfire.cache.server.port=$port",
//"-Dgemfire.log-file=gemfire-server.log",
"-Dgemfire.log-level=" + System.getProperty('gemfire.log.level', 'config'),
'sample.server.GemFireServer'
]
//println commandLine

View File

@@ -40,12 +40,14 @@ task runGemFireServer(dependsOn: availablePort) {
println 'STARTING GEMFIRE SERVER...'
String classpath = sourceSets.main.runtimeClasspath.collect { it }.join(File.pathSeparator)
String gemfireLogLevel = System.getProperty('sample.httpsession.gemfire.log-level', 'warning')
String[] commandLine = ['java', '-server', '-ea',
"-Dspring.session.data.gemfire.port=$port",
"-Dsample.httpsession.gemfire.log-level="
+ System.getProperty('sample.httpsession.gemfire.log-level', 'warning'),
'-classpath', classpath, 'sample.Application']
String[] commandLine = [
'java', '-server', '-ea', '-classpath', classpath,
"-Dspring.session.data.gemfire.port=$port",
"-Dsample.httpsession.gemfire.log-level=" + gemfireLogLevel,
'sample.Application'
]
//println commandLine

View File

@@ -41,12 +41,14 @@ task runGemFireServer(dependsOn: availablePort) {
println 'STARTING GEMFIRE SERVER...'
String classpath = sourceSets.main.runtimeClasspath.collect { it }.join(File.pathSeparator)
String gemfireLogLevel = System.getProperty('sample.httpsession.gemfire.log-level', 'warning')
String[] commandLine = ['java', '-server', '-ea',
"-Dspring.session.data.gemfire.port=$port",
"-Dsample.httpsession.gemfire.log-level="
+ System.getProperty('sample.httpsession.gemfire.log-level', 'warning'),
'-classpath', classpath, 'sample.ServerConfig']
String[] commandLine = [
'java', '-server', '-ea', '-classpath', classpath,
"-Dspring.session.data.gemfire.port=$port",
"-Dsample.httpsession.gemfire.log-level=" + gemfireLogLevel,
'sample.ServerConfig'
]
//println commandLine

View File

@@ -17,7 +17,7 @@ group = 'samples'
dependencies {
compile project(':spring-session'),
"org.springframework.data:spring-data-mongodb:$springDataMongoVersion",
"org.springframework.data:spring-data-mongodb:$springDataMongoDBVersion",
"org.springframework.boot:spring-boot-starter-web",
"org.springframework.boot:spring-boot-starter-security",
"org.springframework.boot:spring-boot-starter-thymeleaf",