demo/validator
1
0
Fork 0
mirror of https://github.com/itplr-kosit/validator.git synced 2026-05-25 16:55:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

04-UpdateDependencies

Browse source
This commit is contained in:
Adrian-Devries 2025-04-24 12:53:54 +02:00
parent 04a236ec83
commit 20ba488353
10 changed files with 112 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

54
pom.xml
View file

@ -79,26 +79,28 @@
<version.maven>3.6.3</version.maven> <version.maven>3.6.3</version.maven>
<!-- Dependencies --> <!-- Dependencies -->
<version.assertj-core>3.27.3</version.assertj-core> <version.assertj-core>3.27.3</version.assertj-core>
<version.commons-io>2.18.0</version.commons-io> <version.commons-io>2.19.0</version.commons-io>
<version.commons-lang3>3.17.0</version.commons-lang3> <version.commons-lang3>3.17.0</version.commons-lang3>
<version.jakarta.xml.bind-api>4.0.2</version.jakarta.xml.bind-api>
<version.jansi>2.4.1</version.jansi> <version.jansi>2.4.1</version.jansi>
<version.jaxb-runtime>2.3.9</version.jaxb-runtime> <version.jaxb-runtime>4.0.5</version.jaxb-runtime>
<version.junit>4.13.1</version.junit> <version.junit>4.13.2</version.junit>
<version.lombok>1.18.38</version.lombok> <version.lombok>1.18.38</version.lombok>
<version.mockito-core>4.11.0</version.mockito-core> <version.mockito-core>5.17.0</version.mockito-core>
<version.packaged-test-scenarios>1.0.2</version.packaged-test-scenarios> <version.packaged-test-scenarios>1.0.2</version.packaged-test-scenarios>
<version.picocli>4.7.6</version.picocli> <version.picocli>4.7.7</version.picocli>
<version.rest-assured>5.3.0</version.rest-assured> <version.rest-assured>5.5.1</version.rest-assured>
<version.saxon-he>11.4</version.saxon-he> <version.saxon-he>12.5</version.saxon-he>
<version.slf4j-api>1.7.36</version.slf4j-api> <version.slf4j-api>2.0.17</version.slf4j-api>
<version.slf4j-simple>1.7.36</version.slf4j-simple> <version.slf4j-simple>2.0.17</version.slf4j-simple>
<!-- Plugins --> <!-- Plugins -->
<version.build-helper-maven-plugin>3.6.0</version.build-helper-maven-plugin> <version.build-helper-maven-plugin>3.6.0</version.build-helper-maven-plugin>
<version.dependency-check-maven>12.1.1</version.dependency-check-maven> <version.dependency-check-maven>12.1.1</version.dependency-check-maven>
<version.exec-maven-plugin>3.5.0</version.exec-maven-plugin> <version.exec-maven-plugin>3.5.0</version.exec-maven-plugin>
<version.formatter-maven-plugin>2.26.0</version.formatter-maven-plugin> <version.formatter-maven-plugin>2.26.0</version.formatter-maven-plugin>
<version.jacoco-maven-plugin>0.8.13</version.jacoco-maven-plugin> <version.jacoco-maven-plugin>0.8.13</version.jacoco-maven-plugin>
<version.jaxb2-basics>0.13.1</version.jaxb2-basics> <version.jaxb-maven-plugin>4.0.9</version.jaxb-maven-plugin>
<version.jaxb-plugins>4.0.9</version.jaxb-plugins>
<version.maven-antrun-plugin>3.1.0</version.maven-antrun-plugin> <version.maven-antrun-plugin>3.1.0</version.maven-antrun-plugin>
<version.maven-assembly-plugin>3.7.1</version.maven-assembly-plugin> <version.maven-assembly-plugin>3.7.1</version.maven-assembly-plugin>
<version.maven-compiler-plugin>3.14.0</version.maven-compiler-plugin> <version.maven-compiler-plugin>3.14.0</version.maven-compiler-plugin>
@ -106,7 +108,6 @@
<version.maven-failsafe-plugin>3.5.3</version.maven-failsafe-plugin> <version.maven-failsafe-plugin>3.5.3</version.maven-failsafe-plugin>
<version.maven-gpg-plugin>3.2.7</version.maven-gpg-plugin> <version.maven-gpg-plugin>3.2.7</version.maven-gpg-plugin>
<version.maven-javadoc-plugin>3.11.2</version.maven-javadoc-plugin> <version.maven-javadoc-plugin>3.11.2</version.maven-javadoc-plugin>
<version.maven-jaxb2-plugin>0.15.3</version.maven-jaxb2-plugin>
<version.maven-release-plugin>3.1.1</version.maven-release-plugin> <version.maven-release-plugin>3.1.1</version.maven-release-plugin>
<version.maven-resources-plugin>3.3.1</version.maven-resources-plugin> <version.maven-resources-plugin>3.3.1</version.maven-resources-plugin>
<version.maven-shade-plugin>3.6.0</version.maven-shade-plugin> <version.maven-shade-plugin>3.6.0</version.maven-shade-plugin>
@ -143,6 +144,11 @@
<version>${version.picocli}</version> <version>${version.picocli}</version>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>${version.jakarta.xml.bind-api}</version>
</dependency>
<dependency> <dependency>
<groupId>org.fusesource.jansi</groupId> <groupId>org.fusesource.jansi</groupId>
<artifactId>jansi</artifactId> <artifactId>jansi</artifactId>
@ -379,9 +385,9 @@
</plugin> </plugin>
<!-- Generate model classes --> <!-- Generate model classes -->
<plugin> <plugin>
<groupId>org.jvnet.jaxb2.maven2</groupId> <groupId>org.jvnet.jaxb</groupId>
<artifactId>maven-jaxb2-plugin</artifactId> <artifactId>jaxb-maven-plugin</artifactId>
<version>${version.maven-jaxb2-plugin}</version> <version>${version.jaxb-maven-plugin}</version>
<executions> <executions>
<execution> <execution>
<goals> <goals>
@ -396,23 +402,21 @@
<packageLevelAnnotations>false</packageLevelAnnotations> <packageLevelAnnotations>false</packageLevelAnnotations>
<args> <args>
<arg>-Xinheritance</arg> <arg>-Xinheritance</arg>
<arg>-Xannotate</arg>
</args> </args>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.jvnet.jaxb2_commons</groupId> <groupId>org.jvnet.jaxb</groupId>
<artifactId>jaxb2-basics</artifactId> <artifactId>jaxb-plugins</artifactId>
<version>${version.jaxb2-basics}</version> <version>${version.jaxb-plugins}</version>
</plugin>
<plugin>
<groupId>org.jvnet.jaxb</groupId>
<artifactId>jaxb-plugin-annotate</artifactId>
<version>${version.jaxb-plugins}</version>
</plugin> </plugin>
</plugins> </plugins>
</configuration> </configuration>
<dependencies>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<version>${version.jaxb-runtime}</version>
<optional>true</optional>
</dependency>
</dependencies>
</plugin> </plugin>
<!-- Integrate code coverage --> <!-- Integrate code coverage -->
<plugin> <plugin>

4
src/main/java/de/kosit/validationtool/cmd/CommandLineOptions.java
View file

@ -175,9 +175,9 @@ public class CommandLineOptions implements Callable<ReturnValue> {
private static void configureLogging(final CommandLineOptions cmd) { private static void configureLogging(final CommandLineOptions cmd) {
if (cmd.isDebugLog()) { 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 { } 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());
} }
} }

2
src/main/java/de/kosit/validationtool/config/XPathBuilder.java
View file

@ -114,7 +114,7 @@ class XPathBuilder implements Builder<XPathExecutable> {
final Iterable<String> iterable = () -> iterator; final Iterable<String> iterable = () -> iterator;
StreamSupport.stream(iterable.spliterator(), false).filter(e -> !ArrayUtils.contains(IGNORED_PREFIXES, e)) StreamSupport.stream(iterable.spliterator(), false).filter(e -> !ArrayUtils.contains(IGNORED_PREFIXES, e))
.filter(StringUtils::isNotBlank).forEach(e -> ns.put(e, this.executable.getUnderlyingExpression().getInternalExpression() .filter(StringUtils::isNotBlank).forEach(e -> ns.put(e, this.executable.getUnderlyingExpression().getInternalExpression()
.getRetainedStaticContext().getURIForPrefix(e, false))); .getRetainedStaticContext().getURIForPrefix(e, false).toString()));
getNamespaces().putAll(ns); getNamespaces().putAll(ns);
} }

4
src/main/java/de/kosit/validationtool/impl/CollectingErrorEventHandler.java
View file

@ -20,8 +20,8 @@ import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.StringJoiner; import java.util.StringJoiner;
import javax.xml.bind.ValidationEvent; import jakarta.xml.bind.ValidationEvent;
import javax.xml.bind.ValidationEventHandler; import jakarta.xml.bind.ValidationEventHandler;
import javax.xml.transform.ErrorListener; import javax.xml.transform.ErrorListener;
import javax.xml.transform.SourceLocator; import javax.xml.transform.SourceLocator;
import javax.xml.transform.TransformerException; import javax.xml.transform.TransformerException;

16
src/main/java/de/kosit/validationtool/impl/ConversionService.java
View file

@ -24,14 +24,14 @@ import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import java.util.StringJoiner; import java.util.StringJoiner;
import javax.xml.bind.JAXBContext; import jakarta.xml.bind.JAXBContext;
import javax.xml.bind.JAXBElement; import jakarta.xml.bind.JAXBElement;
import javax.xml.bind.JAXBException; import jakarta.xml.bind.JAXBException;
import javax.xml.bind.JAXBIntrospector; import jakarta.xml.bind.JAXBIntrospector;
import javax.xml.bind.Marshaller; import jakarta.xml.bind.Marshaller;
import javax.xml.bind.Unmarshaller; import jakarta.xml.bind.Unmarshaller;
import javax.xml.bind.ValidationEventHandler; import jakarta.xml.bind.ValidationEventHandler;
import javax.xml.bind.annotation.XmlRegistry; import jakarta.xml.bind.annotation.XmlRegistry;
import javax.xml.namespace.QName; import javax.xml.namespace.QName;
import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLOutputFactory; import javax.xml.stream.XMLOutputFactory;

4
src/main/java/de/kosit/validationtool/impl/input/SourceInput.java
View file

@ -21,7 +21,7 @@ import static org.apache.commons.lang3.StringUtils.defaultIfBlank;
import java.io.IOException; import java.io.IOException;
import java.nio.charset.Charset; 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.Source;
import javax.xml.transform.dom.DOMSource; import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamSource; import javax.xml.transform.stream.StreamSource;
@ -43,7 +43,7 @@ import net.sf.saxon.om.TreeInfo;
* <ul> * <ul>
* <li>{@link StreamSource} - both {@link java.io.InputStream} based and {@link java.io.Reader} based</li> * <li>{@link StreamSource} - both {@link java.io.InputStream} based and {@link java.io.Reader} based</li>
* <li>{@link javax.xml.transform.dom.DOMSource}</li> * <li>{@link javax.xml.transform.dom.DOMSource}</li>
* <li>{@link javax.xml.bind.util.JAXBSource}</li> * <li>{@link jakarta.xml.bind.util.JAXBSource}</li>
* <li>{@link TreeInfo}</li> * <li>{@link TreeInfo}</li>
* </ul> * </ul>
* *

6
src/main/java/de/kosit/validationtool/impl/tasks/CreateReportAction.java
View file

@ -20,9 +20,9 @@ import java.io.IOException;
import java.util.Collection; import java.util.Collection;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import javax.xml.bind.JAXBException; import jakarta.xml.bind.JAXBException;
import javax.xml.bind.Marshaller; import jakarta.xml.bind.Marshaller;
import javax.xml.bind.util.JAXBSource; import jakarta.xml.bind.util.JAXBSource;
import org.xml.sax.ContentHandler; import org.xml.sax.ContentHandler;
import org.xml.sax.DTDHandler; import org.xml.sax.DTDHandler;

2
src/main/java/de/kosit/validationtool/impl/xml/StringTrimAdapter.java
View file

@ -16,7 +16,7 @@
package de.kosit.validationtool.impl.xml; 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<String, String> { public class StringTrimAdapter extends XmlAdapter<String, String> {

73
src/main/model/binding/global.xjb
View file

@ -16,45 +16,98 @@
--> -->
<jaxb:bindings <jaxb:bindings
xmlns:annox="urn:jaxb.jvnet.org:annox"
xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc" xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc"
xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
xmlns:inheritance="http://jaxb2-commons.dev.java.net/basic/inheritance" xmlns:inheritance="urn:jaxb.jvnet.org:plugin:inheritance"
jaxb:extensionBindingPrefixes="inheritance" jaxb:extensionBindingPrefixes="xjc annox inheritance"
version="2.1"> version="3.0">
<jaxb:globalBindings> <jaxb:globalBindings>
<xjc:serializable uid="-1" /> <xjc:serializable uid="-1" />
<xjc:javaType <xjc:javaType
name="java.lang.String" name="java.lang.String"
xmlType="xs:string" xmlType="xs:string"
adapter="de.kosit.validationtool.impl.xml.StringTrimAdapter" /> adapter="de.kosit.validationtool.impl.xml.StringTrimAdapter" />
</jaxb:globalBindings> </jaxb:globalBindings>
<jaxb:bindings schemaLocation="../xsd/createReportInput.xsd"> <jaxb:bindings schemaLocation="../xsd/createReportInput.xsd">
<jaxb:schemaBindings> <jaxb:schemaBindings>
<jaxb:package name="de.kosit.validationtool.model.reportInput"/> <jaxb:package name="de.kosit.validationtool.model.reportInput"/>
</jaxb:schemaBindings> </jaxb:schemaBindings>
<jaxb:bindings node="/xs:schema/xs:element[@name='createReportInput']/xs:complexType">
<annox:annotate target="class">@java.lang.SuppressWarnings("serial")</annox:annotate>
</jaxb:bindings>
<jaxb:bindings node="/xs:schema/xs:complexType[@name='Document']">
<annox:annotate target="class">@java.lang.SuppressWarnings("serial")</annox:annotate>
</jaxb:bindings>
<jaxb:bindings node="/xs:schema/xs:complexType[@name='EngineType']">
<annox:annotate target="class">@java.lang.SuppressWarnings("serial")</annox:annotate>
</jaxb:bindings>
<jaxb:bindings node="/xs:schema/xs:complexType[@name='ValidationResultsWellformedness']">
<annox:annotate target="class">@java.lang.SuppressWarnings("serial")</annox:annotate>
</jaxb:bindings>
<jaxb:bindings node="/xs:schema/xs:complexType[@name='ValidationResultsXmlSchema']">
<annox:annotate target="class">@java.lang.SuppressWarnings("serial")</annox:annotate>
</jaxb:bindings>
<jaxb:bindings node="/xs:schema/xs:complexType[@name='ProcessingError']">
<annox:annotate target="class">@java.lang.SuppressWarnings("serial")</annox:annotate>
</jaxb:bindings>
<jaxb:bindings node="//xs:complexType[@name='XMLSyntaxError']"> <jaxb:bindings node="//xs:complexType[@name='XMLSyntaxError']">
<inheritance:extends>de.kosit.validationtool.impl.model.BaseXMLSyntaxError</inheritance:extends> <inheritance:extends>de.kosit.validationtool.impl.model.BaseXMLSyntaxError</inheritance:extends>
</jaxb:bindings> </jaxb:bindings>
</jaxb:bindings> </jaxb:bindings>
<jaxb:bindings schemaLocation="../xsd/scenarios.xsd"> <jaxb:bindings schemaLocation="../xsd/scenarios.xsd">
<jaxb:schemaBindings> <jaxb:schemaBindings>
<jaxb:package name="de.kosit.validationtool.model.scenarios"/> <jaxb:package name="de.kosit.validationtool.model.scenarios"/>
</jaxb:schemaBindings> </jaxb:schemaBindings>
<jaxb:bindings node="/xs:schema/xs:complexType[@name='CreateReportType']">
<annox:annotate target="class">@java.lang.SuppressWarnings("serial")</annox:annotate>
</jaxb:bindings>
<jaxb:bindings node="/xs:schema/xs:complexType[@name='CustomErrorLevel']">
<annox:annotate target="class">@java.lang.SuppressWarnings("serial")</annox:annotate>
</jaxb:bindings>
<jaxb:bindings node="/xs:schema/xs:complexType[@name='DescriptionType']">
<annox:annotate target="class">@java.lang.SuppressWarnings("serial")</annox:annotate>
</jaxb:bindings>
<jaxb:bindings node="/xs:schema/xs:complexType[@name='ScenarioType']">
<annox:annotate target="class">@java.lang.SuppressWarnings("serial")</annox:annotate>
</jaxb:bindings>
<jaxb:bindings node="/xs:schema/xs:element[@name='scenarios']/xs:complexType">
<annox:annotate target="class">@java.lang.SuppressWarnings("serial")</annox:annotate>
</jaxb:bindings>
<jaxb:bindings node="/xs:schema/xs:complexType[@name='ValidateWithXmlSchema']">
<annox:annotate target="class">@java.lang.SuppressWarnings("serial")</annox:annotate>
</jaxb:bindings>
</jaxb:bindings> </jaxb:bindings>
<jaxb:bindings schemaLocation="../xsd/assertions.xsd"> <jaxb:bindings schemaLocation="../xsd/assertions.xsd">
<jaxb:schemaBindings> <jaxb:schemaBindings>
<jaxb:package name="de.kosit.validationtool.cmd.assertions" /> <jaxb:package name="de.kosit.validationtool.cmd.assertions" />
</jaxb:schemaBindings> </jaxb:schemaBindings>
</jaxb:bindings> <jaxb:bindings node="/xs:schema/xs:element[@name='assertions']/xs:complexType">
<jaxb:bindings schemaLocation="../xsd/svrl-kosit.xsd"> <annox:annotate target="class">@java.lang.SuppressWarnings("serial")</annox:annotate>
<jaxb:bindings node="//xs:element[@name='schematron-output']/xs:complexType">
<inheritance:extends>de.kosit.validationtool.impl.model.BaseOutput</inheritance:extends>
</jaxb:bindings> </jaxb:bindings>
</jaxb:bindings> </jaxb:bindings>
<jaxb:bindings schemaLocation="../xsd/svrl-kosit.xsd">
<jaxb:bindings node="/xs:schema/xs:element[@name='failed-assert']/xs:complexType">
<annox:annotate target="class">@java.lang.SuppressWarnings("serial")</annox:annotate>
</jaxb:bindings>
<jaxb:bindings node="/xs:schema/xs:complexType[@name='rich-text']">
<annox:annotate target="class">@java.lang.SuppressWarnings("serial")</annox:annotate>
</jaxb:bindings>
<jaxb:bindings node="//xs:element[@name='schematron-output']/xs:complexType">
<annox:annotate target="class">@java.lang.SuppressWarnings("serial")</annox:annotate>
<inheritance:extends>de.kosit.validationtool.impl.model.BaseOutput</inheritance:extends>
</jaxb:bindings>
<jaxb:bindings node="/xs:schema/xs:element[@name='successful-report']/xs:complexType">
<annox:annotate target="class">@java.lang.SuppressWarnings("serial")</annox:annotate>
</jaxb:bindings>
</jaxb:bindings>
<jaxb:bindings schemaLocation="../xsd/daemon.xsd"> <jaxb:bindings schemaLocation="../xsd/daemon.xsd">
<jaxb:schemaBindings> <jaxb:schemaBindings>
<jaxb:package name="de.kosit.validationtool.model.daemon" /> <jaxb:package name="de.kosit.validationtool.model.daemon" />

2
src/test/java/de/kosit/validationtool/impl/tasks/CreateReportActionTest.java
View file

@ -77,7 +77,7 @@ public class CreateReportActionTest {
this.action.check(bag); this.action.check(bag);
assertThat(bag.getReport()).isNotNull(); assertThat(bag.getReport()).isNotNull();
final String reportString = serialize(bag.getReport()); final String reportString = serialize(bag.getReport());
assertThat(reportString).contains("SAXParseException"); assertThat(reportString).contains("SXXP0003");
} }
@Test @Test