diff options
| author | Thomas <> | 2021-12-15 08:42:11 +0100 |
|---|---|---|
| committer | Thomas <> | 2021-12-15 08:42:11 +0100 |
| commit | 549e433c60f30a49fd7164967d3afe1a4998930b (patch) | |
| tree | 105e698da63fa5e67bd3ff11bdd22d7cf589db5b /moaSig/moa-sig-lib | |
| parent | 48de4fce4f95610d877aaf0f4fbec581513f5c3c (diff) | |
| download | moa-sig-549e433c60f30a49fd7164967d3afe1a4998930b.tar.gz moa-sig-549e433c60f30a49fd7164967d3afe1a4998930b.tar.bz2 moa-sig-549e433c60f30a49fd7164967d3afe1a4998930b.zip | |
switch to JAXB API v3.0
Diffstat (limited to 'moaSig/moa-sig-lib')
3 files changed, 6 insertions, 4 deletions
diff --git a/moaSig/moa-sig-lib/build.gradle b/moaSig/moa-sig-lib/build.gradle index 8c8684e..4cdd626 100644 --- a/moaSig/moa-sig-lib/build.gradle +++ b/moaSig/moa-sig-lib/build.gradle @@ -12,13 +12,15 @@ dependencies { testImplementation project(path: ':common', configuration: 'testArtifacts') api fileTree(dir: '../libs', include: '*.jar') - api group: 'at.gv.egovernment.moa.sig', name: 'tsl-lib', version: '2.0.6' + api group: 'at.gv.egovernment.moa.sig', name: 'tsl-lib', version: '2.1.0' api 'commons-logging:commons-logging:1.2' api 'commons-io:commons-io:2.11.0' api 'commons-codec:commons-codec:1.15' api 'org.apache.axis:axis-jaxrpc:1.4' api 'org.xerial:sqlite-jdbc:3.36.0.3' - api 'javax.xml.bind:jaxb-api:2.3.1' + //api 'javax.xml.bind:jaxb-api:2.3.1' + api 'javax.activation:activation:1.1.1' + api 'jakarta.xml.bind:jakarta.xml.bind-api:3.0.1' api 'com.sun.xml.bind:jaxb-core:3.0.2' api 'com.sun.xml.bind:jaxb-impl:3.0.2' api 'org.postgresql:postgresql:42.3.1' diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/ResponseBuilderUtils.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/ResponseBuilderUtils.java index dff1fcc..1156aa1 100644 --- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/ResponseBuilderUtils.java +++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/ResponseBuilderUtils.java @@ -31,7 +31,6 @@ import java.util.Date; import java.util.GregorianCalendar; import java.util.TimeZone; -import javax.xml.bind.DatatypeConverter; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; @@ -51,6 +50,7 @@ import at.gv.egovernment.moaspss.util.Constants; import at.gv.egovernment.moaspss.util.MiscUtil; import iaik.utils.RFC2253NameParser; import iaik.utils.RFC2253NameParserException; +import jakarta.xml.bind.DatatypeConverter; /** * Utility methods used by the verious <code>ResponseBuilder</code> classes. diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationPartsBuilder.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationPartsBuilder.java index 8fe31c5..533931d 100644 --- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationPartsBuilder.java +++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationPartsBuilder.java @@ -41,7 +41,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.xml.bind.DatatypeConverter; import javax.xml.parsers.ParserConfigurationException; import org.w3c.dom.Attr; @@ -71,6 +70,7 @@ import iaik.utils.RFC2253NameParser; import iaik.utils.RFC2253NameParserException; import iaik.xml.crypto.utils.URI; import iaik.xml.crypto.utils.URIException; +import jakarta.xml.bind.DatatypeConverter; /** * A class that builds configuration data from a DOM based representation. |