Merge branch '110-gitlab-ci-umgebung-reaktivieren' into 'release/1.5.x'

GitLab CI-Umgebung reaktivieren

See merge request kosit/validator!58

.gitlab-ci.yml

@@ -84,6 +84,14 @@ java-19:
   extends: .java_extended
   image: $CI_REGISTRY_IMAGE/maven:3-eclipse-temurin-19-alpine
 
+java-21:
+  extends: .java
+  image: $CI_REGISTRY_IMAGE/maven:3-eclipse-temurin-21-alpine
+
+java-24:
+  extends: .java_extended
+  image: $CI_REGISTRY_IMAGE/maven:3-eclipse-temurin-24-alpine
+
 deploy:
   stage: deploy
   image: $CI_REGISTRY_IMAGE/maven:3-jdk-11

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-<version>-standalone.jar  -s <scenario-config-file> [OPTIONS] [FILE] [FILE] [FILE] ...
+java -jar  validationtool-<version>-standalone.jar  -s <scenario-config-file> -r <repository-path>
+[OPTIONS] [FILE] [FILE] [FILE] ...
 ```
 
 The help option displays further CLI options to customize the process:

pom.xml

@@ -56,16 +56,16 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <version.assertj>3.27.3</version.assertj>
-        <version.commons-io>2.18.0</version.commons-io>
+        <version.commons-io>2.20.0</version.commons-io>
-        <version.commons-lang>3.17.0</version.commons-lang>
+        <version.commons-lang>3.18.0</version.commons-lang>
         <version.jacoco>0.8.13</version.jacoco>
         <version.jaxb>2.3.9</version.jaxb>
         <version.lombok>1.18.38</version.lombok>
         <version.mockito>4.11.0</version.mockito>
-        <version.owasp-dependency-check>7.2.0</version.owasp-dependency-check>
+        <version.owasp-dependency-check>10.0.4</version.owasp-dependency-check>
-        <version.rest-assured>5.2.0</version.rest-assured>
+        <version.rest-assured>5.5.5</version.rest-assured>
-        <version.saxon-he>11.4</version.saxon-he>
+        <version.saxon-he>12.8</version.saxon-he>
-        <version.slf4j>1.7.36</version.slf4j>
+        <version.slf4j>2.0.17</version.slf4j>
     </properties>
     <repositories>
         <repository>
@@ -96,13 +96,13 @@
         <dependency>
             <groupId>info.picocli</groupId>
             <artifactId>picocli</artifactId>
-            <version>4.7.6</version>
+            <version>4.7.7</version>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.fusesource.jansi</groupId>
             <artifactId>jansi</artifactId>
-            <version>2.4.1</version>
+            <version>2.4.2</version>
             <optional>true</optional>
         </dependency>
         <dependency>
@@ -132,7 +132,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.13.1</version>
+            <version>4.13.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -143,7 +143,7 @@
         <dependency>
             <groupId>io.rest-assured</groupId>
             <artifactId>rest-assured</artifactId>
-            <version>5.3.0</version>
+            <version>${version.rest-assured}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -187,7 +187,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
-                <version>3.6.0</version>
+                <version>3.6.1</version>
                 <executions>
                     <execution>
                         <id>reserve-network-port</id>
@@ -207,7 +207,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
-                <version>3.5.0</version>
+                <version>3.6.1</version>
                 <executions>
                     <execution>
                         <id>enforce-versions</id>
@@ -588,8 +588,9 @@
             <build>
                 <plugins>
                     <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-gpg-plugin</artifactId>
-                        <version>3.2.7</version>
+                        <version>3.2.8</version>
                         <executions>
                             <execution>
                                 <id>sign-artifacts</id>

src/main/java/de/kosit/validationtool/cmd/CommandLineOptions.java

@@ -175,9 +175,9 @@ public class CommandLineOptions implements Callable<ReturnValue> {
 
     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());
         }
     }
 

src/main/java/de/kosit/validationtool/config/XPathBuilder.java

@@ -114,7 +114,7 @@ class XPathBuilder implements Builder<XPathExecutable> {
         final Iterable<String> 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);
 
     }

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",

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