From e04123651caeb1e3da33ddc526e3c0fc4be65a42 Mon Sep 17 00:00:00 2001 From: Andreas Fitzek Date: Wed, 14 Dec 2016 10:52:31 +0100 Subject: made pdfbox1 version explicit, pdfbox2 is now default backend --- pdf-as-cli/build.gradle | 18 ++++----- pdf-as-lib/src/main/resources/config/config.zip | Bin 1276538 -> 1276538 bytes pdf-as-pdfbox/build.gradle | 2 +- pdf-as-web/build.gradle | 48 ++++++++++++------------ 4 files changed, 34 insertions(+), 34 deletions(-) diff --git a/pdf-as-cli/build.gradle b/pdf-as-cli/build.gradle index 8021a456..9fc614fd 100644 --- a/pdf-as-cli/build.gradle +++ b/pdf-as-cli/build.gradle @@ -47,7 +47,7 @@ dependencies { startScripts{ - classpath+=sourceSets.pdfBox1.compileClasspath + classpath+=sourceSets.pdfBox2.compileClasspath } compileJava{ @@ -57,13 +57,13 @@ compileJava{ } -task pdfbox2Startscript(type: CreateStartScripts) { +task pdfbox1Startscript(type: CreateStartScripts) { description "Creates OS specific scripts to call the 'other' entry point" - classpath = startScripts.classpath.minus(configurations.pdfBox1Compile) + sourceSets.pdfBox2.compileClasspath + classpath = startScripts.classpath.minus(configurations.pdfBox2Compile) + sourceSets.pdfBox1.compileClasspath outputDir = startScripts.outputDir mainClassName = startScripts.mainClassName - applicationName = startScripts.applicationName+"-pdfbox2" + applicationName = startScripts.applicationName+"-pdfbox1" } distZip { @@ -76,10 +76,10 @@ distZip { from startScripts.classpath } into("${baseName}-${version}/lib") { - from pdfbox2Startscript.classpath + from pdfbox1Startscript.classpath } into("${baseName}-${version}/bin") { - from pdfbox2Startscript + from pdfbox1Startscript } } } @@ -93,10 +93,10 @@ distTar { from startScripts.classpath } into("${baseName}-${version}/lib") { - from pdfbox2Startscript.classpath + from pdfbox1Startscript.classpath } into("${baseName}-${version}/bin") { - from pdfbox2Startscript + from pdfbox1Startscript } } } @@ -108,7 +108,7 @@ releases.dependsOn distZip releases.dependsOn distTar distZip.dependsOn startScripts -startScripts.dependsOn pdfbox2Startscript +startScripts.dependsOn pdfbox1Startscript diff --git a/pdf-as-lib/src/main/resources/config/config.zip b/pdf-as-lib/src/main/resources/config/config.zip index fb9dd1c6..3a750a26 100644 Binary files a/pdf-as-lib/src/main/resources/config/config.zip and b/pdf-as-lib/src/main/resources/config/config.zip differ diff --git a/pdf-as-pdfbox/build.gradle b/pdf-as-pdfbox/build.gradle index efa59e94..d0778512 100644 --- a/pdf-as-pdfbox/build.gradle +++ b/pdf-as-pdfbox/build.gradle @@ -13,7 +13,7 @@ repositories { task releases(type: Copy) { from jar.outputs - into rootDir.toString() + "/releases/" + version + into rootDir.toString() + "/releases/" + version + "/pdfbox1" } releases.dependsOn jar diff --git a/pdf-as-web/build.gradle b/pdf-as-web/build.gradle index 8eb1a2dc..02176587 100644 --- a/pdf-as-web/build.gradle +++ b/pdf-as-web/build.gradle @@ -115,7 +115,7 @@ task extractTomcat(dependsOn: downloadTomcat, type: Copy) { into outputDir } -def deployVersions=['','-pdfbox2'] +def deployVersions=['','-pdfbox1'] task copyTomcat(dependsOn: extractTomcat)<<{ deployVersions.each{ @@ -195,31 +195,31 @@ task injectPdfAsWebApp(dependsOn: putWebConfigIntoTomcat, type: Copy) { } injectPdfAsWebApp.dependsOn war -task createPdfbox2War(type:War){ +task createPdfbox1War(type:War){ //destinationDir = file("$buildDir/libs/pdfbox2") - appendix = "pdfbox2" + appendix = "pdfbox1" doFirst{ - sourceSets.main.compileClasspath -= configurations.pdfbox1 - sourceSets.test.compileClasspath -= configurations.pdfbox1 - sourceSets.main.compileClasspath += configurations.pdfbox2 - sourceSets.test.compileClasspath += configurations.pdfbox2 + sourceSets.main.compileClasspath -= configurations.pdfbox2 + sourceSets.test.compileClasspath -= configurations.pdfbox2 + sourceSets.main.compileClasspath += configurations.pdfbox1 + sourceSets.test.compileClasspath += configurations.pdfbox1 classpath+=sourceSets.main.compileClasspath } } -task injectPdfAsWebAppPdfbox2(dependsOn: putWebConfigIntoTomcat, type: Copy) { +task injectPdfAsWebAppPdfbox1(dependsOn: putWebConfigIntoTomcat, type: Copy) { //war.execute(); String targetDir = project.buildDir.toString() + "/tomcat-##VERSION##"+deployVersions[1]+"/apache-tomcat-##VERSION##/webapps/"; targetDir = targetDir.replaceAll("##VERSION##", project.tomcatVersion); - from createPdfbox2War.outputs + from createPdfbox1War.outputs into targetDir rename '.*.war', 'pdf-as-web.war' } -injectPdfAsWebAppPdfbox2.dependsOn createPdfbox2War +injectPdfAsWebAppPdfbox1.dependsOn createPdfbox1War task buildTomcat(dependsOn: injectPdfAsWebApp, type: Zip) { String targetDir = project.buildDir.toString() + "/tomcat-##VERSION##/apache-tomcat-##VERSION##"; @@ -233,7 +233,7 @@ task buildTomcat(dependsOn: injectPdfAsWebApp, type: Zip) { archiveName archive destinationDir project.buildDir } -task buildTomcatPdfbox2(dependsOn: injectPdfAsWebAppPdfbox2, type: Zip) { +task buildTomcatPdfbox1(dependsOn: injectPdfAsWebAppPdfbox1, type: Zip) { String targetDir = project.buildDir.toString() + "/tomcat-##VERSION##"+deployVersions[1]+"/apache-tomcat-##VERSION##"; targetDir = targetDir.replaceAll("##VERSION##", project.tomcatVersion); @@ -260,7 +260,7 @@ task buildTomcatTar(dependsOn: injectPdfAsWebApp, type: Tar) { destinationDir project.buildDir } -task buildTomcatTarPdfbox2(dependsOn: injectPdfAsWebAppPdfbox2, type: Tar) { +task buildTomcatTarPdfbox1(dependsOn: injectPdfAsWebAppPdfbox1, type: Tar) { String targetDir = project.buildDir.toString() + "/tomcat-##VERSION##"+deployVersions[1]+"/apache-tomcat-##VERSION##"; targetDir = targetDir.replaceAll("##VERSION##", project.tomcatVersion); @@ -285,10 +285,10 @@ 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 + sourceSets.main.compileClasspath += configurations.pdfbox2 + sourceSets.test.compileClasspath += configurations.pdfbox2 + sourceSets.main.compileClasspath -= configurations.pdfbox1 + sourceSets.test.compileClasspath -= configurations.pdfbox1 classpath+=sourceSets.main.compileClasspath } } @@ -312,7 +312,7 @@ task releases(dependsOn: buildTomcat, type: Copy) { } -task releaseCopyPdfbox2(type: Copy){ +task releaseCopyPdfbox1(type: Copy){ String archive = project.buildDir.toString() + "/apache-tomcat-##VERSION##"+deployVersions[1]+"-pdf-as-web-##PVERSION##.zip"; archive = archive.replaceAll("##VERSION##", project.tomcatVersion); archive = archive.replaceAll("##PVERSION##", project.version); @@ -323,8 +323,8 @@ task releaseCopyPdfbox2(type: Copy){ from archive from tararchive - from createPdfbox2War - into rootDir.toString() + "/releases/" + version + from createPdfbox1War + into rootDir.toString() + "/releases/" + version + "/pdfbox1" } @@ -333,10 +333,10 @@ releases.dependsOn sourcesJar releases.dependsOn war releases.dependsOn releaseConfig releases.dependsOn buildTomcatTar -releases.dependsOn createPdfbox2War -releases.dependsOn releaseCopyPdfbox2 -releases.dependsOn buildTomcatPdfbox2 -releases.dependsOn buildTomcatTarPdfbox2 +releases.dependsOn createPdfbox1War +releases.dependsOn releaseCopyPdfbox1 +releases.dependsOn buildTomcatPdfbox1 +releases.dependsOn buildTomcatTarPdfbox1 -war.dependsOn createPdfbox2War +war.dependsOn createPdfbox1War -- cgit v1.2.3