fix(plc4j): Made the driver-testsuites run with the version 3.0.0-M5 …

…of the failsafe plugin
apache · Jan 28, 2022 · b0b8605 · b0b8605
1 parent 0fd5d63
commit b0b8605
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 49 deletions.
diff --git a/plc4j/pom.xml b/plc4j/pom.xml
@@ -208,28 +208,6 @@
         </configuration>
       </plugin>
 
-      <!--
-        Make the failsafe execute all integration-tests
-      -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-failsafe-plugin</artifactId>
-        <executions>
-          <execution>
-            <goals>
-              <goal>integration-test</goal>
-              <goal>verify</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <!--
-                Notice the @ instead of the $ as prefix? That's late evaluation.
-          -->
-          <!--argLine>@{failsafeArgLine}</argLine-->
-        </configuration>
-      </plugin>
-
       <!--
         Even if Maven transitively pulls in dependencies, relying on these can
         quite often cause hard to find problems. So it's a good practice to make

diff --git a/plc4j/utils/test-utils/src/main/java/org/apache/plc4x/test/XmlTestsuiteLoader.java b/plc4j/utils/test-utils/src/main/java/org/apache/plc4x/test/XmlTestsuiteLoader.java
@@ -41,11 +41,7 @@ public abstract class XmlTestsuiteLoader {
 
     protected XmlTestsuiteLoader(String testsuiteDocument) {
         this.testsuiteDocument = testsuiteDocument;
-        try {
-            this.testsuiteDocumentXml = getClass().getClassLoader().getUnnamedModule().getResourceAsStream(testsuiteDocument);
-        } catch (IOException e) {
-            throw new IllegalArgumentException("Suite " + testsuiteDocument + " not found");
-        }
+        this.testsuiteDocumentXml = getClass().getResourceAsStream(testsuiteDocument);
 
         if (testsuiteDocumentXml == null) {
             throw new IllegalArgumentException("Suite " + testsuiteDocument + " not found");

diff --git a/pom.xml b/pom.xml
@@ -823,6 +823,14 @@
             </goals>
           </execution>
         </executions>
+        <configuration>
+          <!--
+            The failsafe plugin would use the java jigsaw module path,
+            this would make loading the test XML files impossible.
+            So we simply disable this.
+          -->
+          <useModulePath>false</useModulePath>
+        </configuration>
       </plugin>
 
       <!-- Generate the legally required text files in the jars -->
@@ -1125,6 +1133,7 @@
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-failsafe-plugin</artifactId>
           <version>3.0.0-M5</version>
+          <!--version>2.22.2</version-->
           <dependencies>
             <dependency>
               <groupId>org.junit.jupiter</groupId>

diff --git a/protocols/pom.xml b/protocols/pom.xml
@@ -200,28 +200,6 @@
           </execution>
         </executions>
       </plugin>
-
-      <!--
-        Make the failsafe execute all integration-tests
-      -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-failsafe-plugin</artifactId>
-        <executions>
-          <execution>
-            <goals>
-              <goal>integration-test</goal>
-              <goal>verify</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <!--
-                Notice the @ instead of the $ as prefix? That's late evaluation.
-          -->
-          <!--argLine>@{failsafeArgLine}</argLine-->
-        </configuration>
-      </plugin>
     </plugins>
   </build>