diff --git a/.idea/misc.xml b/.idea/misc.xml index 4d7210a..7970046 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -82,7 +82,7 @@ - + diff --git a/pom.xml b/pom.xml index 2690237..1d84c78 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ KoSIT XML Prüftool Implementierung de.kosit - 1.5.1 + 1.6.0 validationtool KoSIT XML Validator against XSD and Schematron based on defined scenarios. @@ -59,13 +59,14 @@ 2.20.0 3.18.0 0.8.13 - 2.3.9 + 4.0.2 1.18.38 4.11.0 10.0.4 5.5.5 12.8 2.0.17 + 4.0.9 @@ -123,6 +124,11 @@ ${version.jaxb} true + + jakarta.xml.bind + jakarta.xml.bind-api + ${version.jaxb} + org.assertj assertj-core @@ -158,7 +164,6 @@ 1.0.2 test - @@ -229,8 +234,8 @@ maven-compiler-plugin 3.14.0 - 1.8 - 1.8 + 11 + 11 UTF-8 @@ -267,44 +272,6 @@ - - jdk8 - package - - shade - - - true - java8-standalone - - - org.glassfish.jaxb:jaxb-runtime - com.sun.istack:istack-commons-runtime - com.sun.xml.fastinfoset:FastInfoset - jakarta.activation:jakarta.activation-api - jakarta.xml.bind:jakarta.xml.bind-api - org.jvnet.staxex:stax-ex - org.glassfish.jaxb:txw2 - - - - - de.kosit.validationtool.cmd.CommandLineApplication - - - - - *:* - - META-INF/*.SF - META-INF/*.DSA - META-INF/*.RSA - **/module-info.class - - - - - @@ -334,9 +301,9 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin - 0.15.3 + org.jvnet.jaxb + jaxb-maven-plugin + ${version.jaxb-maven-plugin} @@ -354,20 +321,12 @@ - org.jvnet.jaxb2_commons - jaxb2-basics - 0.13.1 + org.jvnet.jaxb + jaxb-plugins + ${version.jaxb-maven-plugin} - - - org.glassfish.jaxb - jaxb-runtime - ${version.jaxb} - true - - @@ -541,7 +500,7 @@ maven-javadoc-plugin 3.11.2 - 8 + 11 none diff --git a/src/main/java/de/kosit/validationtool/impl/CollectingErrorEventHandler.java b/src/main/java/de/kosit/validationtool/impl/CollectingErrorEventHandler.java index 3897006..3f522a6 100644 --- a/src/main/java/de/kosit/validationtool/impl/CollectingErrorEventHandler.java +++ b/src/main/java/de/kosit/validationtool/impl/CollectingErrorEventHandler.java @@ -20,8 +20,8 @@ import java.util.ArrayList; import java.util.Collection; import java.util.StringJoiner; -import javax.xml.bind.ValidationEvent; -import javax.xml.bind.ValidationEventHandler; +import jakarta.xml.bind.ValidationEvent; +import jakarta.xml.bind.ValidationEventHandler; import javax.xml.transform.ErrorListener; import javax.xml.transform.SourceLocator; import javax.xml.transform.TransformerException; diff --git a/src/main/java/de/kosit/validationtool/impl/ConversionService.java b/src/main/java/de/kosit/validationtool/impl/ConversionService.java index 31e4ff7..d2ca2d2 100644 --- a/src/main/java/de/kosit/validationtool/impl/ConversionService.java +++ b/src/main/java/de/kosit/validationtool/impl/ConversionService.java @@ -24,14 +24,14 @@ import java.util.Arrays; import java.util.Collection; import java.util.StringJoiner; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.JAXBException; -import javax.xml.bind.JAXBIntrospector; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; -import javax.xml.bind.ValidationEventHandler; -import javax.xml.bind.annotation.XmlRegistry; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBIntrospector; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.Unmarshaller; +import jakarta.xml.bind.ValidationEventHandler; +import jakarta.xml.bind.annotation.XmlRegistry; import javax.xml.namespace.QName; import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLOutputFactory; diff --git a/src/main/java/de/kosit/validationtool/impl/input/SourceInput.java b/src/main/java/de/kosit/validationtool/impl/input/SourceInput.java index 65cb32d..7b0a9b8 100644 --- a/src/main/java/de/kosit/validationtool/impl/input/SourceInput.java +++ b/src/main/java/de/kosit/validationtool/impl/input/SourceInput.java @@ -21,7 +21,7 @@ import static org.apache.commons.lang3.StringUtils.defaultIfBlank; import java.io.IOException; import java.nio.charset.Charset; -import javax.xml.bind.util.JAXBSource; +import jakarta.xml.bind.util.JAXBSource; import javax.xml.transform.Source; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamSource; @@ -43,7 +43,7 @@ import net.sf.saxon.om.TreeInfo; *
    *
  • {@link StreamSource} - both {@link java.io.InputStream} based and {@link java.io.Reader} based
  • *
  • {@link javax.xml.transform.dom.DOMSource}
  • - *
  • {@link javax.xml.bind.util.JAXBSource}
  • + *
  • {@link jakarta.xml.bind.util.JAXBSource}
  • *
  • {@link TreeInfo}
  • *
* diff --git a/src/main/java/de/kosit/validationtool/impl/tasks/CreateReportAction.java b/src/main/java/de/kosit/validationtool/impl/tasks/CreateReportAction.java index 554a47f..4a5d265 100644 --- a/src/main/java/de/kosit/validationtool/impl/tasks/CreateReportAction.java +++ b/src/main/java/de/kosit/validationtool/impl/tasks/CreateReportAction.java @@ -20,9 +20,9 @@ import java.io.IOException; import java.util.Collection; import java.util.stream.Collectors; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; -import javax.xml.bind.util.JAXBSource; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.util.JAXBSource; import org.xml.sax.ContentHandler; import org.xml.sax.DTDHandler; diff --git a/src/main/java/de/kosit/validationtool/impl/xml/StringTrimAdapter.java b/src/main/java/de/kosit/validationtool/impl/xml/StringTrimAdapter.java index f3c3c25..08ef4b1 100644 --- a/src/main/java/de/kosit/validationtool/impl/xml/StringTrimAdapter.java +++ b/src/main/java/de/kosit/validationtool/impl/xml/StringTrimAdapter.java @@ -16,7 +16,7 @@ package de.kosit.validationtool.impl.xml; -import javax.xml.bind.annotation.adapters.XmlAdapter; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; public class StringTrimAdapter extends XmlAdapter { diff --git a/src/main/model/binding/global.xjb b/src/main/model/binding/global.xjb index 2c85926..cd2a512 100644 --- a/src/main/model/binding/global.xjb +++ b/src/main/model/binding/global.xjb @@ -16,22 +16,21 @@ --> + xmlns:xs="http://www.w3.org/2001/XMLSchema" + xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc" + xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" + xmlns:inheritance="urn:jaxb.jvnet.org:plugin:inheritance" + jaxb:extensionBindingPrefixes="inheritance" + version="3.0"> + - + - + name="java.lang.String" + xmlType="xs:string" + adapter="de.kosit.validationtool.impl.xml.StringTrimAdapter"/> - @@ -40,24 +39,28 @@ de.kosit.validationtool.impl.model.BaseXMLSyntaxError + + - + + de.kosit.validationtool.impl.model.BaseOutput + - +