Merge branch 'feature/java_17' into 'nightlybuild'

Feature/java 17

See merge request egiz/moa-sig!2

1 files changed, 34 insertions, 13 deletions

diff --git a/moaSig/common/build.gradle b/moaSig/common/build.gradle
index 5f12e76..79f1b02 100644
--- a/moaSig/common/build.gradle
+++ b/moaSig/common/build.gradle
@@ -1,24 +1,45 @@
+plugins {
+    id 'java-library'
+}
+
 dependencies {
-	implementation files('../libs/iaik_jce_full_signed-6.1_moa.jar')
-	api 'org.slf4j:slf4j-api:1.7.36'
-	api 'xerces:xercesImpl:2.12.2'
-	api 'xalan:xalan:2.7.1'
-	api group: 'xalan', name: 'serializer', version: '2.7.1'
-	api 'joda-time:joda-time:2.12.7'
-	api 'jaxen:jaxen:1.2.0'
+    implementation files('../libs/iaik_jce_full_signed-6.1_moa.jar')
+
+    api 'org.slf4j:slf4j-api:2.0.17'
+
+    api(group: 'xerces', name: 'xercesImpl', version: '2.12.2') {
+        exclude group: 'xml-apis', module: 'xml-apis'
+    }
+
+    api(group: 'xalan', name: 'xalan', version: '2.7.1') {
+        exclude group: 'xml-apis', module: 'xml-apis'
+    }
+
+    api(group: 'xalan', name: 'serializer', version: '2.7.1') {
+        exclude group: 'xml-apis', module: 'xml-apis'
+    }
+
+    api 'joda-time:joda-time:2.14.0'
+    api 'jaxen:jaxen:2.0.0'
 }
 
-task testJar(type: Jar, dependsOn: testClasses) {
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+    withJavadocJar()
+    withSourcesJar()
+}
+
+tasks.register('testJar', Jar) {
+    archiveClassifier.set('tests')
     from sourceSets.test.output
-    classifier = 'tests'
 }
 
 configurations {
-    testArtifacts.extendsFrom testCompile
+    testArtifacts
 }
 
 artifacts {
-	testArtifacts testJar
-    //archives testJar
+    testArtifacts(tasks.named('testJar'))
 }
-