Cwikius-Spring/spring-security
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-security.git synced 2025-07-08 19:42:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

SEC-2622: Set classesDirectory if exists for integrationTomcatRun

Browse Source
This commit is contained in:
Rob Winch 2014-06-13 12:22:01 -05:00
parent 6964c2e3de
commit ec1c5b0e78
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gradle/tomcat.gradle
View File

@ -21,14 +21,16 @@ dependencies {
task integrationTomcatRun(type: org.gradle.api.plugins.tomcat.tasks.TomcatRun) { task integrationTomcatRun(type: org.gradle.api.plugins.tomcat.tasks.TomcatRun) {
onlyIf { !sourceSets.integrationTest.allSource.empty } onlyIf { !sourceSets.integrationTest.allSource.empty }
buildscriptClasspath = tomcatRun.buildscriptClasspath buildscriptClasspath = tomcatRun.buildscriptClasspath
classesDirectory = project.sourceSets.main.output.classesDir
contextPath = tomcatRun.contextPath contextPath = tomcatRun.contextPath
daemon = true daemon = true
tomcatClasspath = tomcatRun.tomcatClasspath tomcatClasspath = tomcatRun.tomcatClasspath
webAppClasspath = tomcatRun.webAppClasspath webAppClasspath = tomcatRun.webAppClasspath
webAppSourceDirectory = tomcatRun.webAppSourceDirectory webAppSourceDirectory = tomcatRun.webAppSourceDirectory
doFirst { doFirst {
def mainOutputDir = project.sourceSets.main.output.classesDir
if(mainOutputDir) {
classesDirectory = mainOutputDir
}
// delay reserving ports to ensure they are still available // delay reserving ports to ensure they are still available
def ports = reservePorts(3) def ports = reservePorts(3)
httpPort = ports[0] httpPort = ports[0]