From a89c3d86f30dfa77122ad1e2c6803e67d15ebc9c Mon Sep 17 00:00:00 2001
From: Lorenz Buehmann <buehmann@informatik.uni-leipzig.de>
Date: Wed, 24 Feb 2021 14:47:22 +0100
Subject: [PATCH] Scatatest version cleanup

---
 pom.xml                                       | 22 +++++++++++--------
 sansa-inference/sansa-inference-tests/pom.xml |  5 ++++-
 .../conformance/ConformanceTestBase.scala     |  2 +-
 .../OWLHorstConformanceTestBase.scala         |  2 +-
 .../conformance/RDFSConformanceTestBase.scala |  2 +-
 5 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5138d85f5..2aae3df34 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1108,10 +1108,20 @@
             <dependency>
                 <groupId>org.scalatest</groupId>
                 <artifactId>scalatest_${scala.binary.version}</artifactId>
-                <version>3.1.0</version>
-                <scope>test</scope>
+                <version>3.1.4</version>
             </dependency>
-<!--            <dependency>-->
+            <dependency>
+                <groupId>org.scalatestplus</groupId>
+                <artifactId>junit-4-12_${scala.binary.version}</artifactId>
+                <version>3.1.4.0</version>
+            </dependency>
+            <dependency>
+                <groupId>com.vladsch.flexmark</groupId>
+                <artifactId>flexmark-all</artifactId>
+                <version>0.36.8</version>
+            </dependency>
+
+            <!--            <dependency>-->
 <!--                <groupId>org.scalatest</groupId>-->
 <!--                <artifactId>scalatest-funsuite_${scala.binary.version}</artifactId>-->
 <!--                <version>3.2.5</version>-->
@@ -1130,12 +1140,6 @@
 <!--                <scope>test</scope>-->
 <!--            </dependency>-->
 
-            <dependency>
-                <groupId>org.scalatestplus</groupId>
-                <artifactId>junit-4-12_${scala.binary.version}</artifactId>
-                <version>3.2.0.0</version>
-                <scope>test</scope>
-            </dependency>
 
             <dependency>
                 <groupId>org.specs2</groupId>
diff --git a/sansa-inference/sansa-inference-tests/pom.xml b/sansa-inference/sansa-inference-tests/pom.xml
index 3819d9743..b2cfa6fae 100644
--- a/sansa-inference/sansa-inference-tests/pom.xml
+++ b/sansa-inference/sansa-inference-tests/pom.xml
@@ -55,7 +55,10 @@
         <dependency>
             <groupId>org.scalatest</groupId>
             <artifactId>scalatest_${scala.binary.version}</artifactId>
-            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.scalatestplus</groupId>
+            <artifactId>junit-4-12_${scala.binary.version}</artifactId>
         </dependency>
 
         <dependency>
diff --git a/sansa-inference/sansa-inference-tests/src/main/scala/net/sansa_stack/inference/test/conformance/ConformanceTestBase.scala b/sansa-inference/sansa-inference-tests/src/main/scala/net/sansa_stack/inference/test/conformance/ConformanceTestBase.scala
index be845703c..5d0071567 100644
--- a/sansa-inference/sansa-inference-tests/src/main/scala/net/sansa_stack/inference/test/conformance/ConformanceTestBase.scala
+++ b/sansa-inference/sansa-inference-tests/src/main/scala/net/sansa_stack/inference/test/conformance/ConformanceTestBase.scala
@@ -8,7 +8,7 @@ import com.typesafe.scalalogging.LazyLogging
 import org.apache.jena.rdf.model.Model
 import org.apache.jena.shared.PrefixMapping
 import org.junit.runner.RunWith
-import org.scalatest.junit.JUnitRunner
+import org.scalatestplus.junit.JUnitRunner
 import org.scalatest.{BeforeAndAfterAll, FlatSpec}
 
 import net.sansa_stack.inference.data.{RDF, RDFOps}
diff --git a/sansa-inference/sansa-inference-tests/src/main/scala/net/sansa_stack/inference/test/conformance/OWLHorstConformanceTestBase.scala b/sansa-inference/sansa-inference-tests/src/main/scala/net/sansa_stack/inference/test/conformance/OWLHorstConformanceTestBase.scala
index 1ebd4fd82..9b57ea3b0 100644
--- a/sansa-inference/sansa-inference-tests/src/main/scala/net/sansa_stack/inference/test/conformance/OWLHorstConformanceTestBase.scala
+++ b/sansa-inference/sansa-inference-tests/src/main/scala/net/sansa_stack/inference/test/conformance/OWLHorstConformanceTestBase.scala
@@ -2,7 +2,7 @@ package net.sansa_stack.inference.test.conformance
 
 import net.sansa_stack.inference.data.{RDF, RDFOps}
 import org.junit.runner.RunWith
-import org.scalatest.junit.JUnitRunner
+import org.scalatestplus.junit.JUnitRunner
 
 /**
   * The class is to test the conformance of each materialization rule of OWL Horst entailment.
diff --git a/sansa-inference/sansa-inference-tests/src/main/scala/net/sansa_stack/inference/test/conformance/RDFSConformanceTestBase.scala b/sansa-inference/sansa-inference-tests/src/main/scala/net/sansa_stack/inference/test/conformance/RDFSConformanceTestBase.scala
index 8808ef251..a6df0d173 100644
--- a/sansa-inference/sansa-inference-tests/src/main/scala/net/sansa_stack/inference/test/conformance/RDFSConformanceTestBase.scala
+++ b/sansa-inference/sansa-inference-tests/src/main/scala/net/sansa_stack/inference/test/conformance/RDFSConformanceTestBase.scala
@@ -2,7 +2,7 @@ package net.sansa_stack.inference.test.conformance
 
 import net.sansa_stack.inference.data.{RDF, RDFOps}
 import org.junit.runner.RunWith
-import org.scalatest.junit.JUnitRunner
+import org.scalatestplus.junit.JUnitRunner
 
 
 /**