Make compile -> explodedDep depend on fetchWar - FetchWar will automatically download the dependencies with needed.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@55307 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gethin James
2013-09-15 12:51:40 +00:00
parent 547617c5ca
commit b505e0c72e

View File

@@ -178,9 +178,9 @@ subprojects {
/** --- Compile tasks --- */ /** --- Compile tasks --- */
// make sure that the dependancies have been unpacked before compiling the Java // make sure that the dependancies have been unpacked before compiling the Java
compileJava.doFirst { // compileJava.doFirst {
explodeDeps.execute() // explodeDeps.execute()
} // }
compileJava.options.encoding = 'UTF-8' compileJava.options.encoding = 'UTF-8'
compileTestJava.options.encoding = 'UTF-8' compileTestJava.options.encoding = 'UTF-8'
@@ -195,7 +195,7 @@ subprojects {
rename { String filename -> warFile } rename { String filename -> warFile }
} }
task explodeDeps << { task explodeDeps(dependsOn: fetchWarFile) << {
explodedDir = file(explodedDepsDir) explodedDir = file(explodedDepsDir)
explodedLibDir = file(explodedLibsDir) explodedLibDir = file(explodedLibsDir)
@@ -251,6 +251,8 @@ subprojects {
} }
} }
compileJava.dependsOn explodeDeps
task cleanDeps(dependsOn: clean) << { task cleanDeps(dependsOn: clean) << {
ant.delete(includeEmptyDirs: 'true', dir: explodedDepsDir) ant.delete(includeEmptyDirs: 'true', dir: explodedDepsDir)
ant.delete(file: warFile) ant.delete(file: warFile)