Correct gradle settings for JUnit 5

Author: wolandscat

build.gradle

@@ -41,7 +41,6 @@ subprojects {
         dependsOn generateGrammarSource
     }
     dependencies {
-        implementation 'junit:junit:4.12'
         antlr 'org.antlr:antlr4:4.13.1'
         api 'org.antlr:antlr4-runtime:4.13.1'
         api 'org.slf4j:slf4j-api:1.7.36'
@@ -59,8 +58,8 @@ subprojects {
 
         implementation 'org.slf4j:slf4j-simple:1.7.36'
 
-        testImplementation 'org.junit.jupiter:junit-jupiter-api:5.6.0'
-        testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.6.0'
+        testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.1'
+        testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.1'
 
     }
 

combined/src/test/java/org/openehr/adlReader/Adl2ReaderTest.java

@@ -3,27 +3,26 @@
 import com.google.common.base.Charsets;
 import org.antlr.v4.runtime.CharStreams;
 import org.apache.commons.io.input.BOMInputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Assertions;
 import org.openehr.aqlReader.AqlReader;
+import org.openehr.belReader.BelReader;
 import org.openehr.cadlReader.Cadl14Reader;
 import org.openehr.cadlReader.Cadl2Reader;
 import org.openehr.common.SyntaxReader;
 import org.openehr.elReader.ElReader;
-import org.openehr.belReader.BelReader;
 import org.openehr.odinReader.OdinReader;
 import org.reflections.Reflections;
-import org.reflections.scanners.ResourcesScanner;
 import org.reflections.scanners.Scanners;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.*;
+import java.io.IOException;
+import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.regex.Pattern;
 
-import static org.junit.Assert.fail;
-
 public class Adl2ReaderTest {
 
     private static final Logger log = LoggerFactory.getLogger(Adl2ReaderTest.class);
@@ -111,7 +110,7 @@ private void runTest (String fileExt, String artefactType, SyntaxReader<?,?> rea
         int failGroupCount = paths.size();
 
         if (passErrorCount > 0 || failErrorCount != paths.size())
-            fail (String.format ("%d files failed from %d in pass group; %d files passed from %d in fail group",
+            Assertions.fail(String.format ("%d files failed from %d in pass group; %d files passed from %d in fail group",
                     passErrorCount, passGroupCount, failGroupCount - failErrorCount, failGroupCount));
     }