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-lib/build.gradle | 56 ++++++++++++++++++++++++++++---------------------
 1 file changed, 32 insertions(+), 24 deletions(-)

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

diff --git a/pdf-as-lib/build.gradle b/pdf-as-lib/build.gradle
index 1ddc1f9a..634d7df4 100644
--- a/pdf-as-lib/build.gradle
+++ b/pdf-as-lib/build.gradle
@@ -1,4 +1,4 @@
-apply plugin: 'java'
+apply plugin: 'java-library'
 apply plugin: 'eclipse'
 apply plugin: 'java-library-distribution'
 
@@ -13,7 +13,8 @@ buildscript {
 		mavenLocal()
 		mavenCentral()
 	}
-	dependencies { classpath("commons-io:commons-io:2.4") }
+	dependencies { classpath("commons-io:commons-io:2.8.0") }
+
 }
 
 sourceSets {
@@ -22,6 +23,11 @@ sourceSets {
 			srcDirs = [ 'src/main/java', 'src/generated/java' ]
 		}
 	}
+	test {
+		java {
+			srcDirs = ["src/test/java"]
+		}
+	}
 }
 
 configurations { 
@@ -41,6 +47,7 @@ project.ext {
 
 task createConf(type: Zip, dependsOn: JavaPlugin.PROCESS_RESOURCES_TASK_NAME) {
 	from 'src/configuration'
+	//archiveBaseName 'config'
 	archiveName 'config.zip'
 	destinationDir new File(projectDir, 'src/main/resources/config')
 }
@@ -54,29 +61,30 @@ repositories {
 }
 
 dependencies {
-	compile project (':pdf-as-common')
-	compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.10'
-	compile group: 'org.apache.httpcomponents', name: 'httpmime', version: '4.5.12'
-	compile group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.12'
-    compile group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.65'
-	compile group: 'javax.activation', name: 'activation', version: '1.1.1'
-	compile group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.1'
-	compile group: 'com.google.code.gson', name: 'gson', version: '2.8.6'
-	compile group: 'org.bitbucket.b_c', name: 'jose4j', version: '0.7.0'
-	compile group: 'commons-io', name: 'commons-io', version: '2.6'
-	compile group: 'org.glassfish.jaxb', name: 'jaxb-runtime', version: '2.3.3'
-	compile 'org.apache.commons:commons-collections4:4.4'
-	compile group: 'ognl', name: 'ognl', version: '3.0.8'
-	compile files('libs/iaik_eccelerate_cms.jar')
-	compile files('libs/iaik_eccelerate.jar')
-	compile files('libs/iaik_jce_full.jar')
-	compile files('libs/iaik_cms.jar')
-	compile group: 'org.slf4j', name: 'slf4j-api', version: slf4jVersion
-	compile group: 'org.slf4j', name: 'jcl-over-slf4j', version: slf4jVersion
+	api project (':pdf-as-common')
+	api group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
+	api group: 'org.apache.httpcomponents', name: 'httpmime', version: '4.5.13'
+	api group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.13'
+    api group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.68'
+	api group: 'javax.activation', name: 'activation', version: '1.1.1'
+	api group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.1'
+	api group: 'com.google.code.gson', name: 'gson', version: '2.8.6'
+	api group: 'org.bitbucket.b_c', name: 'jose4j', version: '0.7.6'
+	api group: 'commons-io', name: 'commons-io', version: '2.8'
+	api group: 'org.glassfish.jaxb', name: 'jaxb-runtime', version: '2.3.3'
+	api 'org.apache.commons:commons-collections4:4.4'
+	api group: 'ognl', name: 'ognl', version: '3.2.19'
+	api files('libs/iaik_eccelerate_cms.jar')
+	api files('libs/iaik_eccelerate.jar')
+	api files('libs/iaik_jce_full.jar')
+	api files('libs/iaik_cms.jar')
+	api group: 'org.slf4j', name: 'slf4j-api', version: slf4jVersion
+	api group: 'org.slf4j', name: 'jcl-over-slf4j', version: slf4jVersion
 	
-	compile group: 'com.google.zxing', name: 'core', version: '3.2.0'
-	compile group: 'com.google.zxing', name: 'javase', version: '3.2.0'
-	testCompile group: 'junit', name: 'junit', version: '4.+'
+	api group: 'com.google.zxing', name: 'core', version: '3.4.1'
+	api group: 'com.google.zxing', name: 'javase', version: '3.4.1'
+	testImplementation group: 'junit', name: 'junit', version: '4.+'
+	testCompile "junit:junit:4.11"
 	ws group: 'org.apache.cxf', name: 'cxf-tools', version: cxfVersion
 	ws group: 'org.apache.cxf', name: 'cxf-tools-wsdlto-databinding-jaxb', version: cxfVersion
 	ws group: 'org.apache.cxf', name: 'cxf-tools-wsdlto-frontend-jaxws', version: cxfVersion
-- 
cgit v1.2.3