diff --git a/pom.xml b/pom.xml index 2393e61..eb0280d 100644 --- a/pom.xml +++ b/pom.xml @@ -79,26 +79,28 @@ 3.6.3 3.27.3 - 2.18.0 + 2.19.0 3.17.0 + 4.0.2 2.4.1 - 2.3.9 - 4.13.1 + 4.0.5 + 4.13.2 1.18.38 - 4.11.0 + 5.17.0 1.0.2 - 4.7.6 - 5.3.0 - 11.4 - 1.7.36 - 1.7.36 + 4.7.7 + 5.5.1 + 12.5 + 2.0.17 + 2.0.17 3.6.0 12.1.1 3.5.0 2.26.0 0.8.13 - 0.13.1 + 4.0.9 + 4.0.9 3.1.0 3.7.1 3.14.0 @@ -106,7 +108,6 @@ 3.5.3 3.2.7 3.11.2 - 0.15.3 3.1.1 3.3.1 3.6.0 @@ -143,6 +144,11 @@ ${version.picocli} true + + jakarta.xml.bind + jakarta.xml.bind-api + ${version.jakarta.xml.bind-api} + org.fusesource.jansi jansi @@ -379,9 +385,9 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin - ${version.maven-jaxb2-plugin} + org.jvnet.jaxb + jaxb-maven-plugin + ${version.jaxb-maven-plugin} @@ -396,23 +402,21 @@ false -Xinheritance + -Xannotate - org.jvnet.jaxb2_commons - jaxb2-basics - ${version.jaxb2-basics} + org.jvnet.jaxb + jaxb-plugins + ${version.jaxb-plugins} + + + org.jvnet.jaxb + jaxb-plugin-annotate + ${version.jaxb-plugins} - - - org.glassfish.jaxb - jaxb-runtime - ${version.jaxb-runtime} - true - - diff --git a/src/main/java/de/kosit/validationtool/cmd/CommandLineOptions.java b/src/main/java/de/kosit/validationtool/cmd/CommandLineOptions.java index b7420af..f66e4cd 100644 --- a/src/main/java/de/kosit/validationtool/cmd/CommandLineOptions.java +++ b/src/main/java/de/kosit/validationtool/cmd/CommandLineOptions.java @@ -175,9 +175,9 @@ public class CommandLineOptions implements Callable { private static void configureLogging(final CommandLineOptions cmd) { if (cmd.isDebugLog()) { - System.setProperty(org.slf4j.impl.SimpleLogger.DEFAULT_LOG_LEVEL_KEY, "DEBUG"); + System.setProperty(org.slf4j.simple.SimpleLogger.DEFAULT_LOG_LEVEL_KEY, "DEBUG"); } else { - System.setProperty(org.slf4j.impl.SimpleLogger.DEFAULT_LOG_LEVEL_KEY, cmd.getLogLevel().name()); + System.setProperty(org.slf4j.simple.SimpleLogger.DEFAULT_LOG_LEVEL_KEY, cmd.getLogLevel().name()); } } diff --git a/src/main/java/de/kosit/validationtool/config/XPathBuilder.java b/src/main/java/de/kosit/validationtool/config/XPathBuilder.java index 6fe9c1e..5b16e4f 100644 --- a/src/main/java/de/kosit/validationtool/config/XPathBuilder.java +++ b/src/main/java/de/kosit/validationtool/config/XPathBuilder.java @@ -114,7 +114,7 @@ class XPathBuilder implements Builder { final Iterable iterable = () -> iterator; StreamSupport.stream(iterable.spliterator(), false).filter(e -> !ArrayUtils.contains(IGNORED_PREFIXES, e)) .filter(StringUtils::isNotBlank).forEach(e -> ns.put(e, this.executable.getUnderlyingExpression().getInternalExpression() - .getRetainedStaticContext().getURIForPrefix(e, false))); + .getRetainedStaticContext().getURIForPrefix(e, false).toString())); getNamespaces().putAll(ns); } diff --git a/src/main/java/de/kosit/validationtool/impl/CollectingErrorEventHandler.java b/src/main/java/de/kosit/validationtool/impl/CollectingErrorEventHandler.java index 30bdd4c..16968d7 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 75495d5..e1bb046 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 1fa6ab2..c0df544 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..b8da5cb 100644 --- a/src/main/model/binding/global.xjb +++ b/src/main/model/binding/global.xjb @@ -16,45 +16,98 @@ --> + xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" + xmlns:inheritance="urn:jaxb.jvnet.org:plugin:inheritance" + jaxb:extensionBindingPrefixes="xjc annox inheritance" + version="3.0"> + - - + + @java.lang.SuppressWarnings("serial") + + + @java.lang.SuppressWarnings("serial") + + + @java.lang.SuppressWarnings("serial") + + + @java.lang.SuppressWarnings("serial") + + + @java.lang.SuppressWarnings("serial") + + + @java.lang.SuppressWarnings("serial") + de.kosit.validationtool.impl.model.BaseXMLSyntaxError + + + @java.lang.SuppressWarnings("serial") + + + @java.lang.SuppressWarnings("serial") + + + @java.lang.SuppressWarnings("serial") + + + @java.lang.SuppressWarnings("serial") + + + @java.lang.SuppressWarnings("serial") + + + @java.lang.SuppressWarnings("serial") + + - - - - de.kosit.validationtool.impl.model.BaseOutput + + @java.lang.SuppressWarnings("serial") + + + + @java.lang.SuppressWarnings("serial") + + + @java.lang.SuppressWarnings("serial") + + + @java.lang.SuppressWarnings("serial") + de.kosit.validationtool.impl.model.BaseOutput + + + @java.lang.SuppressWarnings("serial") + + + diff --git a/src/test/java/de/kosit/validationtool/impl/tasks/CreateReportActionTest.java b/src/test/java/de/kosit/validationtool/impl/tasks/CreateReportActionTest.java index 2691840..4706e90 100644 --- a/src/test/java/de/kosit/validationtool/impl/tasks/CreateReportActionTest.java +++ b/src/test/java/de/kosit/validationtool/impl/tasks/CreateReportActionTest.java @@ -77,7 +77,7 @@ public class CreateReportActionTest { this.action.check(bag); assertThat(bag.getReport()).isNotNull(); final String reportString = serialize(bag.getReport()); - assertThat(reportString).contains("SAXParseException"); + assertThat(reportString).contains("SXXP0003"); } @Test