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

initalize 1.6.x migrate to jakarta

Browse source
This commit is contained in:
andreb 2025-07-28 17:04:56 +02:00
parent de41d61b04
commit 96c1d346ee
8 changed files with 51 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.idea/misc.xml generated
View file

@ -82,7 +82,7 @@
<component name="NodePackageJsonFileManager"> <component name="NodePackageJsonFileManager">
<packageJsonPaths /> <packageJsonPaths />
</component> </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" project-jdk-name="oracle-1.8" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_10" project-jdk-name="corretto-11" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" /> <output url="file://$PROJECT_DIR$/out" />
</component> </component>
<component name="jetbrains.communicator.idea.IdProvider" IDEtalkID="4B2DA906C3A7DF4F7B6EA28093E19A3F" /> <component name="jetbrains.communicator.idea.IdProvider" IDEtalkID="4B2DA906C3A7DF4F7B6EA28093E19A3F" />

75
pom.xml
View file

@ -22,7 +22,7 @@
<name>KoSIT XML Prüftool Implementierung</name> <name>KoSIT XML Prüftool Implementierung</name>
<groupId>de.kosit</groupId> <groupId>de.kosit</groupId>
<version>1.5.1</version> <version>1.6.0</version>
<artifactId>validationtool</artifactId> <artifactId>validationtool</artifactId>
<description>KoSIT XML Validator against XSD and Schematron based on defined scenarios.</description> <description>KoSIT XML Validator against XSD and Schematron based on defined scenarios.</description>
@ -59,13 +59,14 @@
<version.commons-io>2.20.0</version.commons-io> <version.commons-io>2.20.0</version.commons-io>
<version.commons-lang>3.18.0</version.commons-lang> <version.commons-lang>3.18.0</version.commons-lang>
<version.jacoco>0.8.13</version.jacoco> <version.jacoco>0.8.13</version.jacoco>
<version.jaxb>2.3.9</version.jaxb> <version.jaxb>4.0.2</version.jaxb>
<version.lombok>1.18.38</version.lombok> <version.lombok>1.18.38</version.lombok>
<version.mockito>4.11.0</version.mockito> <version.mockito>4.11.0</version.mockito>
<version.owasp-dependency-check>10.0.4</version.owasp-dependency-check> <version.owasp-dependency-check>10.0.4</version.owasp-dependency-check>
<version.rest-assured>5.5.5</version.rest-assured> <version.rest-assured>5.5.5</version.rest-assured>
<version.saxon-he>12.8</version.saxon-he> <version.saxon-he>12.8</version.saxon-he>
<version.slf4j>2.0.17</version.slf4j> <version.slf4j>2.0.17</version.slf4j>
<version.jaxb-maven-plugin>4.0.9</version.jaxb-maven-plugin>
</properties> </properties>
<repositories> <repositories>
<repository> <repository>
@ -123,6 +124,11 @@
<version>${version.jaxb}</version> <version>${version.jaxb}</version>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>${version.jaxb}</version>
</dependency>
<dependency> <dependency>
<groupId>org.assertj</groupId> <groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId> <artifactId>assertj-core</artifactId>
@ -158,7 +164,6 @@
<version>1.0.2</version> <version>1.0.2</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
@ -229,8 +234,8 @@
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.14.0</version> <version>3.14.0</version>
<configuration> <configuration>
<source>1.8</source> <source>11</source>
<target>1.8</target> <target>11</target>
<encoding>UTF-8</encoding> <encoding>UTF-8</encoding>
</configuration> </configuration>
</plugin> </plugin>
@ -267,44 +272,6 @@
</filters> </filters>
</configuration> </configuration>
</execution> </execution>
<execution>
<id>jdk8</id>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<shadedArtifactAttached>true</shadedArtifactAttached>
<shadedClassifierName>java8-standalone</shadedClassifierName>
<artifactSet>
<excludes>
<exclude>org.glassfish.jaxb:jaxb-runtime</exclude>
<exclude>com.sun.istack:istack-commons-runtime</exclude>
<exclude>com.sun.xml.fastinfoset:FastInfoset</exclude>
<exclude>jakarta.activation:jakarta.activation-api</exclude>
<exclude>jakarta.xml.bind:jakarta.xml.bind-api</exclude>
<exclude>org.jvnet.staxex:stax-ex</exclude>
<exclude>org.glassfish.jaxb:txw2</exclude>
</excludes>
</artifactSet>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>de.kosit.validationtool.cmd.CommandLineApplication</mainClass>
</transformer>
</transformers>
<filters>
<filter>
<artifact>*:*</artifact>
<excludes>
<exclude>META-INF/*.SF</exclude>
<exclude>META-INF/*.DSA</exclude>
<exclude>META-INF/*.RSA</exclude>
<exclude>**/module-info.class</exclude>
</excludes>
</filter>
</filters>
</configuration>
</execution>
</executions> </executions>
</plugin> </plugin>
@ -334,9 +301,9 @@
<!-- 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>0.15.3</version> <version>${version.jaxb-maven-plugin}</version>
<executions> <executions>
<execution> <execution>
<goals> <goals>
@ -354,20 +321,12 @@
</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>0.13.1</version> <version>${version.jaxb-maven-plugin}</version>
</plugin> </plugin>
</plugins> </plugins>
</configuration> </configuration>
<dependencies>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<version>${version.jaxb}</version>
<optional>true</optional>
</dependency>
</dependencies>
</plugin> </plugin>
<!-- Integrate code coverage --> <!-- Integrate code coverage -->
@ -541,7 +500,7 @@
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<version>3.11.2</version> <version>3.11.2</version>
<configuration> <configuration>
<source>8</source> <source>11</source>
<doclint>none</doclint> <doclint>none</doclint>
</configuration> </configuration>
<executions> <executions>

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> {

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

@ -16,22 +16,21 @@
--> -->
<jaxb:bindings <jaxb:bindings
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="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"/>
@ -40,24 +39,28 @@
<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> </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>
<jaxb:bindings schemaLocation="../xsd/svrl-kosit.xsd"> <jaxb:bindings schemaLocation="../xsd/svrl-kosit.xsd">
<jaxb:bindings node="//xs:element[@name='schematron-output']/xs:complexType"> <jaxb:bindings node="//xs:element[@name='schematron-output']/xs:complexType">
<inheritance:extends>de.kosit.validationtool.impl.model.BaseOutput</inheritance:extends> <inheritance:extends>de.kosit.validationtool.impl.model.BaseOutput</inheritance:extends>
</jaxb:bindings> </jaxb:bindings>
</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"/>
</jaxb:schemaBindings> </jaxb:schemaBindings>
</jaxb:bindings> </jaxb:bindings>