From fe9d3e5d14d32a56d80dc86d96f0d50d792db080 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eivind=20Bergst=C3=B8l?= Date: Thu, 10 Apr 2025 09:44:09 +0200 Subject: [PATCH] Upgrade to jakarta for xml schema, marchalling etc. --- NOTICE | 13 +- api-commons/pom.xml | 13 +- .../no/digipost/api/xml/JaxbMarshaller.java | 9 +- .../java/no/digipost/api/xml/Marshalling.java | 4 +- .../digipost/api/xml/UnmarshallingTest.java | 4 +- api-commons/src/test/resources/difi2.xml | 191 +++++++++--------- api-commons/src/test/resources/fake-ebms.xml | 172 ---------------- pom.xml | 36 ++-- xsd/pom.xml | 108 +++++----- .../no/digipost/xsd/jaxb/XSDateAdapter.java | 3 +- .../digipost/xsd/jaxb/XSDateCustomBinder.java | 3 +- .../digipost/xsd/jaxb/XSDateTimeAdapter.java | 3 +- .../xsd/jaxb/XSDateTimeCustomBinder.java | 3 +- xsd/src/main/jaxb/bindings.xjb | 8 +- 14 files changed, 205 insertions(+), 365 deletions(-) delete mode 100644 api-commons/src/test/resources/fake-ebms.xml diff --git a/NOTICE b/NOTICE index 5b191a7b..bc693075 100644 --- a/NOTICE +++ b/NOTICE @@ -8,19 +8,20 @@ Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.html This software includes third party software subject to the following licenses: + Angus Activation Registries under EDL 1.0 Apache Commons Lang under Apache-2.0 Bouncy Castle Provider under Bouncy Castle Licence - Digipost JAXB Resolver - com.sun.xml.bind under The Apache Software License, Version 2.0 + istack common utility code runtime under Eclipse Distribution License - v 1.0 Jakarta Activation API under EDL 1.0 - JavaBeans Activation Framework API jar under CDDL/GPLv2+CE - jaxb-api under CDDL 1.1 or GPL2 w/ CPE - JAXB2 Basics - Runtime under BSD-Style License + Jakarta XML Binding API under Eclipse Distribution License - v 1.0 + JAXB Core under Eclipse Distribution License - v 1.0 + JAXB Runtime under Eclipse Distribution License - v 1.0 + JAXB Tools :: JAXB Plugins :: Runtime under BSD-Style License JCL 1.2 implemented over SLF4J under Apache License, Version 2.0 JUL to SLF4J bridge under MIT License - Old JAXB Core under CDDL+GPL License - Old JAXB Runtime under Eclipse Distribution License - v 1.0 SDP Shared under The Apache Software License, Version 2.0 SDP Shared - API Commons under The Apache Software License, Version 2.0 SDP Shared - XSD & JAXB under The Apache Software License, Version 2.0 SLF4J API Module under MIT License + TXW2 Runtime under Eclipse Distribution License - v 1.0 diff --git a/api-commons/pom.xml b/api-commons/pom.xml index bb7d1c8b..e9926bbd 100644 --- a/api-commons/pom.xml +++ b/api-commons/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 sdp-api-commons SDP Shared - API Commons @@ -14,13 +15,17 @@ - javax.xml.bind - jaxb-api + jakarta.xml.bind + jakarta.xml.bind-api jakarta.activation jakarta.activation-api + + org.glassfish.jaxb + jaxb-runtime + no.digipost @@ -37,7 +42,7 @@ org.bouncycastle bcprov-jdk18on - + org.slf4j slf4j-api diff --git a/api-commons/src/main/java/no/digipost/api/xml/JaxbMarshaller.java b/api-commons/src/main/java/no/digipost/api/xml/JaxbMarshaller.java index 4e88670c..9883aeea 100644 --- a/api-commons/src/main/java/no/digipost/api/xml/JaxbMarshaller.java +++ b/api-commons/src/main/java/no/digipost/api/xml/JaxbMarshaller.java @@ -1,9 +1,10 @@ package no.digipost.api.xml; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.Unmarshaller; + import javax.xml.transform.Result; import javax.xml.transform.Source; import javax.xml.validation.Schema; diff --git a/api-commons/src/main/java/no/digipost/api/xml/Marshalling.java b/api-commons/src/main/java/no/digipost/api/xml/Marshalling.java index fec12764..f0981903 100644 --- a/api-commons/src/main/java/no/digipost/api/xml/Marshalling.java +++ b/api-commons/src/main/java/no/digipost/api/xml/Marshalling.java @@ -1,5 +1,7 @@ package no.digipost.api.xml; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBException; import no.difi.begrep.sdp.schema_v10.SDPKvittering; import no.digipost.org.oasis_open.docs.ebxml_bp.ebbp_signals_2.NonRepudiationInformation; import no.digipost.org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.Messaging; @@ -9,8 +11,6 @@ import org.w3c.dom.Node; import org.xmlsoap.schemas.soap.envelope.Envelope; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.JAXBException; import javax.xml.transform.stream.StreamSource; import java.io.InputStream; diff --git a/api-commons/src/test/java/no/digipost/api/xml/UnmarshallingTest.java b/api-commons/src/test/java/no/digipost/api/xml/UnmarshallingTest.java index 01a630c8..6cca24c3 100644 --- a/api-commons/src/test/java/no/digipost/api/xml/UnmarshallingTest.java +++ b/api-commons/src/test/java/no/digipost/api/xml/UnmarshallingTest.java @@ -1,18 +1,16 @@ package no.digipost.api.xml; import no.difi.begrep.sdp.schema_v10.SDPDigitalPost; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import javax.xml.transform.stream.StreamSource; import java.io.InputStream; -@Disabled public class UnmarshallingTest { @Test - public void should_unmashall_schema_valid_xml() { + public void should_unmarshall_schema_valid_xml() { InputStream xml = getClass().getResourceAsStream("/difi2.xml"); Marshalling.getMarshallerSingleton().unmarshal(new StreamSource(xml), SDPDigitalPost.class); } diff --git a/api-commons/src/test/resources/difi2.xml b/api-commons/src/test/resources/difi2.xml index 3a233927..52639239 100644 --- a/api-commons/src/test/resources/difi2.xml +++ b/api-commons/src/test/resources/difi2.xml @@ -1,108 +1,97 @@ - + - 31415926535987 - - 9908:123456789 - 123456789-A - asdf - + + + + + + + + + + uooqbWYa5VCqcJCbuymBKqm17vY= + + + KedJuTob5gtvYx9qM3k3gm7kbLBwVbEQRl26S2tmXjqNND7MRGtoew== + + + + MIIElTCCA32gAwIBAgIDDUL8MA0GCSqGSIb3DQEBBQUAMEsxCzAJBgNVBAYTAk5P + MR0wGwYDVQQKDBRCdXlwYXNzIEFTLTk4MzE2MzMyNzEdMBsGA1UEAwwUQnV5cGFz + cyBDbGFzcyAzIENBIDEwHhcNMTEwNTEzMTI0MjU3WhcNMTQwNTEzMTI0MjUzWjBo + MQswCQYDVQQGEwJOTzEYMBYGA1UECgwPUE9TVEVOIE5PUkdFIEFTMREwDwYDVQQL + DAhEaWdpcG9zdDEYMBYGA1UEAwwPUE9TVEVOIE5PUkdFIEFTMRIwEAYDVQQFEwk5 + ODQ2NjExODUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC68mb3nPMY + KPN+jOLJCQ8x2it9PxMh8eiZ0cr5oK7C2fPs/3ywwWpav1yQdsLc5zSMQupzmqXN + OoAirP42sO+MonAmsBbgAmJfKepQCBg5CX3qZUuId6kn7BZcPIMzTWF44wc5UrF1 + TlE2Ib/1ZS05lJCyLkdqpobBBKXoh2PP3xai5hFo8i+bohhyR+RWNxDnjPyp1mMX + 2bLjmD+/g/0QQM3SbwKdjmy7Ylr/2EDrAQ+S0OSjR3G0BnpRCOvhVLcXfjDM1GWq + KIWKnQYFSTMB1cSpkqk9AxMY3MNT/DwUFWOihVlWvVWGjKrTBJC7FZpIqJBchNF4 + hiWv4iNI7vYfAgMBAAGjggFjMIIBXzAJBgNVHRMEAjAAMB8GA1UdIwQYMBaAFDgU + 5sjwqaQD9E4+IqNb8tbgrUB0MB0GA1UdDgQWBBQQPwlTXTPvyhFL30Sf3TxwhBHM + KjAOBgNVHQ8BAf8EBAMCBLAwFQYDVR0gBA4wDDAKBghghEIBGgEDAjCBpQYDVR0f + BIGdMIGaMC+gLaArhilodHRwOi8vY3JsLmJ1eXBhc3Mubm8vY3JsL0JQQ2xhc3Mz + Q0ExLmNybDBnoGWgY4ZhbGRhcDovL2xkYXAuYnV5cGFzcy5uby9kYz1CdXlwYXNz + LGRjPU5PLENOPUJ1eXBhc3MlMjBDbGFzcyUyMDMlMjBDQSUyMDE/Y2VydGlmaWNh + dGVSZXZvY2F0aW9uTGlzdDBDBggrBgEFBQcBAQQ3MDUwMwYIKwYBBQUHMAGGJ2h0 + dHA6Ly9vY3NwLmJ1eXBhc3Mubm8vb2NzcC9CUENsYXNzM0NBMTANBgkqhkiG9w0B + AQUFAAOCAQEAivJd3hg5+16QOv638JlKixMivlZjbtAj8TGDKhnB6sXBw4bNbHQS + GDVdO07JKzBeYcohiYKPSn6+6NAEhJaetwVrhZgMQxNluUSOj+KSxzVVD6NLC3ga + wswK6i3OruBvpynXViNVCTjlmQzi/4pp5NjRNFcbJrfeONZwzClmIqhJorDqhw2T + /55OBEC+FxtQ9bEFBwHT0Qrx4L+HHJP7Vkk0CLWY5Ib89PZHFke/X/ad/HEla8F3 + UjKB02xxs2OKEmE0gQrn3SYjOtONfQDK377RiQPiY3eKV4CBVUcidbfqPyjY/rbZ + TaPOXIYao3VFv6RCTO80zn1qw1JqGvDgNg== + + + + - - 2014-05-17 - false - 3 - Hurra for 17. mai - - - Viktig melding fra Staten i din digitale postkasse - - 0 - 7 - - - - Viktig melding fra Staten - - 1 - - - - + + 9908:123456789 + 123456789-A + ØK1 + - - - - - - - - - - - nøkkelnavn - - ... - ... - - - - Zm9v - - - + + + 17051400000 + ola.nordmann#0ABC + + - - - - - - - - - - uooqbWYa5VCqcJCbuymBKqm17vY= - - - - KedJuTob5gtvYx9qM3k3gm7kbLBwVbEQRl26S2tmXjqNND7MRGtoew== - - - - - MIIElTCCA32gAwIBAgIDDUL8MA0GCSqGSIb3DQEBBQUAMEsxCzAJBgNVBAYTAk5P - MR0wGwYDVQQKDBRCdXlwYXNzIEFTLTk4MzE2MzMyNzEdMBsGA1UEAwwUQnV5cGFz - cyBDbGFzcyAzIENBIDEwHhcNMTEwNTEzMTI0MjU3WhcNMTQwNTEzMTI0MjUzWjBo - MQswCQYDVQQGEwJOTzEYMBYGA1UECgwPUE9TVEVOIE5PUkdFIEFTMREwDwYDVQQL - DAhEaWdpcG9zdDEYMBYGA1UEAwwPUE9TVEVOIE5PUkdFIEFTMRIwEAYDVQQFEwk5 - ODQ2NjExODUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC68mb3nPMY - KPN+jOLJCQ8x2it9PxMh8eiZ0cr5oK7C2fPs/3ywwWpav1yQdsLc5zSMQupzmqXN - OoAirP42sO+MonAmsBbgAmJfKepQCBg5CX3qZUuId6kn7BZcPIMzTWF44wc5UrF1 - TlE2Ib/1ZS05lJCyLkdqpobBBKXoh2PP3xai5hFo8i+bohhyR+RWNxDnjPyp1mMX - 2bLjmD+/g/0QQM3SbwKdjmy7Ylr/2EDrAQ+S0OSjR3G0BnpRCOvhVLcXfjDM1GWq - KIWKnQYFSTMB1cSpkqk9AxMY3MNT/DwUFWOihVlWvVWGjKrTBJC7FZpIqJBchNF4 - hiWv4iNI7vYfAgMBAAGjggFjMIIBXzAJBgNVHRMEAjAAMB8GA1UdIwQYMBaAFDgU - 5sjwqaQD9E4+IqNb8tbgrUB0MB0GA1UdDgQWBBQQPwlTXTPvyhFL30Sf3TxwhBHM - KjAOBgNVHQ8BAf8EBAMCBLAwFQYDVR0gBA4wDDAKBghghEIBGgEDAjCBpQYDVR0f - BIGdMIGaMC+gLaArhilodHRwOi8vY3JsLmJ1eXBhc3Mubm8vY3JsL0JQQ2xhc3Mz - Q0ExLmNybDBnoGWgY4ZhbGRhcDovL2xkYXAuYnV5cGFzcy5uby9kYz1CdXlwYXNz - LGRjPU5PLENOPUJ1eXBhc3MlMjBDbGFzcyUyMDMlMjBDQSUyMDE/Y2VydGlmaWNh - dGVSZXZvY2F0aW9uTGlzdDBDBggrBgEFBQcBAQQ3MDUwMwYIKwYBBQUHMAGGJ2h0 - dHA6Ly9vY3NwLmJ1eXBhc3Mubm8vb2NzcC9CUENsYXNzM0NBMTANBgkqhkiG9w0B - AQUFAAOCAQEAivJd3hg5+16QOv638JlKixMivlZjbtAj8TGDKhnB6sXBw4bNbHQS - GDVdO07JKzBeYcohiYKPSn6+6NAEhJaetwVrhZgMQxNluUSOj+KSxzVVD6NLC3ga - wswK6i3OruBvpynXViNVCTjlmQzi/4pp5NjRNFcbJrfeONZwzClmIqhJorDqhw2T - /55OBEC+FxtQ9bEFBwHT0Qrx4L+HHJP7Vkk0CLWY5Ib89PZHFke/X/ad/HEla8F3 - UjKB02xxs2OKEmE0gQrn3SYjOtONfQDK377RiQPiY3eKV4CBVUcidbfqPyjY/rbZ - TaPOXIYao3VFv6RCTO80zn1qw1JqGvDgNg== - - - - + + 2014-05-17 + false + 3 + Hurra for 17. mai + + + ola@example.com + Viktig melding fra Staten i din digitale postkasse + + 0 + 7 + + + + 12345678 + Viktig melding fra Staten + + 1 + + + + - \ No newline at end of file + + + + + + diff --git a/api-commons/src/test/resources/fake-ebms.xml b/api-commons/src/test/resources/fake-ebms.xml deleted file mode 100644 index a4b938df..00000000 --- a/api-commons/src/test/resources/fake-ebms.xml +++ /dev/null @@ -1,172 +0,0 @@ - - - - - MIIC+zCCAeOgAwIBAgIEeU6smzANBgkqhkiG9w0BAQsFADAnMSUwIwYDVQQDDBxEaWdpcG9zdCBUZXN0IENlcnQgQXV0aG9yaXR5MB4XDTE5MDQxNDIwMDc0OFoXDTE5MTAxNTIwMDc0OFowFDESMBAGA1UEAwwJMTIzNDU2Nzg5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkWCH3+1Clb4VbCzE54SNAfTlXCOkUvvXjyBShL4mEq40ZAjJmWgF9kvY8crQEQNmi7F2bWvnr5QPbUJ5TVf5XBsqJ4sHBlmYkAmgJLgJmfGitgpRQiw6p0ilfscJf/o5VS7mur2jsJmu6mZP0YwZXrcLpk8Fy3R+/evcXwXiddruGWAJ8J7Nz+LUIWhfQYeAS/3v1dm2VB0Rg66kA4G1Z3Ccxwdd5+JeKh2xaOxRtcuKZw6vnQMxv3g4z0Cbh/TUD30sciZXCB7yZK8tsDGZbL8U18nkjOfJqbkKuUbzi8S9RYW1EjqGEXBZRH9FLoaUc6pgvMIE0oB/b0OGsEWHTQIDAQABo0IwQDAdBgNVHQ4EFgQUTcRswyDj4h9F5imwZrNxNHKyWx4wHwYDVR0jBBgwFoAUKYKJg/t4gJpxzSp0SAfVQ5q6cvMwDQYJKoZIhvcNAQELBQADggEBADMK0vurD5/b3gQVgyZdCgjv8QqEsQRhPaeKjHIFYjGMS8d2Icvso10g+UHUCjhhvN733EoRUOGvic33bxVfTOeLmp3AdbTNa57H2wIpU8ID/TbrvK7lB66XO24Gm/taeSPmU/5pQBwTNh4Dwqvv4NHQkWeDUhynDgQ+RHZ5xy2RtTtkEYETsDOtpuoh6kw9jcA8f8D8rynuitJqy3qRLwx9NAYGHQpc0NXqjW+rQJBk5MVqFfgwfqCLCOOxFu6h+Bii9LVUQCTlO5QDo1K4LyeteHjOikC3Al4t8Z8kE/dym+cAPbG3/imnDTy9zomQ69DIVwE+TxjTTZ6w9J1DPLI= - - 2019-04-15T20:07:51.199Z - 2019-04-15T20:12:51.199Z - - - - - - - - - - - - - qg28Dm+fuNQR+Wumem7gH3Tc3WId3vwOXW3QfQtWRko= - - - - - - - - - M/qI+yxY9c7nMzUQg9f8GQA1tQb8s1CrX6ERmy9VetI= - - - - - - - C/WM++VKVIlGP70/b/BmFDDEpL2ud6Ne2LKQMrZyL/I= - - - - - - - bB3MSFw53APknzuIr5UgVolnffEcaCKWWh8aJdOBB4M= - - - e05PSEaSorTL3kSRXVSgwp1hExWmFojBWu+rvnpfwzM0lMrPQYphIVqGPe7EL7IZpAYNBdBcR0x9NO9uWrJhvEYMXKLstbn30Vq1A2MWglfk2hSp+e5V0/Mn0v9YZv4s2eL1DYIfNgi43viFN/sbsWhbZ0MNRW4jeOTmBFCHPBa0v32/3MqCtKsB9wKWYirLwEx97K90Q1DdhBT8lsr+NI4T/+6zN3rGOeQdmzIFkVHiYcREDsex4IpDKbHONF2ts+zGEqltLuMgzVlVJcT+DRCCw0WEaPWE7Cjw/qfH0Df3KXWddh8kwPgsKe7Z7tqukZmiqrSy4+vxiayK+XXkbg== - - - - - - - - - - - 2019-04-15T22:07:50.739+02:00 - fe3f28f5-5b64-40ae-8d46-1faff6606ccc - - - - 9908:123456789 - urn:sdp:meldingsformidler - - - 9908:984661185 - urn:sdp:postkasseleverandør - - - - http://begrep.difi.no/SikkerDigitalPost/1.0/transportlag/Meldingsutveksling/FormidleDigitalPostForsendelse - SDP - FormidleDigitalPost - b8e8a64b-4d7d-43af-89b2-39b74dbb2550 - - - - - - application/cms - sdp:Dokumentpakke - - - - - - - - - - 1.0 - - 9908:889640782 - - - 9908:984661185 - - - urn:no:difi:sdp:1.0 - 1.0 - b8e8a64b-4d7d-43af-89b2-39b74dbb2550 - digitalPost - 2019-04-15T22:07:48.617+02:00 - - - - ConversationId - 171bf87b-575f-4f20-a43f-f982230f6d8c - urn:no:difi:sdp:1.0 - - - - - - - - - - - - - - RM1u2EnvyykKA79qiV+ipGzfHMz96N/Rq1rFuiNMuUk= - - - hfx/l6QO1RD4k6E6QDNzGV+vZGYLF+HCU5JLPNGCfZMZWnjFEjepb/Ow7WrdIfopsGBCycV+q5BR -vmLAija6Yr9WWdSPzuqVfsDbWtUE8a9TG6cqoLCZDejmtPcL7PsuxCNIzSjCwEu6n3u1yLDCJ6oo -4BuxZYtgZJgx7QweE/5j0ww8AzD1cKRF15ODvYHGNF837HWzwOiRXnT9kLxfKmy7dgL4yorfGiJR -IoqsU3mRHGdFz98layYyVUdsZXQk+I0qEJt2Fk45kNVs/fqJGhgtSjKyoOZy/xpCPurf/ZU7HiNY -Bxo29VqVgxfuMNYCShu7ZVttYc4SZnN5Aeoqfg== - - - MIIC+zCCAeOgAwIBAgIEQ0kbRDANBgkqhkiG9w0BAQsFADAnMSUwIwYDVQQDDBxEaWdpcG9zdCBU -ZXN0IENlcnQgQXV0aG9yaXR5MB4XDTE5MDQxNDIwMDc0OFoXDTE5MTAxNTIwMDc0OFowFDESMBAG -A1UEAwwJODg5NjQwNzgyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuIi4ppAIqQaE -vclq/7gCxm+/8Yfmd8oO2nPWryWeUM5wPOcVWbeR6fRn0ng6a9e/zF05fejqKf0sfoWrgz2+eh5a -favII1wKGKNOf5qg+R2HPucZ9XnV7PkAXmTABDNC7VHxVKzSCbgISL4J/CCr6jOfsAi70KSuuUyo -VXHSEsjm98aY7sPpLDutqg7BDtcKWkDw6S3636NJ9pOeosgroZwDZYDEX0nWcOPgEx6Z4x1xUoIF -ttJx2eqsXQYOQVcdRjvi1yYP/D4otAHsUYu/kidNEmOKJ1HECwBITg+8JIrj49hhHbZPMtTJ+DCO -Yx4vsRY/SJMMZcs+TeLsIA/DqQIDAQABo0IwQDAdBgNVHQ4EFgQU6HRnKbUeHbZgZtWInfcwklJ/ -RXkwHwYDVR0jBBgwFoAUKYKJg/t4gJpxzSp0SAfVQ5q6cvMwDQYJKoZIhvcNAQELBQADggEBACP0 -q8cOaFw69AB/+R7rVbfzzMIomVe/33hpNLP4kBfzA2Kz25tbz5LF9/GMhD+Gz2Byp+5HzvE4E6tP -+PZtjmdEEnpra8NO/A0i/eShe4ULUvMB3kYj2Ynu6VoEdtPrJjfh0zrCXkXii+lFBAZ2V9OFa2Xo -JHuY76/nz33Kn5gX5bmif4ku1GPLBAnWy7un9SVkO+Oxik2hoADTo1nC99aSnimR5ClHZzLiFA+F -GzVJwE6F4bW6usOXdvL/DjSO98tIpRZE8/gyQ5G5Inw6/3gO6ZVGSD31zki+8ytDQtqUN1mT72Tt -p+8EcvFWaQDq9SNyUqVZ9a0/xbtqJj0apG0= - - - - - 9908:889640782 - - - - 01013300001 - ola.nordmann#0ABC - - - - false - 3 - Ikke-sensistiv dokument subject - - - - bB3MSFw53APknzuIr5UgVolnffEcaCKWWh8aJdOBB4M= - - - - - \ No newline at end of file diff --git a/pom.xml b/pom.xml index b0aece22..0a0f1533 100644 --- a/pom.xml +++ b/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 sdp-shared @@ -23,7 +24,6 @@ 17 2.0.16 - 3.0.4 0.13.1 @@ -85,14 +85,14 @@ org.junit junit-bom - 5.11.4 + 5.12.1 pom import org.mockito mockito-bom - 5.14.2 + 5.16.1 pom import @@ -106,7 +106,7 @@ org.bouncycastle bcprov-jdk18on - 1.79 + 1.80 @@ -114,19 +114,28 @@ guava 33.4.0-jre - + - no.digipost - jaxb-resolver-com.sun.xml.bind-bom - 1.0 - pom - import + jakarta.xml.bind + jakarta.xml.bind-api + 4.0.2 jakarta.activation jakarta.activation-api 2.1.3 + + org.jvnet.jaxb + jaxb-plugins-runtime + 4.0.8 + + + org.glassfish.jaxb + jaxb-runtime + 4.0.4 + runtime + org.apache.commons @@ -136,7 +145,7 @@ commons-codec commons-codec - 1.17.1 + 1.18.0 @@ -233,9 +242,8 @@ org.codehaus.woodstox:stax2-api com.fasterxml.woodstox:woodstox-core org.jasypt:jasypt - no.digipost:jaxb-resolver-com.sun.xml.bind com.sun.xml.bind:* - org.jvnet.jaxb2_commons:jaxb2-basics-runtime + org.jvnet.jaxb:jaxb-plugins-runtime org.opensaml:* org.cryptacular:cryptacular com.google.guava:guava diff --git a/xsd/pom.xml b/xsd/pom.xml index 959be762..4c4f0fb6 100644 --- a/xsd/pom.xml +++ b/xsd/pom.xml @@ -14,24 +14,18 @@ - org.jvnet.jaxb2_commons - jaxb2-basics-runtime - ${jaxb2-basics.version} - + org.jvnet.jaxb + jaxb-plugins-runtime + - javax.xml.bind - jaxb-api + jakarta.xml.bind + jakarta.xml.bind-api org.junit.jupiter junit-jupiter-api test - - no.digipost - jaxb-resolver-com.sun.xml.bind - runtime - org.hamcrest hamcrest @@ -72,18 +66,30 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin - 0.15.3 - - - - generate - + org.jvnet.jaxb + jaxb-maven-plugin + 4.0.8 + + + org.glassfish.jaxb + codemodel + 4.0.4 + + + org.glassfish.jaxb + jaxb-runtime + 4.0.4 + + + + + + generate + - 2.2 + 3.0 ${basedir}/src/main/difi-begrepskatalog/resources/begrep/sikkerDigitalPost/xsd true src/main/jaxb @@ -104,38 +110,38 @@ -XhashCode -Xfluent-api -Xvalue-constructor - -Xdefault-value - -Xwildcard - -Xinheritance - - - - org.jvnet.jaxb2_commons - jaxb2-basics - ${jaxb2-basics.version} - - - com.sun.xml.bind - jaxb-xjc - 2.3.2 - - - org.jvnet.jaxb2_commons - jaxb2-fluent-api - 3.0 - - - org.jvnet.jaxb2_commons - jaxb2-value-constructor - 3.0 - - - org.jvnet.jaxb2_commons - jaxb2-default-value - 1.1 + -Xdefault-value + -Xwildcard + -Xinheritance + + + + org.jvnet.jaxb + jaxb-plugins + 4.0.0 + + + org.glassfish.jaxb + jaxb-xjc + 4.0.4 + + + no.digipost.jaxb + jaxb2-jackson-helper + 2.0 + + + org.jvnet.jaxb + jaxb-plugin-annotate + 4.0.0 + + + net.codesup.util + jaxb2-rich-contract-plugin + 3.0.0 - - + + diff --git a/xsd/src/main/java/no/digipost/xsd/jaxb/XSDateAdapter.java b/xsd/src/main/java/no/digipost/xsd/jaxb/XSDateAdapter.java index 0eb1c22b..35bfbcdf 100644 --- a/xsd/src/main/java/no/digipost/xsd/jaxb/XSDateAdapter.java +++ b/xsd/src/main/java/no/digipost/xsd/jaxb/XSDateAdapter.java @@ -1,7 +1,8 @@ package no.digipost.xsd.jaxb; -import javax.xml.bind.annotation.adapters.XmlAdapter; + +import jakarta.xml.bind.annotation.adapters.XmlAdapter; import java.time.LocalDate; diff --git a/xsd/src/main/java/no/digipost/xsd/jaxb/XSDateCustomBinder.java b/xsd/src/main/java/no/digipost/xsd/jaxb/XSDateCustomBinder.java index de3c5aa5..74d3d7e4 100644 --- a/xsd/src/main/java/no/digipost/xsd/jaxb/XSDateCustomBinder.java +++ b/xsd/src/main/java/no/digipost/xsd/jaxb/XSDateCustomBinder.java @@ -1,7 +1,8 @@ package no.digipost.xsd.jaxb; -import javax.xml.bind.DatatypeConverter; + +import jakarta.xml.bind.DatatypeConverter; import java.time.LocalDate; import java.time.LocalTime; diff --git a/xsd/src/main/java/no/digipost/xsd/jaxb/XSDateTimeAdapter.java b/xsd/src/main/java/no/digipost/xsd/jaxb/XSDateTimeAdapter.java index 9fea942f..6a3f5fcc 100644 --- a/xsd/src/main/java/no/digipost/xsd/jaxb/XSDateTimeAdapter.java +++ b/xsd/src/main/java/no/digipost/xsd/jaxb/XSDateTimeAdapter.java @@ -1,7 +1,8 @@ package no.digipost.xsd.jaxb; -import javax.xml.bind.annotation.adapters.XmlAdapter; + +import jakarta.xml.bind.annotation.adapters.XmlAdapter; import java.time.ZonedDateTime; diff --git a/xsd/src/main/java/no/digipost/xsd/jaxb/XSDateTimeCustomBinder.java b/xsd/src/main/java/no/digipost/xsd/jaxb/XSDateTimeCustomBinder.java index 7588105c..507e1142 100644 --- a/xsd/src/main/java/no/digipost/xsd/jaxb/XSDateTimeCustomBinder.java +++ b/xsd/src/main/java/no/digipost/xsd/jaxb/XSDateTimeCustomBinder.java @@ -1,7 +1,8 @@ package no.digipost.xsd.jaxb; -import javax.xml.bind.DatatypeConverter; + +import jakarta.xml.bind.DatatypeConverter; import java.time.ZonedDateTime; import java.util.Calendar; diff --git a/xsd/src/main/jaxb/bindings.xjb b/xsd/src/main/jaxb/bindings.xjb index 4a59e212..e0d63355 100644 --- a/xsd/src/main/jaxb/bindings.xjb +++ b/xsd/src/main/jaxb/bindings.xjb @@ -1,11 +1,11 @@ -