Fix Gradle deprecation warnings

This commit is contained in:
Vedran Pavic
2017-01-12 21:54:53 +01:00
parent 3cc3784313
commit 41fbc90ec2
4 changed files with 66 additions and 54 deletions

View File

@@ -55,13 +55,15 @@ sonarqube {
} }
} }
task configDocsZip(dependsOn: [':docs:asciidoctor',':spring-session:javadoc']) << { task configDocsZip(dependsOn: [':docs:asciidoctor',':spring-session:javadoc']) {
doLast {
project.tasks.docsZip.from(project(':docs').asciidoctor) { project.tasks.docsZip.from(project(':docs').asciidoctor) {
into('reference') into('reference')
} }
project.tasks.docsZip.from(project(':spring-session').javadoc) { project.tasks.docsZip.from(project(':spring-session').javadoc) {
into('api') into('api')
} }
}
} }

View File

@@ -41,7 +41,8 @@ springBoot {
mainClass = 'sample.client.Application' mainClass = 'sample.client.Application'
} }
task runGemFireServer() << { task runGemFireServer() {
doLast {
println 'STARTING GEMFIRE SERVER...' println 'STARTING GEMFIRE SERVER...'
ext.port = reservePort() ext.port = reservePort()
@@ -60,6 +61,7 @@ task runGemFireServer() << {
process.in.close() process.in.close()
process.out.close() process.out.close()
process.err.close() process.err.close()
}
} }

View File

@@ -27,13 +27,16 @@ mainClassName = 'sample.Application'
def port def port
def process def process
task availablePort() << { task availablePort() {
doLast {
def serverSocket = new ServerSocket(0) def serverSocket = new ServerSocket(0)
port = serverSocket.localPort port = serverSocket.localPort
serverSocket.close() serverSocket.close()
}
} }
task runGemFireServer(dependsOn: availablePort) << { task runGemFireServer(dependsOn: availablePort) {
doLast {
println 'STARTING GEMFIRE SERVER...' println 'STARTING GEMFIRE SERVER...'
String classpath = sourceSets.main.runtimeClasspath.collect { it }.join(File.pathSeparator) String classpath = sourceSets.main.runtimeClasspath.collect { it }.join(File.pathSeparator)
@@ -42,7 +45,7 @@ task runGemFireServer(dependsOn: availablePort) << {
"-Dspring.session.data.gemfire.port=$port", "-Dspring.session.data.gemfire.port=$port",
"-Dsample.httpsession.gemfire.log-level=" "-Dsample.httpsession.gemfire.log-level="
+ System.getProperty('sample.httpsession.gemfire.log-level', 'warning'), + System.getProperty('sample.httpsession.gemfire.log-level', 'warning'),
'-classpath', classpath, 'sample.Application' ] '-classpath', classpath, 'sample.Application']
//println commandLine //println commandLine
@@ -50,6 +53,7 @@ task runGemFireServer(dependsOn: availablePort) << {
process.in.close() process.in.close()
process.out.close() process.out.close()
process.err.close() process.err.close()
}
} }
integrationTest.doLast { integrationTest.doLast {

View File

@@ -28,13 +28,16 @@ def process
mainClassName = "sample.ServerConfig" mainClassName = "sample.ServerConfig"
task availablePort() << { task availablePort() {
doLast {
def serverSocket = new ServerSocket(0) def serverSocket = new ServerSocket(0)
port = serverSocket.localPort port = serverSocket.localPort
serverSocket.close() serverSocket.close()
}
} }
task runGemFireServer(dependsOn: availablePort) << { task runGemFireServer(dependsOn: availablePort) {
doLast {
println 'STARTING GEMFIRE SERVER...' println 'STARTING GEMFIRE SERVER...'
String classpath = sourceSets.main.runtimeClasspath.collect { it }.join(File.pathSeparator) String classpath = sourceSets.main.runtimeClasspath.collect { it }.join(File.pathSeparator)
@@ -51,6 +54,7 @@ task runGemFireServer(dependsOn: availablePort) << {
process.in.close() process.in.close()
process.out.close() process.out.close()
process.err.close() process.err.close()
}
} }
integrationTest.doLast { integrationTest.doLast {