From 03e5be34b825130eeb522032221bd8034f7530d0 Mon Sep 17 00:00:00 2001 From: Renzo Kottmann Date: Thu, 5 Feb 2026 12:25:33 +0100 Subject: [PATCH 01/10] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index b1ea07c..0d95a32 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.kosit validator - 1.6.1 + 1.6.2-SNAPSHOT KoSIT XML Validator against XSD and Schematron based on defined scenarios. @@ -691,7 +691,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 From 44c455ba8661fc1c0fd2d0e0c1335e6c00d6ca21 Mon Sep 17 00:00:00 2001 From: Philip Helger Date: Tue, 10 Feb 2026 16:55:47 +0100 Subject: [PATCH 02/10] Update Validator 1.6.x dependencies to the latest versions --- pom.xml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 0d95a32..b77b5fc 100644 --- a/pom.xml +++ b/pom.xml @@ -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 From 1fe8159c2bdca054642906986a30bfabb89f33c0 Mon Sep 17 00:00:00 2001 From: Philip Helger Date: Tue, 10 Feb 2026 17:01:07 +0100 Subject: [PATCH 03/10] Fixing Maven Assembly Output contains wrong XML Resolver JAR --- CHANGELOG.md | 6 ++++++ src/assembly/assembly-dist.xml | 1 - 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 79f360f..1543587 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,12 @@ 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 - UNRELEASED + +### Changed + +- (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 + ## 1.6.1 - 2026-02-05 ### Changed 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} From 57ae444857eccd26231cd4dd3238480a5cfee299 Mon Sep 17 00:00:00 2001 From: Philip Helger Date: Tue, 10 Feb 2026 16:55:47 +0100 Subject: [PATCH 04/10] Update Validator 1.6.x dependencies to the latest versions --- pom.xml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 0d95a32..b77b5fc 100644 --- a/pom.xml +++ b/pom.xml @@ -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 From c5c40c2009f0adb42edf14e6eeb706fb121b6f23 Mon Sep 17 00:00:00 2001 From: Philip Helger Date: Tue, 10 Feb 2026 17:01:07 +0100 Subject: [PATCH 05/10] Fixing Maven Assembly Output contains wrong XML Resolver JAR --- CHANGELOG.md | 6 ++++++ src/assembly/assembly-dist.xml | 1 - 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 79f360f..1543587 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,12 @@ 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 - UNRELEASED + +### Changed + +- (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 + ## 1.6.1 - 2026-02-05 ### Changed 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} From 752ceb228d41a82af0071c74c54ba27a7cc31432 Mon Sep 17 00:00:00 2001 From: Philip Helger Date: Tue, 17 Feb 2026 16:11:11 +0100 Subject: [PATCH 06/10] Resolve "Improve provided licenses in standalone JAR (Github 173)" --- .gitignore | 1 + NOTICE | 20 +- pom.xml | 52 ++++++ .../impl/xml/StringTrimAdapter.java | 10 +- src/main/model/binding/global.xjb | 4 +- src/main/resources/LICENSE.validator | 176 ++++++++++++++++++ src/main/resources/app-info.properties | 2 +- src/main/resources/simplelogger.properties | 20 +- src/main/resources/transform/identity.xsl | 7 +- 9 files changed, 257 insertions(+), 35 deletions(-) create mode 100644 src/main/resources/LICENSE.validator 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/NOTICE b/NOTICE index a1ed12f..ea6f0e7 100644 --- a/NOTICE +++ b/NOTICE @@ -1,5 +1,23 @@ 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/). + +This product includes software developed at +Fusesource (http://fusesource.github.io/jansi/). + +This product includes software developed at +Remko Popma (https://picocli.info/). + +This product includes software developed at +Saxonica (https://github.com/Saxonica/Saxon-HE). + +This product includes software developed at +Eclipse Foundation (https://github.com/eclipse-ee4j/jaxb-ri). + +This product includes software developed at +QOS.ch (https://www.slf4j.org/). diff --git a/pom.xml b/pom.xml index b77b5fc..9e6e7f2 100644 --- a/pom.xml +++ b/pom.xml @@ -206,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 @@ -290,14 +317,39 @@ de.kosit.validationtool.cmd.CommandLineApplication + + + + + + + false + *:* + + META-INF/*.MF + META-INF/*.SF META-INF/*.DSA META-INF/*.RSA + **/module-info.class 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 + From 20c2ce71c1972d4f3d9d6f707e08e1d00ed6e12a Mon Sep 17 00:00:00 2001 From: Philip Helger Date: Tue, 17 Feb 2026 16:15:27 +0100 Subject: [PATCH 07/10] Added license in addition to #180 --- NOTICE | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/NOTICE b/NOTICE index ea6f0e7..669ba21 100644 --- a/NOTICE +++ b/NOTICE @@ -6,18 +6,24 @@ 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 From a52bab4c690e222255e9c49b7354edc4bfbdf2fe Mon Sep 17 00:00:00 2001 From: Philip Helger Date: Tue, 17 Feb 2026 16:18:02 +0100 Subject: [PATCH 08/10] Updated changelog for 1.6.2 --- CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1543587..802455f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,11 +6,13 @@ 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 - UNRELEASED +## 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 From 1572ea34e948af4bdd3aa7e27aee534de0c3a6d7 Mon Sep 17 00:00:00 2001 From: Renzo Kottmann Date: Tue, 17 Feb 2026 16:42:55 +0100 Subject: [PATCH 09/10] [maven-release-plugin] prepare release v1.6.2 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 9e6e7f2..afaf85c 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.kosit validator - 1.6.2-SNAPSHOT + 1.6.2 KoSIT XML Validator against XSD and Schematron based on defined scenarios. @@ -744,7 +744,7 @@ scm:git:https://github.com/itplr-kosit/validator.git scm:git:https://projekte.kosit.org/kosit/validator.git - release/1.6.x + v1.6.2 https://github.com/itplr-kosit/validator From 955d608f56d37305dd49f73b023e5d55ab6792af Mon Sep 17 00:00:00 2001 From: Renzo Kottmann Date: Tue, 17 Feb 2026 16:43:17 +0100 Subject: [PATCH 10/10] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index afaf85c..8a3e450 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.kosit validator - 1.6.2 + 1.6.3-SNAPSHOT KoSIT XML Validator against XSD and Schematron based on defined scenarios. @@ -744,7 +744,7 @@ scm:git:https://github.com/itplr-kosit/validator.git scm:git:https://projekte.kosit.org/kosit/validator.git - v1.6.2 + release/1.6.x https://github.com/itplr-kosit/validator