From 34a109d8e6044e2ecb4a958ab5435685a4860fa4 Mon Sep 17 00:00:00 2001 From: Andreas Penski Date: Thu, 17 Dec 2020 07:20:10 +0000 Subject: [PATCH 1/6] (chore) fix api usage --- docs/api.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api.md b/docs/api.md index 7999743..0e969f6 100644 --- a/docs/api.md +++ b/docs/api.md @@ -54,7 +54,7 @@ public class StandardExample { // Load scenarios.xml from classpath URL scenarios = this.getClass().getClassLoader().getResource("scenarios.xml"); // Load the rest of the specific Validator configuration from classpath - Configuration config = Configuration.load(scenarios.toURI()); + Configuration config = Configuration.load(scenarios.toURI()).build(); // Use the default validation procedure Check validator = new DefaultCheck(config); // Validate a single document From 705d31fdc81dae750af4d23ce2253aca30d3729b Mon Sep 17 00:00:00 2001 From: Renzo Kottmann Date: Mon, 21 Dec 2020 07:26:36 +0000 Subject: [PATCH 2/6] Resolve "Allow more than 3 customLevel elements in scenarios" --- .gitignore | 2 +- CHANGELOG.md | 13 ++++++++++--- src/main/model/xsd/scenarios.xsd | 2 +- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index b0d4fc1..8d2ff7e 100644 --- a/.gitignore +++ b/.gitignore @@ -38,6 +38,6 @@ src/generated .settings .vscode *.code-workspace - +*.xpr # Testing stuff xrechnung diff --git a/CHANGELOG.md b/CHANGELOG.md index 3378748..afc518e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,16 +5,23 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +### Fixed + +- Allow more than 3 customLevel elements in scenarios + ## 1.4.0 ### Fixed -- date conversion when using [ConfigurationBuilder#date(Date)](https://github.com/itplr-kosit/validator/blob/d7beb1040418ae5cbeb9427532fd87482f55756c/src/main/java/de/kosit/validationtool/config/ConfigurationBuilder.java#L109) + +- date conversion when + using [ConfigurationBuilder#date(Date)](https://github.com/itplr-kosit/validator/blob/d7beb1040418ae5cbeb9427532fd87482f55756c/src/main/java/de/kosit/validationtool/config/ConfigurationBuilder.java#L109) - [CLI] [#51](https://github.com/itplr-kosit/validator/issues/51) Suffix of report xml is missing - [#53](https://github.com/itplr-kosit/validator/issues/53) Fix copyright and licensing information -- [#56](https://github.com/itplr-kosit/validator/issues/56) `namespace` element content needs trimming -- [DAEMON] [#57](https://github.com/itplr-kosit/validator/issues/57) Reading large inputs correctly +- [#56](https://github.com/itplr-kosit/validator/issues/56) `namespace` element content needs trimming +- [DAEMON] [#57](https://github.com/itplr-kosit/validator/issues/57) Reading large inputs correctly ### Added + - read saxon XdmNode with InputFactory - [CLI] custom output without the various log messages - [CLI] options to set the log level (`-X` = full debug output, `-l ` set a specific level) diff --git a/src/main/model/xsd/scenarios.xsd b/src/main/model/xsd/scenarios.xsd index b626c06..ef432e2 100644 --- a/src/main/model/xsd/scenarios.xsd +++ b/src/main/model/xsd/scenarios.xsd @@ -126,7 +126,7 @@ - + From 7b8647c8c4a68ed66da5efded60d23d44f357e0e Mon Sep 17 00:00:00 2001 From: "Andreas Penski (init)" Date: Mon, 21 Dec 2020 08:48:14 +0100 Subject: [PATCH 3/6] (fix) remove saxon signatature from uber-jar see https://github.com/itplr-kosit/validator-configuration-xrechnung/issues/49 --- CHANGELOG.md | 4 +++- pom.xml | 17 ++++++++++++----- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index afc518e..924ed33 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed -- Allow more than 3 customLevel elements in scenarios +- Allow more than 3 customLevel elements in scenarios (see xrechnung + configuration [ issue 49](https://github.com/itplr-kosit/validator-configuration-xrechnung/issues/49)) +- Remove saxon signature from java8 uber-jar (see [67](https://github.com/itplr-kosit/validator/issues/67)) ## 1.4.0 diff --git a/pom.xml b/pom.xml index e98c658..e8459c9 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ ~ limitations under the License. --> - + 4.0.0 KoSIT XML Prüftool Implementierung @@ -273,11 +273,18 @@ de.kosit.validationtool.cmd.CommandLineApplication - - - META-INF/TE-050AC.SF - + + + *:* + + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + **/module-info.class + + + From 5f8a64d9da998b137c784dc61f47195e985863d7 Mon Sep 17 00:00:00 2001 From: "Andreas Penski (init)" Date: Mon, 21 Dec 2020 08:58:09 +0100 Subject: [PATCH 4/6] (chore) prepare release --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 924ed33..7219df8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,8 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## 1.4.1 + ### Fixed - Allow more than 3 customLevel elements in scenarios (see xrechnung From fb29933d98d2b1822f1d385b21597c2ecdac753d Mon Sep 17 00:00:00 2001 From: "Andreas Penski (init)" Date: Mon, 21 Dec 2020 09:00:58 +0100 Subject: [PATCH 5/6] [maven-release-plugin] prepare release v1.4.1 --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index e8459c9..231bbd0 100644 --- a/pom.xml +++ b/pom.xml @@ -15,13 +15,13 @@ ~ limitations under the License. --> - + 4.0.0 KoSIT XML Prüftool Implementierung de.kosit - 1.4.1-SNAPSHOT + 1.4.1 validationtool KoSIT XML Validator against XSD and Schematron based on defined scenarios. @@ -584,7 +584,7 @@ https://github.com/itplr-kosit/validationtool.git scm:git:https://projekte.kosit.org/kosit/validator.git - v1.1.0 + v1.4.1 From 7e5f0093d42de47f6c95b0697349f45bc6e27c81 Mon Sep 17 00:00:00 2001 From: "Andreas Penski (init)" Date: Mon, 21 Dec 2020 09:01:04 +0100 Subject: [PATCH 6/6] [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 231bbd0..97aa594 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ KoSIT XML Prüftool Implementierung de.kosit - 1.4.1 + 1.4.2-SNAPSHOT validationtool KoSIT XML Validator against XSD and Schematron based on defined scenarios. @@ -584,7 +584,7 @@ https://github.com/itplr-kosit/validationtool.git scm:git:https://projekte.kosit.org/kosit/validator.git - v1.4.1 + v1.1.0