Merge branch 'master' of gitlab.iaik.tugraz.at:egiz/moa-sig

# Conflicts:
#	moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationPartsBuilder.java
#	moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationProvider.java

1 files changed, 19 insertions, 6 deletions

diff --git a/moaSig/common/build.gradle b/moaSig/common/build.gradle
index 9b88188..5e9122b 100644
--- a/moaSig/common/build.gradle
+++ b/moaSig/common/build.gradle
@@ -1,10 +1,23 @@
 dependencies {
-	compile files('../libs/iaik_jce_full.jar')
+	implementation files('../libs/iaik_jce_full-5.62_moa.jar')
+	api 'org.slf4j:slf4j-api:1.7.30'
+	api 'xerces:xercesImpl:2.12.0'
+	api 'xalan:xalan:2.7.1'
+	api group: 'xalan', name: 'serializer', version: '2.7.1'
+	api 'joda-time:joda-time:2.10.10'
+	api 'jaxen:jaxen:1.2.0'
+}
+
+task testJar(type: Jar, dependsOn: testClasses) {
+    from sourceSets.test.output
+    classifier = 'tests'
+}
+
+configurations {
+    tests
+}
 
-	compile 'org.slf4j:slf4j-api:1.7.12'
-	compile 'xerces:xercesImpl:2.11.0'
-	compile 'xalan:xalan:2.7.1'
-	compile 'joda-time:joda-time:2.8.2'
-	compile 'jaxen:jaxen:1.1.6'
+artifacts {
+    archives testJar
 }