diff --git a/.gitignore b/.gitignore index 1f05b8f..23b183e 100644 --- a/.gitignore +++ b/.gitignore @@ -47,6 +47,7 @@ xrechnung .DS_Store andre*-simple.xml somePrefix*.xml +zz # 2.0 stuff api/ diff --git a/CHANGELOG.md b/CHANGELOG.md index 79f360f..802455f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/) and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## 1.6.2 - 2026-02-17 + +### Changed + +- (BUILD) [GitHub #173]( https://github.com/itplr-kosit/validator/issues/173) The JAR files now contain details on the used third-party component licenses. Thanks to @cech12 +- (BUILD) [GitHub #169](https://github.com/itplr-kosit/validator/issues/169) The `.zip` file created from `maven-assembly-plugin` now contains the correct xml-resolver dependencies. Thanks to @landrix for pointing that out +- (BUILD) [#179](https://projekte.kosit.org/kosit/validator/-/issues/179) Updated all dependencies to the latest suitable versions + ## 1.6.1 - 2026-02-05 ### Changed diff --git a/NOTICE b/NOTICE index a1ed12f..669ba21 100644 --- a/NOTICE +++ b/NOTICE @@ -1,5 +1,29 @@ KoSIT XML Validator -Copyright 2017-2025 Koordinierungsstelle für IT-Standards (KoSIT) +Copyright 2017-2026 Koordinierungsstelle für IT-Standards (KoSIT) This product includes software developed by Koordinierungsstelle für IT-Standards (). + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). +Licensed under Apache 2.0 + +This product includes software developed at +Fusesource (http://fusesource.github.io/jansi/). +Licensed under Apache 2.0 + +This product includes software developed at +Remko Popma (https://picocli.info/). +Licensed under Apache 2.0 + +This product includes software developed at +Saxonica (https://github.com/Saxonica/Saxon-HE). +Licensed under MPL 2.0 + +This product includes software developed at +Eclipse Foundation (https://github.com/eclipse-ee4j/jaxb-ri). +Licensed under EDL 1.0 + +This product includes software developed at +QOS.ch (https://www.slf4j.org/). +Licensed under MIT diff --git a/pom.xml b/pom.xml index b1ea07c..8a3e450 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.kosit validator - 1.6.1 + 1.6.3-SNAPSHOT KoSIT XML Validator against XSD and Schematron based on defined scenarios. @@ -38,17 +38,18 @@ UTF-8 - 3.27.3 - 2.20.0 - 3.18.0 + 3.27.7 + 2.21.0 + 3.20.0 0.8.13 - 4.0.2 - 4.0.5 + 4.0.4 + 4.0.6 1.18.42 - 4.11.0 + 5.21.0 12.1.8 - 5.5.5 - 12.8 + + 5.5.7 + 12.9 2.0.17 4.0.11 @@ -205,6 +206,33 @@ + + + maven-resources-plugin + 3.4.0 + + + copy-license-notice + process-resources + + copy-resources + + + ${project.build.outputDirectory}/META-INF + + + ${project.basedir} + + NOTICE + + + + true + + + + + org.codehaus.mojo build-helper-maven-plugin @@ -289,14 +317,39 @@ de.kosit.validationtool.cmd.CommandLineApplication + + + + + + + false + *:* + + META-INF/*.MF + META-INF/*.SF META-INF/*.DSA META-INF/*.RSA + **/module-info.class @@ -691,7 +744,7 @@ scm:git:https://github.com/itplr-kosit/validator.git scm:git:https://projekte.kosit.org/kosit/validator.git - v1.6.1 + release/1.6.x https://github.com/itplr-kosit/validator diff --git a/src/assembly/assembly-dist.xml b/src/assembly/assembly-dist.xml index d091b08..5d27120 100644 --- a/src/assembly/assembly-dist.xml +++ b/src/assembly/assembly-dist.xml @@ -32,7 +32,6 @@ libs false runtime - ${artifact.artifactId}-${artifact.baseVersion}.${artifact.extension} 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 08ef4b1..ca839dd 100644 --- a/src/main/java/de/kosit/validationtool/impl/xml/StringTrimAdapter.java +++ b/src/main/java/de/kosit/validationtool/impl/xml/StringTrimAdapter.java @@ -22,18 +22,12 @@ public class StringTrimAdapter extends XmlAdapter { @Override public String unmarshal(final String v) { - if (v == null) { - return null; - } - return v.trim(); + return trim(v); } @Override public String marshal(final String v) { - if (v == null) { - return null; - } - return v.trim(); + return trim(v); } public static String trim(final String v) { diff --git a/src/main/model/binding/global.xjb b/src/main/model/binding/global.xjb index cd2a512..ae2d603 100644 --- a/src/main/model/binding/global.xjb +++ b/src/main/model/binding/global.xjb @@ -1,6 +1,6 @@ - @@ -24,5 +24,4 @@ - - \ No newline at end of file +