[libeufin] branch master updated: fix dependency versions

[gnunet]

This is an automated email from the git hooks/post-receive script.

dold pushed a commit to branch master
in repository libeufin.

The following commit(s) were added to refs/heads/master by this push:
     new ea45e29  fix dependency versions
ea45e29 is described below

commit ea45e298ccd6661982cec63a2ba905eb95b76a9f
Author: Florian Dold <florian@dold.me>
AuthorDate: Tue Aug 3 00:27:02 2021 +0200

    fix dependency versions
---
 nexus/build.gradle              |  6 +++---
 sandbox/build.gradle            | 10 ++++++----
 util/build.gradle               | 11 +++++++----
 util/src/main/kotlin/XMLUtil.kt |  2 +-
 4 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/nexus/build.gradle b/nexus/build.gradle
index aa9bbe6..8ef0836 100644
--- a/nexus/build.gradle
+++ b/nexus/build.gradle
@@ -66,9 +66,9 @@ dependencies {
     implementation 'ch.qos.logback:logback-classic:1.2.5'
 
     // XML parsing/binding and encryption
-    implementation group: 'javax.xml.bind', name: 'jaxb-api', version: 
'2.4.0-b180830.0359'
-    implementation 'javax.xml.bind:jaxb-api:2.4.0-b180830.0359'
-    implementation 'org.glassfish.jaxb:jaxb-runtime:3.0.1'
+    implementation group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.1'
+    implementation "javax.xml.bind:jaxb-api:2.3.0"
+    implementation "org.glassfish.jaxb:jaxb-runtime:2.3.1"
     implementation 'org.apache.santuario:xmlsec:2.2.2'
 
     // Compression
diff --git a/sandbox/build.gradle b/sandbox/build.gradle
index a33257c..8cf8369 100644
--- a/sandbox/build.gradle
+++ b/sandbox/build.gradle
@@ -47,11 +47,13 @@ dependencies {
     implementation "com.hubspot.jinjava:jinjava:2.5.9"
     implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.21'
     implementation 'ch.qos.logback:logback-classic:1.2.5'
-    implementation group: 'javax.xml.bind', name: 'jaxb-api', version: 
'2.4.0-b180830.0359'
-    implementation 'javax.xml.bind:jaxb-api:2.4.0-b180830.0359'
-    implementation 'javax.activation:activation:1.1.1'
-    implementation 'org.glassfish.jaxb:jaxb-runtime:3.0.1'
+
+    // XML Stuff
+    implementation group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.1'
+    implementation "javax.xml.bind:jaxb-api:2.3.0"
+    implementation "org.glassfish.jaxb:jaxb-runtime:2.3.1"
     implementation 'org.apache.santuario:xmlsec:2.2.2'
+
     implementation group: 'org.bouncycastle', name: 'bcprov-jdk16', version: 
'1.46'
     implementation group: 'org.xerial', name: 'sqlite-jdbc', version: 
'3.36.0.1'
     implementation 'org.postgresql:postgresql:42.2.23.jre7'
diff --git a/util/build.gradle b/util/build.gradle
index 346acf1..52a551d 100644
--- a/util/build.gradle
+++ b/util/build.gradle
@@ -32,13 +32,16 @@ dependencies {
     implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.21'
     implementation 'io.ktor:ktor-server-netty:1.6.1'
     implementation 'ch.qos.logback:logback-classic:1.2.5'
-    implementation group: 'javax.xml.bind', name: 'jaxb-api', version: 
'2.4.0-b180830.0359'
-    implementation 'javax.xml.bind:jaxb-api:2.4.0-b180830.0359'
 
-    implementation 'javax.activation:activation:1.1.1'
-    implementation 'org.glassfish.jaxb:jaxb-runtime:3.0.1'
+    // XML Stuff
+    implementation group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.1'
+    implementation "javax.xml.bind:jaxb-api:2.3.0"
+    implementation "org.glassfish.jaxb:jaxb-runtime:2.3.1"
     implementation 'org.apache.santuario:xmlsec:2.2.2'
+
     implementation group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: 
'1.69'
+
+    // Compression
     implementation group: 'org.apache.commons', name: 'commons-compress', 
version: '1.21'
 
     // https://mvnrepository.com/artifact/org.jetbrains.kotlin/kotlin-reflect
diff --git a/util/src/main/kotlin/XMLUtil.kt b/util/src/main/kotlin/XMLUtil.kt
index dcda335..fcd12f9 100644
--- a/util/src/main/kotlin/XMLUtil.kt
+++ b/util/src/main/kotlin/XMLUtil.kt
@@ -19,8 +19,8 @@
 
 package tech.libeufin.util
 
+import com.sun.xml.bind.marshaller.NamespacePrefixMapper
 import io.ktor.http.*
-import org.glassfish.jaxb.runtime.marshaller.NamespacePrefixMapper
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 import org.w3c.dom.Document

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.