diff options
Diffstat (limited to 'pdf-as-web')
| -rw-r--r-- | pdf-as-web/build.gradle | 80 |
1 files changed, 2 insertions, 78 deletions
diff --git a/pdf-as-web/build.gradle b/pdf-as-web/build.gradle index ec6f9a45..99f8d746 100644 --- a/pdf-as-web/build.gradle +++ b/pdf-as-web/build.gradle @@ -23,8 +23,7 @@ buildscript { configurations { providedCompile - pdfbox2 - pdfbox1 + pdfbox2 } jar { @@ -50,7 +49,6 @@ dependencies { api project (':pdf-as-moa') api project (':signature-standards:sigs-pkcs7detached') api project (':signature-standards:sigs-pades') - // pdfbox1 project (':pdf-as-pdfbox') api project (':pdf-as-web-status') api project (':pdf-as-web-statistic-api') api group: 'commons-fileupload', name: 'commons-fileupload', version: '1.3.1' @@ -126,7 +124,7 @@ task extractTomcat(dependsOn: downloadTomcat, type: Copy) { into outputDir } -def deployVersions=['','-pdfbox1'] +def deployVersions=[''] task copyTomcat(dependsOn: extractTomcat) { doLast { @@ -216,32 +214,6 @@ task injectPdfAsWebApp(dependsOn: putWebConfigIntoTomcat, type: Copy) { } injectPdfAsWebApp.dependsOn war -task createPdfbox1War(type:War){ - //destinationDir = file("$buildDir/libs/pdfbox2") - appendix = "pdfbox1" - 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 - } -} - - - -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 createPdfbox1War.outputs - into targetDir - rename '.*.war', 'pdf-as-web.war' -} -injectPdfAsWebAppPdfbox1.dependsOn createPdfbox1War - task buildTomcat(dependsOn: injectPdfAsWebApp, type: Zip) { String targetDir = project.buildDir.toString() + "/tomcat-##VERSION##/apache-tomcat-##VERSION##"; targetDir = targetDir.replaceAll("##VERSION##", project.tomcatVersion); @@ -254,18 +226,6 @@ task buildTomcat(dependsOn: injectPdfAsWebApp, type: Zip) { archiveName archive destinationDir project.buildDir } -task buildTomcatPdfbox1(dependsOn: injectPdfAsWebAppPdfbox1, type: Zip) { - String targetDir = project.buildDir.toString() + "/tomcat-##VERSION##"+deployVersions[1]+"/apache-tomcat-##VERSION##"; - targetDir = targetDir.replaceAll("##VERSION##", project.tomcatVersion); - - String archive = "apache-tomcat-##VERSION##"+deployVersions[1]+"-pdf-as-web-##PVERSION##.zip"; - archive = archive.replaceAll("##VERSION##", project.tomcatVersion); - archive = archive.replaceAll("##PVERSION##", project.version); - - from targetDir - archiveName archive - destinationDir project.buildDir -} task buildTomcatTar(dependsOn: injectPdfAsWebApp, type: Tar) { @@ -281,20 +241,6 @@ task buildTomcatTar(dependsOn: injectPdfAsWebApp, type: Tar) { destinationDir project.buildDir } -task buildTomcatTarPdfbox1(dependsOn: injectPdfAsWebAppPdfbox1, type: Tar) { - - String targetDir = project.buildDir.toString() + "/tomcat-##VERSION##"+deployVersions[1]+"/apache-tomcat-##VERSION##"; - targetDir = targetDir.replaceAll("##VERSION##", project.tomcatVersion); - - String archive = "apache-tomcat-##VERSION##"+deployVersions[1]+"-pdf-as-web-##PVERSION##.tar"; - archive = archive.replaceAll("##VERSION##", project.tomcatVersion); - archive = archive.replaceAll("##PVERSION##", project.version); - - from targetDir - archiveName archive - destinationDir project.buildDir -} - task releaseConfig(type: Copy) { @@ -308,8 +254,6 @@ 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 } } @@ -333,20 +277,6 @@ task releases(dependsOn: buildTomcat, 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); - - String tararchive = project.buildDir.toString() + "/apache-tomcat-##VERSION##"+deployVersions[1]+"-pdf-as-web-##PVERSION##.tar"; - tararchive = tararchive.replaceAll("##VERSION##", project.tomcatVersion); - tararchive = tararchive.replaceAll("##PVERSION##", project.version); - - from archive - from tararchive - from createPdfbox1War - into rootDir.toString() + "/releases/" + version + "/pdfbox1" -} releases.dependsOn jar @@ -354,10 +284,4 @@ releases.dependsOn sourcesJar releases.dependsOn war releases.dependsOn releaseConfig releases.dependsOn buildTomcatTar -releases.dependsOn createPdfbox1War -releases.dependsOn releaseCopyPdfbox1 -releases.dependsOn buildTomcatPdfbox1 -releases.dependsOn buildTomcatTarPdfbox1 - -war.dependsOn createPdfbox1War |