diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cf79937a..3843ad9f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -6,11 +6,11 @@ jobs: build: strategy: matrix: - java: [ '8', '11' ] + java: [ '17', '21' ] name: Build on Java ${{ matrix.java }} runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: submodules: recursive - uses: actions/setup-java@v3 diff --git a/.java-version b/.java-version new file mode 100644 index 00000000..98d9bcb7 --- /dev/null +++ b/.java-version @@ -0,0 +1 @@ +17 diff --git a/.mvn/maven.config b/.mvn/maven.config index 75848f4a..95eda45f 100644 --- a/.mvn/maven.config +++ b/.mvn/maven.config @@ -1 +1 @@ --Pbuild-sources-and-javadoc +-Pbuild-sources-and-javadoc,dependency-analyze,include-NOTICE diff --git a/NOTICE b/NOTICE new file mode 100644 index 00000000..a9c8d218 --- /dev/null +++ b/NOTICE @@ -0,0 +1,64 @@ +Digipost XSD + +Copyright 2014 Posten Norge AS. All Rights Reserved. + +This product includes software developed by Posten Norge AS. - https://www.posten.no/ +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 Codec under Apache License, Version 2.0 + Apache Commons Lang under Apache-2.0 + Apache HttpClient under Apache License, Version 2.0 + Apache HttpCore under Apache License, Version 2.0 + Apache WSS4J DOM WS-Security under Apache-2.0 + Apache WSS4J WS-Security Common under Apache-2.0 + Apache XML Security for Java under Apache-2.0 + Bouncy Castle Provider under Bouncy Castle Licence + Cryptacular Library under Apache 2 or GNU Lesser General Public License + Digipost JAXB Resolver - com.sun.xml.bind under The Apache Software License, Version 2.0 + Extended StAX API under Eclipse Distribution License - v 1.0 + Guava InternalFutureFailureAccess and InternalFutures under The Apache Software License, Version 2.0 + Guava: Google Core Libraries for Java under Apache License, Version 2.0 + istack common utility code runtime under Eclipse Distribution License - v 1.0 + Jakarta Activation API under EDL 1.0 + Jakarta Mail API under EPL 2.0 or GPL2 w/ CPE or EDL 1.0 + Jakarta SOAP Implementation under Eclipse Distribution License - v 1.0 + Jakarta SOAP with Attachments API under Eclipse Distribution License - v 1.0 + Jakarta XML Binding API under Eclipse Distribution License - v 1.0 + JASYPT: Java Simplified Encryption under The Apache Software License, Version 2.0 + JavaBeans Activation Framework API jar under CDDL/GPLv2+CE + JAXB Core under Eclipse Distribution License - v 1.0 + JAXB Runtime under Eclipse Distribution License - v 1.0 + jaxb-api under CDDL 1.1 or GPL2 w/ CPE + JAXB2 Basics - Runtime under BSD-Style License + JCL 1.2 implemented over SLF4J under Apache License, Version 2.0 + JUL to SLF4J bridge under MIT License + micrometer-commons under The Apache Software License, Version 2.0 + micrometer-observation under The Apache Software License, Version 2.0 + 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 Client 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 + Spring AOP under Apache License, Version 2.0 + Spring Beans under Apache License, Version 2.0 + Spring Commons Logging Bridge under Apache License, Version 2.0 + Spring Context under Apache License, Version 2.0 + Spring Core under Apache License, Version 2.0 + Spring Expression Language (SpEL) under Apache License, Version 2.0 + Spring Object/XML Marshalling under Apache License, Version 2.0 + Spring Transaction under Apache License, Version 2.0 + Spring Web under Apache License, Version 2.0 + Spring Web MVC under Apache License, Version 2.0 + spring-security-core under Apache License, Version 2.0 + spring-security-crypto under Apache License, Version 2.0 + spring-ws-core under Apache License, Version 2.0 + spring-ws-security under Apache License, Version 2.0 + spring-xml under Apache License, Version 2.0 + TXW2 Runtime under Eclipse Distribution License - v 1.0 + diff --git a/api-client/NOTICE b/api-client/NOTICE index 6261c9fb..a96b9b07 100644 --- a/api-client/NOTICE +++ b/api-client/NOTICE @@ -8,32 +8,39 @@ 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 Codec under Apache License, Version 2.0 - Apache Commons Lang under Apache License, Version 2.0 + Apache Commons Lang under Apache-2.0 Apache HttpClient under Apache License, Version 2.0 Apache HttpCore under Apache License, Version 2.0 - Apache WSS4J DOM WS-Security under Apache License, Version 2.0 - Apache WSS4J WS-Security Common under Apache License, Version 2.0 - Apache XML Security for Java under Apache License, Version 2.0 + Apache WSS4J DOM WS-Security under Apache-2.0 + Apache WSS4J WS-Security Common under Apache-2.0 + Apache XML Security for Java under Apache-2.0 Bouncy Castle Provider under Bouncy Castle Licence Cryptacular Library under Apache 2 or GNU Lesser General Public License Digipost JAXB Resolver - com.sun.xml.bind under The Apache Software License, Version 2.0 Extended StAX API under Eclipse Distribution License - v 1.0 Guava InternalFutureFailureAccess and InternalFutures under The Apache Software License, Version 2.0 Guava: Google Core Libraries for Java under Apache License, Version 2.0 + istack common utility code runtime under Eclipse Distribution License - v 1.0 + Jakarta Activation API under EDL 1.0 + Jakarta Mail API under EPL 2.0 or GPL2 w/ CPE or EDL 1.0 + Jakarta SOAP Implementation under Eclipse Distribution License - v 1.0 + Jakarta SOAP with Attachments API under Eclipse Distribution License - v 1.0 + Jakarta XML Binding API under Eclipse Distribution License - v 1.0 JASYPT: Java Simplified Encryption under The Apache Software License, Version 2.0 JavaBeans Activation Framework API jar under CDDL/GPLv2+CE - javax.xml.soap API under CDDL + GPLv2 with classpath exception + JAXB Core under Eclipse Distribution License - v 1.0 + JAXB Runtime under Eclipse Distribution License - v 1.0 jaxb-api under CDDL 1.1 or GPL2 w/ CPE JAXB2 Basics - Runtime under BSD-Style License JCL 1.2 implemented over SLF4J under Apache License, Version 2.0 - Joda-Time under Apache License, Version 2.0 JUL to SLF4J bridge under MIT License Log4j Implemented Over SLF4J under Apache Software Licenses - MIME streaming extension under Eclipse Distribution License - v 1.0 + micrometer-commons under The Apache Software License, Version 2.0 + micrometer-observation under The Apache Software License, Version 2.0 Old JAXB Core under CDDL+GPL License Old JAXB Runtime under Eclipse Distribution License - v 1.0 - saaj-impl under Eclipse Distribution License - v 1.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 @@ -52,4 +59,5 @@ This software includes third party software subject to the following licenses: spring-ws-core under Apache License, Version 2.0 spring-ws-security under Apache License, Version 2.0 spring-xml under Apache License, Version 2.0 + TXW2 Runtime under Eclipse Distribution License - v 1.0 diff --git a/api-client/pom.xml b/api-client/pom.xml index af836b6a..5a1c4b6b 100644 --- a/api-client/pom.xml +++ b/api-client/pom.xml @@ -14,8 +14,8 @@ - javax.activation - javax.activation-api + jakarta.activation + jakarta.activation-api no.digipost @@ -36,8 +36,8 @@ - javax.xml.soap - javax.xml.soap-api + jakarta.xml.soap + jakarta.xml.soap-api @@ -55,10 +55,6 @@ jcl-over-slf4j runtime - - org.slf4j - log4j-over-slf4j - org.slf4j jul-to-slf4j @@ -68,6 +64,11 @@ slf4j-simple test + + no.digipost + jul-to-slf4j-junit-extension + test + @@ -117,27 +118,4 @@ - - - - maven-dependency-plugin - - - check-dependency-declarations-vs-usage - - analyze-only - - - true - true - - - - - - org.jasig.maven - maven-notice-plugin - - - diff --git a/api-client/src/main/java/no/digipost/api/MessageFactorySupplier.java b/api-client/src/main/java/no/digipost/api/MessageFactorySupplier.java index 93bfeb17..88914fa7 100644 --- a/api-client/src/main/java/no/digipost/api/MessageFactorySupplier.java +++ b/api-client/src/main/java/no/digipost/api/MessageFactorySupplier.java @@ -1,8 +1,8 @@ package no.digipost.api; -import javax.xml.soap.MessageFactory; -import javax.xml.soap.SOAPConstants; -import javax.xml.soap.SOAPException; +import jakarta.xml.soap.MessageFactory; +import jakarta.xml.soap.SOAPConstants; +import jakarta.xml.soap.SOAPException; @FunctionalInterface diff --git a/api-client/src/main/java/no/digipost/api/MessageSender.java b/api-client/src/main/java/no/digipost/api/MessageSender.java index 9693b439..6450c26f 100644 --- a/api-client/src/main/java/no/digipost/api/MessageSender.java +++ b/api-client/src/main/java/no/digipost/api/MessageSender.java @@ -1,6 +1,8 @@ package no.digipost.api; +import jakarta.xml.soap.MessageFactory; +import jakarta.xml.soap.SOAPException; import no.digipost.api.exceptions.MessageSenderFaultMessageResolver; import no.digipost.api.handlers.ApplikasjonsKvitteringReceiver; import no.digipost.api.handlers.BekreftelseSender; @@ -46,8 +48,6 @@ import org.springframework.ws.soap.saaj.SaajSoapMessageFactory; import org.springframework.ws.transport.http.HttpComponentsMessageSender; -import javax.xml.soap.MessageFactory; -import javax.xml.soap.SOAPException; import javax.xml.transform.Result; import javax.xml.transform.Source; diff --git a/api-client/src/main/java/no/digipost/api/handlers/ForsendelseSender.java b/api-client/src/main/java/no/digipost/api/handlers/ForsendelseSender.java index 183b8a09..9b79f151 100644 --- a/api-client/src/main/java/no/digipost/api/handlers/ForsendelseSender.java +++ b/api-client/src/main/java/no/digipost/api/handlers/ForsendelseSender.java @@ -1,5 +1,6 @@ package no.digipost.api.handlers; +import jakarta.activation.DataHandler; import no.digipost.api.SdpMeldingSigner; import no.digipost.api.interceptors.steps.AddUserMessageStep; import no.digipost.api.representations.EbmsAktoer; @@ -17,7 +18,6 @@ import org.springframework.ws.soap.SoapMessage; import org.w3c.dom.Document; -import javax.activation.DataHandler; import javax.xml.transform.TransformerException; import javax.xml.transform.stream.StreamSource; diff --git a/api-client/src/main/java/no/digipost/api/interceptors/EbmsClientInterceptor.java b/api-client/src/main/java/no/digipost/api/interceptors/EbmsClientInterceptor.java index b36f3430..b79a8e61 100644 --- a/api-client/src/main/java/no/digipost/api/interceptors/EbmsClientInterceptor.java +++ b/api-client/src/main/java/no/digipost/api/interceptors/EbmsClientInterceptor.java @@ -98,7 +98,7 @@ public boolean handleResponse(MessageContext messageContext) throws WebServiceCl X509Certificate cert = (X509Certificate) messageContext.getProperty(Wss4jInterceptor.INCOMING_CERTIFICATE); Organisasjonsnummer responder = extractor.from(cert); if (!tekniskMottaker.orgnr.equals(responder)) { - throw new MessageSenderValidationException(format("Unexpected signer in incoming message. Expected: [%s] Extracted: [%s] from %s", tekniskMottaker.orgnr, responder, cert.getSubjectDN().getName())); + throw new MessageSenderValidationException(format("Unexpected signer in incoming message. Expected: [%s] Extracted: [%s] from %s", tekniskMottaker.orgnr, responder, cert.getSubjectX500Principal().getName())); } } return true; diff --git a/api-client/src/main/notice/NOTICE.template b/api-client/src/main/notice/NOTICE.template deleted file mode 100644 index 13bdbe99..00000000 --- a/api-client/src/main/notice/NOTICE.template +++ /dev/null @@ -1,11 +0,0 @@ -Digipost API Client - -Copyright 2014 Posten Norge AS. All Rights Reserved. - -This product includes software developed by Posten Norge AS. - https://www.posten.no/ -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: - -#GENERATED_NOTICES# diff --git a/api-client/src/main/notice/license-mappings.xml b/api-client/src/main/notice/license-mappings.xml deleted file mode 100644 index 59378032..00000000 --- a/api-client/src/main/notice/license-mappings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - com.sun.xml.wsit - wsit-rt - CDDL v1.1 - - - jaxen - jaxen - The BSD 3-Clause License - - - org.springframework - spring-expression - The Apache Software License, Version 2.0 - - - diff --git a/api-client/src/test/resources/junit-platform.properties b/api-client/src/test/resources/junit-platform.properties new file mode 100644 index 00000000..6efc0d5e --- /dev/null +++ b/api-client/src/test/resources/junit-platform.properties @@ -0,0 +1 @@ +junit.jupiter.extensions.autodetection.enabled=true diff --git a/api-commons/NOTICE b/api-commons/NOTICE index 2a319eb6..188f8144 100644 --- a/api-commons/NOTICE +++ b/api-commons/NOTICE @@ -8,29 +8,35 @@ 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 Codec under Apache License, Version 2.0 - Apache Commons Lang under Apache License, Version 2.0 + Apache Commons Lang under Apache-2.0 Apache HttpCore under Apache License, Version 2.0 - Apache WSS4J DOM WS-Security under Apache License, Version 2.0 - Apache WSS4J WS-Security Common under Apache License, Version 2.0 - Apache XML Security for Java under Apache License, Version 2.0 + Apache WSS4J DOM WS-Security under Apache-2.0 + Apache WSS4J WS-Security Common under Apache-2.0 + Apache XML Security for Java under Apache-2.0 Bouncy Castle Provider under Bouncy Castle Licence Cryptacular Library under Apache 2 or GNU Lesser General Public License Digipost JAXB Resolver - com.sun.xml.bind under The Apache Software License, Version 2.0 Extended StAX API under Eclipse Distribution License - v 1.0 Guava InternalFutureFailureAccess and InternalFutures under The Apache Software License, Version 2.0 Guava: Google Core Libraries for Java under Apache License, Version 2.0 + istack common utility code runtime under Eclipse Distribution License - v 1.0 + Jakarta Activation API under EDL 1.0 + Jakarta Mail API under EPL 2.0 or GPL2 w/ CPE or EDL 1.0 + Jakarta SOAP Implementation under Eclipse Distribution License - v 1.0 + Jakarta XML Binding API under Eclipse Distribution License - v 1.0 JASYPT: Java Simplified Encryption under The Apache Software License, Version 2.0 JavaBeans Activation Framework API jar under CDDL/GPLv2+CE - javax.xml.soap API under CDDL + GPLv2 with classpath exception + JAXB Core under Eclipse Distribution License - v 1.0 + JAXB Runtime under Eclipse Distribution License - v 1.0 jaxb-api under CDDL 1.1 or GPL2 w/ CPE JAXB2 Basics - Runtime under BSD-Style License JCL 1.2 implemented over SLF4J under Apache License, Version 2.0 - Joda-Time under Apache License, Version 2.0 - MIME streaming extension under Eclipse Distribution License - v 1.0 + micrometer-commons under The Apache Software License, Version 2.0 + micrometer-observation under The Apache Software License, Version 2.0 Old JAXB Core under CDDL+GPL License Old JAXB Runtime under Eclipse Distribution License - v 1.0 - saaj-impl under Eclipse Distribution License - v 1.0 SDP Shared - XSD & JAXB under The Apache Software License, Version 2.0 SLF4J API Module under MIT License Spring AOP under Apache License, Version 2.0 @@ -48,4 +54,5 @@ This software includes third party software subject to the following licenses: spring-ws-core under Apache License, Version 2.0 spring-ws-security under Apache License, Version 2.0 spring-xml under Apache License, Version 2.0 + TXW2 Runtime under Eclipse Distribution License - v 1.0 diff --git a/api-commons/pom.xml b/api-commons/pom.xml index aa5d79d2..23149fe0 100644 --- a/api-commons/pom.xml +++ b/api-commons/pom.xml @@ -23,12 +23,13 @@ jaxb-api - javax.xml.soap - javax.xml.soap-api + jakarta.xml.soap + jakarta.xml.soap-api + test - javax.activation - javax.activation-api + jakarta.activation + jakarta.activation-api @@ -107,6 +108,11 @@ slf4j-simple test + + no.digipost + jul-to-slf4j-junit-extension + test + org.junit.jupiter @@ -141,24 +147,4 @@ - - - - - maven-dependency-plugin - - - javax.xml.soap:javax.xml.soap-api - - - - - - - - org.jasig.maven - maven-notice-plugin - - - diff --git a/api-commons/src/main/java/no/digipost/api/representations/Dokumentpakke.java b/api-commons/src/main/java/no/digipost/api/representations/Dokumentpakke.java index a42fce7d..4d776043 100644 --- a/api-commons/src/main/java/no/digipost/api/representations/Dokumentpakke.java +++ b/api-commons/src/main/java/no/digipost/api/representations/Dokumentpakke.java @@ -1,9 +1,9 @@ package no.digipost.api.representations; +import jakarta.activation.DataSource; import org.bouncycastle.jcajce.provider.digest.SHA256; -import javax.activation.DataSource; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/api-commons/src/main/java/no/digipost/api/security/OrgnummerExtractor.java b/api-commons/src/main/java/no/digipost/api/security/OrgnummerExtractor.java index e246e7e2..1a3c1c88 100644 --- a/api-commons/src/main/java/no/digipost/api/security/OrgnummerExtractor.java +++ b/api-commons/src/main/java/no/digipost/api/security/OrgnummerExtractor.java @@ -39,8 +39,8 @@ public Optional tryParse(X509Certificate cert) { public Organisasjonsnummer from(X509Certificate cert) { return tryParse(cert).orElseThrow(() -> new IllegalArgumentException( - "Fant ikke organisasjonsnummer i [" + cert.getSubjectDN().getName() + "], " + - "issuer=[" + cert.getIssuerDN().getName() + "]")); + "Fant ikke organisasjonsnummer i [" + cert.getSubjectX500Principal().getName() + "], " + + "issuer=[" + cert.getIssuerX500Principal().getName() + "]")); } private static final Optional tryFindOrgnr(CharSequence text, Pattern extractPattern) { diff --git a/api-commons/src/main/notice/NOTICE.template b/api-commons/src/main/notice/NOTICE.template deleted file mode 100644 index 06aee560..00000000 --- a/api-commons/src/main/notice/NOTICE.template +++ /dev/null @@ -1,11 +0,0 @@ -Digipost API Commons - -Copyright 2014 Posten Norge AS. All Rights Reserved. - -This product includes software developed by Posten Norge AS. - https://www.posten.no/ -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: - -#GENERATED_NOTICES# diff --git a/api-commons/src/main/notice/license-mappings.xml b/api-commons/src/main/notice/license-mappings.xml deleted file mode 100644 index e59c7c1c..00000000 --- a/api-commons/src/main/notice/license-mappings.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - com.sun.xml.wsit - wsit-rt - CDDL v1.1 - - - jaxen - jaxen - The BSD 3-Clause License - - - diff --git a/api-commons/src/test/java/no/digipost/api/xml/EbmsReferenceExtractorTest.java b/api-commons/src/test/java/no/digipost/api/xml/EbmsReferenceExtractorTest.java index 432f9a52..bd31878a 100644 --- a/api-commons/src/test/java/no/digipost/api/xml/EbmsReferenceExtractorTest.java +++ b/api-commons/src/test/java/no/digipost/api/xml/EbmsReferenceExtractorTest.java @@ -1,13 +1,12 @@ package no.digipost.api.xml; +import jakarta.xml.soap.MessageFactory; +import jakarta.xml.soap.SOAPMessage; import no.digipost.api.EbmsReferenceExtractor; -import org.junit.jupiter.api.Test; -import org.springframework.ws.soap.saaj.SaajSoapMessage; import no.digipost.org.w3.xmldsig.DigestMethod; import no.digipost.org.w3.xmldsig.Reference; - -import javax.xml.soap.MessageFactory; -import javax.xml.soap.SOAPMessage; +import org.junit.jupiter.api.Test; +import org.springframework.ws.soap.saaj.SaajSoapMessage; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -17,8 +16,8 @@ import java.util.Map; import static co.unruly.matchers.Java8Matchers.where; +import static jakarta.xml.soap.SOAPConstants.SOAP_1_2_PROTOCOL; import static javax.xml.crypto.dsig.DigestMethod.SHA256; -import static javax.xml.soap.SOAPConstants.SOAP_1_2_PROTOCOL; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.Matchers.containsString; diff --git a/api-commons/src/test/resources/junit-platform.properties b/api-commons/src/test/resources/junit-platform.properties new file mode 100644 index 00000000..6efc0d5e --- /dev/null +++ b/api-commons/src/test/resources/junit-platform.properties @@ -0,0 +1 @@ +junit.jupiter.extensions.autodetection.enabled=true diff --git a/pom.xml b/pom.xml index 6b9d65e5..d3db95e5 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ no.digipost digipost-open-super-pom - 7 + 13 @@ -21,14 +21,12 @@ - 1.8 - 1.8 - set_with_-Dproject.previousVersion=X.Y + 17 - 1.7.36 - 3.1.6 - 2.4.1 - 0.12.0 + 2.0.9 + 4.0.8 + 3.0.2 + 0.13.1 @@ -68,12 +66,6 @@ ${org.slf4j.version} runtime - - org.slf4j - log4j-over-slf4j - ${org.slf4j.version} - runtime - org.slf4j jul-to-slf4j @@ -86,43 +78,43 @@ ${org.slf4j.version} test + + no.digipost + jul-to-slf4j-junit-extension + 1.0 + org.junit junit-bom - 5.8.0-RC1 + 5.10.1 pom import org.mockito - mockito-core - 3.12.4 - test - - - org.mockito - mockito-junit-jupiter - 3.12.4 - test + mockito-bom + 5.8.0 + pom + import nl.jqno.equalsverifier equalsverifier - 3.7.1 + 3.15.4 test org.bouncycastle bcprov-jdk18on - 1.73 + 1.77 org.springframework spring-framework-bom - 5.3.26 + 6.1.1 pom import @@ -130,48 +122,19 @@ org.springframework.security spring-security-bom - 5.8.2 + 6.2.0 pom import + org.springframework.ws - spring-ws-core - ${spring.ws.version} - - - commons-io - commons-io - - - - - org.springframework.ws - spring-ws-security - ${spring.ws.version} - - - net.sf.ehcache - ehcache - - - commons-io - commons-io - - - - - org.springframework.ws - spring-xml + spring-ws-bom ${spring.ws.version} - - - commons-io - commons-io - - + pom + import @@ -183,14 +146,6 @@ org.ehcache ehcache - - jakarta.xml.bind - jakarta.xml.bind-api - - - jakarta.xml.ws - jakarta.xml.ws-api - @@ -218,14 +173,6 @@ org.bouncycastle bcprov-jdk15on - - jakarta.xml.bind - jakarta.xml.bind-api - - - jakarta.xml.ws - jakarta.xml.ws-api - @@ -236,42 +183,24 @@ org.apache.santuario xmlsec - 3.0.1 + 3.0.3 - javax.xml.soap - javax.xml.soap-api - 1.4.0 + jakarta.xml.soap + jakarta.xml.soap-api + 3.0.1 - javax.jws - javax.jws-api - 1.1 + jakarta.jws + jakarta.jws-api + 3.0.0 com.sun.xml.messaging.saaj saaj-impl - 1.5.1 - - - jakarta.xml.soap - jakarta.xml.soap-api - - - javax.xml.stream - stax-api - - - jakarta.xml.bind - jakarta.xml.bind-api - - - jakarta.activation - jakarta.activation-api - - + 3.0.3 @@ -282,15 +211,15 @@ import - javax.activation - javax.activation-api - 1.2.0 + jakarta.activation + jakarta.activation-api + 2.1.2 org.apache.httpcomponents httpclient - 4.5.13 + 4.5.14 commons-logging @@ -301,13 +230,13 @@ org.apache.httpcomponents httpcore - 4.4.14 + 4.4.16 org.apache.commons commons-lang3 - 3.12.0 + 3.14.0 commons-codec @@ -323,7 +252,7 @@ maven-clean-plugin - 3.2.0 + 3.3.2 maven-resources-plugin @@ -335,7 +264,7 @@ maven-surefire-plugin - 3.0.0 + 3.2.2 maven-jar-plugin @@ -351,63 +280,22 @@ maven-javadoc-plugin - 3.5.0 + 3.6.3 org.jasig.maven - maven-notice-plugin - 1.1.0 + notice-maven-plugin + 2.0.0 - - compile - runtime - - ${project.basedir}/src/main/notice/NOTICE.template - - ${project.basedir}/src/main/notice/license-mappings.xml - + false - - - check-NOTICE-file - verify - - check - - - - - - jakarta.xml.bind - jakarta.xml.bind-api - 2.3.3 - - - org.glassfish.jaxb - jaxb-runtime - 2.3.3 - runtime - - com.github.siom79.japicmp japicmp-maven-plugin - 0.15.3 + 0.18.3 - - - ${project.groupId} - ${project.artifactId} - ${project.previousVersion} - - - - ${project.build.directory}/${project.build.finalName}.${project.packaging} - - true - true no.digipost.api no.digipost.xsd @@ -419,11 +307,11 @@ org.codehaus.mojo versions-maven-plugin - 2.15.0 + 2.16.2 maven-enforcer-plugin - 3.3.0 + 3.4.1 @@ -437,13 +325,11 @@ no.digipost:sdp-api-commons no.digipost:sdp-xsd aopalliance:aopalliance - com.sun.xml.wsit:wsit-rt commons-codec:commons-codec - jaxen:jaxen joda-time:joda-time no.digipost:sdp-xsd org.apache.commons:commons-lang3 - org.apache.geronimo.specs:geronimo-javamail_1.4_spec + jakarta.mail:jakarta.mail-api org.apache.httpcomponents:* org.apache.santuario:xmlsec org.apache.wss4j:wss4j-ws-security-common @@ -464,19 +350,24 @@ org.springframework:* org.springframework.security:* org.springframework.ws:* + io.micrometer wsdl4j:wsdl4j javax.activation:javax.activation-api com.sun.activation:jakarta.activation:jakarta.activation - javax.xml.ws:jaxws-api + jakarta.activation:jakarta.activation-api + org.eclipse.angus:angus-activation + jakarta.xml.ws:jaxws-api javax.xml.bind:jaxb-api - javax.annotation:javax.annotation-api - javax.jws:jsr181-api - javax.xml.soap:javax.xml.soap-api + jakarta.xml.bind:jakarta.xml.bind-api + org.glassfish.jaxb + com.sun.istack + jakarta.annotation:jakarta.annotation-api + jakarta.xml.soap:jakarta.xml.soap-api com.sun.xml.messaging.saaj:saaj-impl org.jvnet.staxex:stax-ex org.jvnet.mimepull:mimepull - javax.jws:jakarta.jws-api - javax.xml.ws:javax.xml.ws-api + jakarta.jws:jakarta.jws-api + jakarta.xml.ws:jakarta.xml.ws-api true Maven-avhengigheter har forandret seg. Sjekk at alle lisenser er OK før @@ -491,12 +382,12 @@ maven-dependency-plugin - 3.5.0 + 3.6.1 org.codehaus.mojo build-helper-maven-plugin - 3.3.0 + 3.5.0 org.sonatype.plugins @@ -505,23 +396,6 @@ - - - maven-dependency-plugin - - - check-dependency-declarations-vs-usage - - analyze-only - - - true - true - - - - - diff --git a/xsd/src/main/notice/NOTICE.template b/src/NOTICE.template similarity index 100% rename from xsd/src/main/notice/NOTICE.template rename to src/NOTICE.template diff --git a/xsd/pom.xml b/xsd/pom.xml index 27db3802..959be762 100644 --- a/xsd/pom.xml +++ b/xsd/pom.xml @@ -74,7 +74,7 @@ org.jvnet.jaxb2.maven2 maven-jaxb2-plugin - 0.15.2 + 0.15.3 @@ -137,10 +137,6 @@ - - org.jasig.maven - maven-notice-plugin - diff --git a/xsd/src/main/notice/license-mappings.xml b/xsd/src/main/notice/license-mappings.xml deleted file mode 100644 index 27fac0c9..00000000 --- a/xsd/src/main/notice/license-mappings.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - -