From 8ed8e4e931c1cb3d3c814a53a07f73b566c3b719 Mon Sep 17 00:00:00 2001
From: Alexander Marsalek <amarsalek@iaik.tugraz.at>
Date: Fri, 2 Jul 2021 14:06:44 +0200
Subject: v4.2.0

---
 pdf-as-cli/build.gradle | 74 ++++++++-----------------------------------------
 1 file changed, 12 insertions(+), 62 deletions(-)

(limited to 'pdf-as-cli/build.gradle')

diff --git a/pdf-as-cli/build.gradle b/pdf-as-cli/build.gradle
index 3c80e425..79efe54a 100644
--- a/pdf-as-cli/build.gradle
+++ b/pdf-as-cli/build.gradle
@@ -1,4 +1,4 @@
-apply plugin: 'java'
+apply plugin: 'java-library'
 apply plugin: 'eclipse'
 apply plugin: 'application'
 
@@ -16,8 +16,7 @@ task releases(type: Copy) {
 }
 
 configurations { 
-	pdfBox2Compile 
-	pdfBox1Compile	
+	pdfBox2Compile
 }
 
 sourceSets{
@@ -25,24 +24,19 @@ sourceSets{
 		compileClasspath = configurations.pdfBox2Compile
 		runtimeClasspath = configurations.pdfBox2Compile + main.runtimeClasspath
 	}
-	pdfBox1{
-		compileClasspath = configurations.pdfBox1Compile
-		runtimeClasspath = configurations.pdfBox1Compile + main.runtimeClasspath
-	}
 }
 			   
 dependencies {
-	compile project (':pdf-as-lib')
-	compile project (':signature-standards:sigs-pkcs7detached')
-	compile project (':signature-standards:sigs-pades')
-	compile project (':pdf-as-moa')
-	pdfBox1Compile project (':pdf-as-pdfbox')
-	pdfBox2Compile project (':pdf-as-pdfbox-2')
-    compile group: 'commons-collections', name: 'commons-collections', version: '3.2.2'
-	compile group: 'commons-cli', name: 'commons-cli', version: '1.2'
-	compile group: 'javax.activation', name: 'activation', version: '1.1.1'
-	compile 'ch.qos.logback:logback-classic:1.1.2'
-    testCompile group: 'junit', name: 'junit', version: '4.+'
+	implementation project (':pdf-as-lib')
+	implementation project (':signature-standards:sigs-pkcs7detached')
+	implementation project (':signature-standards:sigs-pades')
+	implementation project (':pdf-as-moa')
+    implementation project (':pdf-as-pdfbox-2')
+    implementation group: 'commons-collections', name: 'commons-collections', version: '3.2.2'
+	implementation group: 'commons-cli', name: 'commons-cli', version: '1.2'
+	implementation group: 'javax.activation', name: 'activation', version: '1.1.1'
+	implementation 'ch.qos.logback:logback-classic:1.1.2'
+    testImplementation group: 'junit', name: 'junit', version: '4.+'
 }
 
 
@@ -52,62 +46,18 @@ startScripts{
 
 compileJava{
     classpath=sourceSets.main.compileClasspath
-	classpath+=sourceSets.pdfBox1.compileClasspath
 	classpath+=sourceSets.pdfBox2.compileClasspath
 }
 
 
-task pdfbox1Startscript(type: CreateStartScripts) {
-    description "Creates OS specific scripts to call the 'other' entry point"
-
-    classpath = startScripts.classpath.minus(configurations.pdfBox2Compile) + sourceSets.pdfBox1.compileClasspath
-    outputDir = startScripts.outputDir
-    mainClassName = startScripts.mainClassName
-    applicationName = startScripts.applicationName+"-pdfbox1"
-}
-
-distZip {
-	baseName = archivesBaseName
-	duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-
-    into("${baseName}-${version}/lib") {
-        from startScripts.classpath
-    }
-    into("${baseName}-${version}/lib") {
-        from pdfbox1Startscript.classpath
-    }
-    into("${baseName}-${version}/bin") {
-        from pdfbox1Startscript
-    }
-}
-
-distTar {
-    baseName = archivesBaseName
-	duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-
-    into("${baseName}-${version}/lib") {
-        from startScripts.classpath
-    }
-    into("${baseName}-${version}/lib") {
-        from pdfbox1Startscript.classpath
-    }
-    into("${baseName}-${version}/bin") {
-        from pdfbox1Startscript
-    }
-}
-
-
 releases.dependsOn jar
 releases.dependsOn sourcesJar
 releases.dependsOn distZip
 releases.dependsOn distTar
 
 distZip.dependsOn startScripts
-startScripts.dependsOn pdfbox1Startscript
-
 
 
 test {
     systemProperties 'property': 'value'
 }
-
-- 
cgit v1.2.3