diff options
| author | Andreas Fitzek <andreas.fitzek@iaik.tugraz.at> | 2016-11-02 11:23:51 +0100 |
|---|---|---|
| committer | Andreas Fitzek <andreas.fitzek@iaik.tugraz.at> | 2016-11-02 11:23:51 +0100 |
| commit | 4ee4d80447ac654848d2c1d77deafde771bf4177 (patch) | |
| tree | 8dcf53c9daabc17ae9c76293509d3a5621bf59cc /pdf-as-web | |
| parent | 55c407fce46a1f100398b9cbe405b1560ea6d75e (diff) | |
| parent | 3e46f2b7ba2bf497a8f73d5f2498850f27904ff1 (diff) | |
| download | pdf-as-4-4ee4d80447ac654848d2c1d77deafde771bf4177.tar.gz pdf-as-4-4ee4d80447ac654848d2c1d77deafde771bf4177.tar.bz2 pdf-as-4-4ee4d80447ac654848d2c1d77deafde771bf4177.zip | |
Merge branch 'master' of gitlab.iaik.tugraz.at:afitzek/pdf-as-4
Diffstat (limited to 'pdf-as-web')
| -rw-r--r-- | pdf-as-web/build.gradle | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pdf-as-web/build.gradle b/pdf-as-web/build.gradle index 0fb333eb..ae27c7db 100644 --- a/pdf-as-web/build.gradle +++ b/pdf-as-web/build.gradle @@ -173,7 +173,7 @@ task putConfigIntoTomcat(dependsOn: putTemplateIntoTomcat)<<{ task putWebConfigIntoTomcat(dependsOn: putConfigIntoTomcat)<<{ deployVersions.each{ - String targetDir = "build/tomcat-##VERSION##/apache-tomcat-##VERSION##/conf/pdf-as"; + String targetDir = "build/tomcat-##VERSION##"+it+"/apache-tomcat-##VERSION##/conf/pdf-as"; targetDir = targetDir.replaceAll("##VERSION##", project.tomcatVersion); copy{ @@ -203,7 +203,7 @@ task createPdfbox2War(type:War){ sourceSets.test.compileClasspath -= configurations.pdfbox1 sourceSets.main.compileClasspath += configurations.pdfbox2 sourceSets.test.compileClasspath += configurations.pdfbox2 - classpath=sourceSets.main.compileClasspath + classpath+=sourceSets.main.compileClasspath } } @@ -283,14 +283,13 @@ task releaseConfig(type: Copy) { - war{ doFirst{ sourceSets.main.compileClasspath -= configurations.pdfbox2 sourceSets.test.compileClasspath -= configurations.pdfbox2 sourceSets.main.compileClasspath += configurations.pdfbox1 sourceSets.test.compileClasspath += configurations.pdfbox1 - classpath=sourceSets.main.compileClasspath + classpath+=sourceSets.main.compileClasspath } } |