From 98c2e1c18ce727e945e8b3ef77558459952e56d6 Mon Sep 17 00:00:00 2001 From: andreb Date: Wed, 23 Jul 2025 13:29:34 +0200 Subject: [PATCH] upgrade dependencies and plugins --- README.md | 3 ++- pom.xml | 27 ++++++++++--------- .../cmd/CommandLineOptions.java | 4 +-- .../validationtool/config/XPathBuilder.java | 2 +- .../cmd/CommandlineApplicationTest.java | 8 ++++++ .../impl/tasks/CreateReportActionTest.java | 2 +- 6 files changed, 28 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 0fd508e..50e3354 100644 --- a/README.md +++ b/README.md @@ -52,7 +52,8 @@ The validator can be used in three different ways: The general way using the CLI is: ```shell -java -jar validationtool--standalone.jar -s [OPTIONS] [FILE] [FILE] [FILE] ... +java -jar validationtool--standalone.jar -s -r +[OPTIONS] [FILE] [FILE] [FILE] ... ``` The help option displays further CLI options to customize the process: diff --git a/pom.xml b/pom.xml index 877d788..2690237 100644 --- a/pom.xml +++ b/pom.xml @@ -56,16 +56,16 @@ UTF-8 3.27.3 - 2.18.0 - 3.17.0 + 2.20.0 + 3.18.0 0.8.13 2.3.9 1.18.38 4.11.0 - 7.2.0 - 5.2.0 - 11.4 - 1.7.36 + 10.0.4 + 5.5.5 + 12.8 + 2.0.17 @@ -96,13 +96,13 @@ info.picocli picocli - 4.7.6 + 4.7.7 true org.fusesource.jansi jansi - 2.4.1 + 2.4.2 true @@ -132,7 +132,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -143,7 +143,7 @@ io.rest-assured rest-assured - 5.3.0 + ${version.rest-assured} test @@ -187,7 +187,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.6.0 + 3.6.1 reserve-network-port @@ -207,7 +207,7 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.5.0 + 3.6.1 enforce-versions @@ -588,8 +588,9 @@ + org.apache.maven.plugins maven-gpg-plugin - 3.2.7 + 3.2.8 sign-artifacts diff --git a/src/main/java/de/kosit/validationtool/cmd/CommandLineOptions.java b/src/main/java/de/kosit/validationtool/cmd/CommandLineOptions.java index 69e26d9..6381ecf 100644 --- a/src/main/java/de/kosit/validationtool/cmd/CommandLineOptions.java +++ b/src/main/java/de/kosit/validationtool/cmd/CommandLineOptions.java @@ -175,9 +175,9 @@ public class CommandLineOptions implements Callable { private static void configureLogging(final CommandLineOptions cmd) { if (cmd.isDebugLog()) { - System.setProperty(org.slf4j.impl.SimpleLogger.DEFAULT_LOG_LEVEL_KEY, "DEBUG"); + System.setProperty(org.slf4j.simple.SimpleLogger.DEFAULT_LOG_LEVEL_KEY, "DEBUG"); } else { - System.setProperty(org.slf4j.impl.SimpleLogger.DEFAULT_LOG_LEVEL_KEY, cmd.getLogLevel().name()); + System.setProperty(org.slf4j.simple.SimpleLogger.DEFAULT_LOG_LEVEL_KEY, cmd.getLogLevel().name()); } } diff --git a/src/main/java/de/kosit/validationtool/config/XPathBuilder.java b/src/main/java/de/kosit/validationtool/config/XPathBuilder.java index 90b5351..713f951 100644 --- a/src/main/java/de/kosit/validationtool/config/XPathBuilder.java +++ b/src/main/java/de/kosit/validationtool/config/XPathBuilder.java @@ -114,7 +114,7 @@ class XPathBuilder implements Builder { final Iterable iterable = () -> iterator; StreamSupport.stream(iterable.spliterator(), false).filter(e -> !ArrayUtils.contains(IGNORED_PREFIXES, e)) .filter(StringUtils::isNotBlank).forEach(e -> ns.put(e, this.executable.getUnderlyingExpression().getInternalExpression() - .getRetainedStaticContext().getURIForPrefix(e, false))); + .getRetainedStaticContext().getURIForPrefix(e, false).toString())); getNamespaces().putAll(ns); } diff --git a/src/test/java/de/kosit/validationtool/cmd/CommandlineApplicationTest.java b/src/test/java/de/kosit/validationtool/cmd/CommandlineApplicationTest.java index 4231b9f..4515d9b 100644 --- a/src/test/java/de/kosit/validationtool/cmd/CommandlineApplicationTest.java +++ b/src/test/java/de/kosit/validationtool/cmd/CommandlineApplicationTest.java @@ -230,6 +230,14 @@ public class CommandlineApplicationTest { assertThat(CommandLine.getErrorOutput()).contains(RESULT_OUTPUT); } + @Test + public void testAndre() throws IOException { + final String[] args = new String[] { "-s", Paths.get(Simple.SCENARIOS).toString(), "-r", + Paths.get(Simple.REPOSITORY_URI).toString(), Paths.get(Simple.SIMPLE_VALID).toString(), "--report-prefix", "andre1" }; + CommandLineApplication.mainProgram(args); + assertThat(CommandLine.getErrorOutput()).contains(RESULT_OUTPUT); + } + @Test public void testUnexpectedDaemonFlag() { final String[] args = new String[] { "-D", "-s", Paths.get(Simple.SCENARIOS).toString(), "-r", diff --git a/src/test/java/de/kosit/validationtool/impl/tasks/CreateReportActionTest.java b/src/test/java/de/kosit/validationtool/impl/tasks/CreateReportActionTest.java index 17f6dfd..9bf99bc 100644 --- a/src/test/java/de/kosit/validationtool/impl/tasks/CreateReportActionTest.java +++ b/src/test/java/de/kosit/validationtool/impl/tasks/CreateReportActionTest.java @@ -77,7 +77,7 @@ public class CreateReportActionTest { this.action.check(bag); assertThat(bag.getReport()).isNotNull(); final String reportString = serialize(bag.getReport()); - assertThat(reportString).contains("SAXParseException"); + assertThat(reportString).contains("SXXP0003"); } @Test