Do not depend directly on any JAXB artifacts

Using only what is provided by signature-api-specification-jaxb

Author: runeflobakk

NOTICE

@@ -15,17 +15,17 @@ This software includes third party software subject to the following licenses:
   Apache HttpComponents Core HTTP/2 under Apache License, Version 2.0
   Apache HttpCore under Apache License, Version 2.0
   Digipost Certificate Validator under The Apache Software License, Version 2.0
-  istack common utility code runtime under Eclipse Distribution License - v 1.0
+  Digipost com.sun.xml.bind JAXB Service Loader under The Apache Software License, Version 2.0
   Jakarta Activation under EDL 1.0
-  Jakarta Activation API jar under EDL 1.0
-  Jakarta XML Binding API under Eclipse Distribution License - v 1.0
-  JAXB Runtime under Eclipse Distribution License - v 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
   JCL 1.2 implemented over SLF4J under Apache License, Version 2.0
+  Old JAXB Core under CDDL+GPL License
+  Old JAXB Runtime under Eclipse Distribution License - v 1.0
   Posten signering - API JAXB Classes under The Apache Software License, Version 2.0
   Posten signering - API Schema under The Apache Software License, Version 2.0
   Posten signering - Java API Client Library under The Apache Software License, Version 2.0
   SLF4J API Module under MIT License
-  TXW2 Runtime under Eclipse Distribution License - v 1.0
 
 

pom.xml

@@ -17,7 +17,7 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <project.previousVersion>set_with_-Dproject.previousVersion=X.Y</project.previousVersion>
-        <signature.api.version>3.0.0-RC4</signature.api.version>
+        <signature.api.version>old-is-older-SNAPSHOT</signature.api.version>
         <slf4j.version>1.7.36</slf4j.version>
     </properties>
 
@@ -75,18 +75,6 @@
             <version>5.2.1</version>
         </dependency>
 
-        <dependency>
-            <groupId>jakarta.xml.bind</groupId>
-            <artifactId>jakarta.xml.bind-api</artifactId>
-            <version>2.3.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.jaxb</groupId>
-            <artifactId>jaxb-runtime</artifactId>
-            <version>2.3.8</version>
-            <scope>runtime</scope>
-        </dependency>
-
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
@@ -172,11 +160,18 @@
             <version>0.33</version>
             <scope>test</scope>
         </dependency>
+
         <dependency>
             <groupId>com.github.tomakehurst</groupId>
             <artifactId>wiremock-jre8</artifactId>
             <version>2.35.0</version>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>jakarta.xml.bind</groupId>
+                    <artifactId>jakarta.xml.bind-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>
 

src/main/java/no/digipost/signature/client/asice/signature/XAdESArtifacts.java

@@ -1,41 +1,22 @@
 package no.digipost.signature.client.asice.signature;
 
 import no.digipost.signature.api.xml.thirdparty.xades.QualifyingProperties;
+import no.digipost.signature.jaxb.JaxbMarshaller;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
-import javax.xml.transform.dom.DOMResult;
-
+import static java.util.Collections.singleton;
 import static java.util.stream.IntStream.range;
 
 final class XAdESArtifacts {
 
-    private static Marshaller marshaller;
-
-    static {
-        try {
-            marshaller = JAXBContext.newInstance(QualifyingProperties.class).createMarshaller();
-        } catch (JAXBException e) {
-            throw new RuntimeException(e);
-        }
-    }
+    private static JaxbMarshaller marshaller = new JaxbMarshaller(singleton(QualifyingProperties.class));
 
 
     public static XAdESArtifacts from(QualifyingProperties qualifyingProperties) {
-        DOMResult domResult = new DOMResult();
-        try {
-            marshaller.marshal(qualifyingProperties, domResult);
-        } catch (JAXBException e) {
-            throw new RuntimeException(
-                    "Failed to marshal qualifying properties, because " +
-                    e.getClass().getSimpleName() + " '" + e.getMessage() + "'", e);
-        }
-        return from((Document) domResult.getNode());
+        return from(marshaller.marshalToDomDocument(qualifyingProperties));
     }
 
     private static XAdESArtifacts from(Document qualifyingPropertiesDocument) {

src/test/java/no/digipost/signature/client/asice/signature/CreateSignatureTest.java

@@ -13,20 +13,16 @@
 import no.digipost.signature.client.asice.ASiCEAttachable;
 import no.digipost.signature.client.core.DocumentType;
 import no.digipost.signature.client.security.KeyStoreConfig;
+import no.digipost.signature.jaxb.JaxbMarshaller;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Unmarshaller;
-import javax.xml.transform.stream.StreamSource;
-
-import java.io.ByteArrayInputStream;
 import java.math.BigInteger;
 import java.time.Clock;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.util.Base64;
+import java.util.HashSet;
 import java.util.List;
 
 import static java.util.Arrays.asList;
@@ -36,7 +32,7 @@
 import static org.hamcrest.Matchers.notNullValue;
 import static uk.co.probablyfine.matchers.Java8Matchers.where;
 
-public class CreateSignatureTest {
+class CreateSignatureTest {
 
     private CreateSignature createSignature;
 
@@ -48,16 +44,10 @@ public class CreateSignatureTest {
     private KeyStoreConfig noekkelpar;
     private List<ASiCEAttachable> files;
 
-    private static final Unmarshaller unmarshaller; static {
-        try {
-            unmarshaller = JAXBContext.newInstance(XAdESSignatures.class, QualifyingProperties.class).createUnmarshaller();
-        } catch (JAXBException e) {
-            throw new RuntimeException(e);
-        }
-    }
+    private static final JaxbMarshaller unmarshaller = new JaxbMarshaller(new HashSet<>(asList(XAdESSignatures.class, QualifyingProperties.class)));
 
     @BeforeEach
-    public void setUp() {
+    void setUp() {
         noekkelpar = TestKonfigurasjon.CLIENT_KEYSTORE;
         files = asList(
                 file("dokument.pdf", "hoveddokument-innhold".getBytes(), DocumentType.PDF.getMediaType()),
@@ -69,7 +59,7 @@ public void setUp() {
     }
 
     @Test
-    public void test_generated_signatures() throws JAXBException {
+    void test_generated_signatures() {
         /*
          * Expected signature value (Base-64 encoded) from the given keys, files, and time of the signing.
          * If this changes, something has changed in the signature implementation, and must be investigated!
@@ -81,7 +71,7 @@ public void test_generated_signatures() throws JAXBException {
                 "nBa0FMipG5jtqUPYJJMTt56wIJlwQ95PhGIEYtdRYwxlgSau9Bw+wYmD4NU0K0hw6FgBQ/UDF87T5Zr7HTPWPMwpngkWg==";
 
         Signature signature = createSignature.createSignature(files, noekkelpar);
-        XAdESSignatures xAdESSignatures = (XAdESSignatures) unmarshaller.unmarshal(new StreamSource(new ByteArrayInputStream(signature.getContent())));
+        XAdESSignatures xAdESSignatures = unmarshaller.unmarshal(signature.getContent(), XAdESSignatures.class);
 
         assertThat(xAdESSignatures, where(XAdESSignatures::getSignatures, hasSize(1)));
         no.digipost.signature.api.xml.thirdparty.xmldsig.Signature dSignature = xAdESSignatures.getSignatures().get(0);
@@ -91,10 +81,10 @@ public void test_generated_signatures() throws JAXBException {
     }
 
     @Test
-    public void test_xades_signed_properties() throws JAXBException {
+    void test_xades_signed_properties() {
         Signature signature = createSignature.createSignature(files, noekkelpar);
 
-        XAdESSignatures xAdESSignatures = (XAdESSignatures) unmarshaller.unmarshal(new StreamSource(new ByteArrayInputStream(signature.getContent())));
+        XAdESSignatures xAdESSignatures = unmarshaller.unmarshal(signature.getContent(), XAdESSignatures.class);
         no.digipost.signature.api.xml.thirdparty.xmldsig.Object object = xAdESSignatures.getSignatures().get(0).getObjects().get(0);
 
         QualifyingProperties xadesProperties = (QualifyingProperties) object.getContent().get(0);
@@ -106,14 +96,14 @@ public void test_xades_signed_properties() throws JAXBException {
     }
 
     @Test
-    public void should_support_filenames_with_spaces_and_other_characters() throws JAXBException {
+    void should_support_filenames_with_spaces_and_other_characters() {
         List<ASiCEAttachable> otherFiles = asList(
                 file("dokument (2).pdf", "hoveddokument-innhold".getBytes(), DocumentType.PDF.getMediaType()),
                 file("manifest.xml", "manifest-innhold".getBytes(), ASiCEAttachable.XML_MEDIATYPE)
         );
 
         Signature signature = createSignature.createSignature(otherFiles, noekkelpar);
-        XAdESSignatures xAdESSignatures = (XAdESSignatures) unmarshaller.unmarshal(new StreamSource(new ByteArrayInputStream(signature.getContent())));
+        XAdESSignatures xAdESSignatures = unmarshaller.unmarshal(signature.getContent(), XAdESSignatures.class);
         String uri = xAdESSignatures.getSignatures().get(0).getSignedInfo().getReferences().get(0).getURI();
         assertThat(uri, is("dokument+%282%29.pdf"));
     }