From fd3451fef1d740deebff4c824fef7fbd3e4151ac Mon Sep 17 00:00:00 2001 From: Christian Schlichtherle Date: Fri, 9 Oct 2020 22:46:34 +0200 Subject: [PATCH 1/6] Improve metadata for release to Maven Central. --- .gitignore | 2 ++ pom.xml | 29 +++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/.gitignore b/.gitignore index b0d4fc1..aecfb3a 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,5 @@ src/generated # Testing stuff xrechnung + +/.idea diff --git a/pom.xml b/pom.xml index ebe2131..ccaa9e9 100644 --- a/pom.xml +++ b/pom.xml @@ -537,6 +537,18 @@ LF + + maven-gpg-plugin + + + sign-artifacts + verify + + sign + + + + @@ -578,6 +590,23 @@ https://github.com/itplr-kosit/validationtool.git scm:git:https://projekte.kosit.org/kosit/validator.git v1.1.0 + https://github.com/itplr-kosit/validator + https://github.com/itplr-kosit/validator + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + sonatype-nexus-staging + Nexus Release Repository + https://oss.sonatype.org/service/local/staging/deploy/maven2 + + + From 4438038f225f98db213550a095d447da578cc21a Mon Sep 17 00:00:00 2001 From: Christian Schlichtherle Date: Fri, 30 Oct 2020 18:54:43 +0100 Subject: [PATCH 2/6] Fix documentation. --- 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 5f32e1d3b7f525ca9119486578acd1560ccd6c0c Mon Sep 17 00:00:00 2001 From: Christian Schlichtherle Date: Fri, 30 Oct 2020 18:55:38 +0100 Subject: [PATCH 3/6] Ensure English locale for English messages. --- src/main/java/de/kosit/validationtool/impl/Printer.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/de/kosit/validationtool/impl/Printer.java b/src/main/java/de/kosit/validationtool/impl/Printer.java index 7e122d1..4a1e414 100644 --- a/src/main/java/de/kosit/validationtool/impl/Printer.java +++ b/src/main/java/de/kosit/validationtool/impl/Printer.java @@ -17,6 +17,7 @@ package de.kosit.validationtool.impl; import java.text.MessageFormat; +import java.util.Locale; /** * Wrapper for {@link System Systems} printing capability. @@ -37,7 +38,7 @@ public class Printer { * @param params the params. */ public static void writeOut(final String message, final Object... params) { - System.out.println(MessageFormat.format(message, params)); + System.out.println(new MessageFormat(message, Locale.ENGLISH).format(params)); } /** @@ -47,6 +48,6 @@ public class Printer { * @param params the params. */ public static void writeErr(final String message, final Object... params) { - System.err.println(MessageFormat.format(message, params)); + System.err.println(new MessageFormat(message, Locale.ENGLISH).format(params)); } } From 555dad2ede44e40012f6e3c4ec79e168bc22084d Mon Sep 17 00:00:00 2001 From: Christian Schlichtherle Date: Fri, 30 Oct 2020 18:56:03 +0100 Subject: [PATCH 4/6] Fix language. --- src/main/java/de/kosit/validationtool/api/InputFactory.java | 4 ++-- .../de/kosit/validationtool/cmd/CommandLineApplication.java | 2 +- src/main/java/de/kosit/validationtool/cmd/InternalCheck.java | 4 ++-- .../de/kosit/validationtool/config/ConfigurationLoader.java | 2 +- .../java/de/kosit/validationtool/impl/ConversionService.java | 2 +- src/main/java/de/kosit/validationtool/impl/ResolvingMode.java | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/de/kosit/validationtool/api/InputFactory.java b/src/main/java/de/kosit/validationtool/api/InputFactory.java index 2f9a149..9a07430 100644 --- a/src/main/java/de/kosit/validationtool/api/InputFactory.java +++ b/src/main/java/de/kosit/validationtool/api/InputFactory.java @@ -133,7 +133,7 @@ public class InputFactory { try { return read(uri.toURL(), digestAlgorithm); } catch (final MalformedURLException e) { - throw new IllegalArgumentException(String.format("Can not read from uri %s Not a valid uri supplied", uri)); + throw new IllegalArgumentException(String.format("URL invalid or protocol not supported: %s", uri), e); } } @@ -149,7 +149,7 @@ public class InputFactory { } /** - * Liest einen Prüfling von der übergebenen URL. Es wird ein definierter Algorithmis zur Ermittlung der Prüfsumme + * Liest einen Prüfling von der übergebenen URL. Es wird ein definierter Algorithmus zur Ermittlung der Prüfsumme * genutzt. * * @param url URL des Prüflings diff --git a/src/main/java/de/kosit/validationtool/cmd/CommandLineApplication.java b/src/main/java/de/kosit/validationtool/cmd/CommandLineApplication.java index ed3d474..de56cf5 100644 --- a/src/main/java/de/kosit/validationtool/cmd/CommandLineApplication.java +++ b/src/main/java/de/kosit/validationtool/cmd/CommandLineApplication.java @@ -67,7 +67,7 @@ public class CommandLineApplication { private static void sayGoodby(final ReturnValue resultStatus) { Printer.writeOut("\n##############################"); if (resultStatus.equals(ReturnValue.SUCCESS)) { - Printer.writeOut("# " + new Line(Code.GREEN).add("Validation succesful!").render(false, false) + " #"); + Printer.writeOut("# " + new Line(Code.GREEN).add("Validation successful!").render(false, false) + " #"); } else { Printer.writeOut("# " + new Line(Code.RED).add("Validation failed!").render(false, false) + " #"); } diff --git a/src/main/java/de/kosit/validationtool/cmd/InternalCheck.java b/src/main/java/de/kosit/validationtool/cmd/InternalCheck.java index 89c62ef..1f41d0a 100644 --- a/src/main/java/de/kosit/validationtool/cmd/InternalCheck.java +++ b/src/main/java/de/kosit/validationtool/cmd/InternalCheck.java @@ -38,8 +38,8 @@ import de.kosit.validationtool.impl.DefaultCheck; import de.kosit.validationtool.impl.tasks.CheckAction; /** - * Simple Erweiterung der Klasse {@link DefaultCheck} um das Ergebnis der Assertion-Prüfung auszwerten und auszugeben. - * Diese Klasse stellt keine fachlicher Erweiterung des eigentlichen Prüfvorganges dar! + * Simple Erweiterung der Klasse {@link DefaultCheck} um das Ergebnis der Assertion-Prüfung auszuwerten und auszugeben. + * Diese Klasse stellt keine fachliche Erweiterung des eigentlichen Prüfvorganges dar! * * @author Andreas Penski */ diff --git a/src/main/java/de/kosit/validationtool/config/ConfigurationLoader.java b/src/main/java/de/kosit/validationtool/config/ConfigurationLoader.java index bb78427..6e2f788 100644 --- a/src/main/java/de/kosit/validationtool/config/ConfigurationLoader.java +++ b/src/main/java/de/kosit/validationtool/config/ConfigurationLoader.java @@ -55,7 +55,7 @@ import net.sf.saxon.s9api.XdmNode; import net.sf.saxon.s9api.XdmNodeKind; /** - * Configuration class that loads neccessary {@link Check} configuration from an existing scenario.xml specification. + * Configuration class that loads necessary {@link Check} configuration from an existing scenario.xml specification. * This is the recommended option when an official configuration exists as is the case with 'xrechnung'. * * @author Andreas Penski diff --git a/src/main/java/de/kosit/validationtool/impl/ConversionService.java b/src/main/java/de/kosit/validationtool/impl/ConversionService.java index aa32859..dfc16d1 100644 --- a/src/main/java/de/kosit/validationtool/impl/ConversionService.java +++ b/src/main/java/de/kosit/validationtool/impl/ConversionService.java @@ -147,7 +147,7 @@ public class ConversionService { } /** - * Unmarshalls a specifc xml model into a defined java object. + * Unmarshalls a specific XML model into a defined Java object. * * @param xml the xml * @param type the expected type created diff --git a/src/main/java/de/kosit/validationtool/impl/ResolvingMode.java b/src/main/java/de/kosit/validationtool/impl/ResolvingMode.java index 7a0ab65..a668bf1 100644 --- a/src/main/java/de/kosit/validationtool/impl/ResolvingMode.java +++ b/src/main/java/de/kosit/validationtool/impl/ResolvingMode.java @@ -33,7 +33,7 @@ import de.kosit.validationtool.impl.xml.StrictRelativeResolvingStrategy; public enum ResolvingMode { /** - * Resolving using only the configured content repository. No furthing resolving allowed. This + * Resolving using only the configured content repository. */ STRICT_RELATIVE(new StrictRelativeResolvingStrategy()) { From ea3c9d294f91c2deb4cbb96b68a7901dfe74a7e6 Mon Sep 17 00:00:00 2001 From: Christian Schlichtherle Date: Mon, 21 Dec 2020 19:21:38 +0100 Subject: [PATCH 5/6] Revert change. --- .gitignore | 2 -- 1 file changed, 2 deletions(-) diff --git a/.gitignore b/.gitignore index d05cb58..8d2ff7e 100644 --- a/.gitignore +++ b/.gitignore @@ -41,5 +41,3 @@ src/generated *.xpr # Testing stuff xrechnung - -/.idea From 69a2f8503467fe17b6e3605f1d3bb75b9fa472d3 Mon Sep 17 00:00:00 2001 From: Christian Schlichtherle Date: Mon, 21 Dec 2020 19:32:40 +0100 Subject: [PATCH 6/6] Add version for maven-gpg-plugin. --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 66c5325..4d8dc45 100644 --- a/pom.xml +++ b/pom.xml @@ -546,6 +546,7 @@ maven-gpg-plugin + 1.6 sign-artifacts