Merge pull request #2 from steveorourke/master

Upgrade to junit 5
tyro · Oct 17, 2019 · b5ddd6a · b5ddd6a
2 parents f97be97 + e229f0b
commit b5ddd6a
Show file tree

Hide file tree

Showing 15 changed files with 298 additions and 352 deletions.
diff --git a/pom.xml b/pom.xml
@@ -77,15 +77,32 @@
             <artifactId>spring-test</artifactId>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>org.mybatis</groupId>
+            <artifactId>mybatis</artifactId>
+            <version>3.5.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>5.5.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>5.5.2</version>
+        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <version>4.12</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.mybatis</groupId>
-            <artifactId>mybatis</artifactId>
-            <version>3.5.2</version>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>1.12.2</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
@@ -103,6 +120,11 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.22.1</version>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>

diff --git a/src/main/java/com/tyro/oss/dbevolution/LiquiBaseMigrationScriptTestBase.java b/src/main/java/com/tyro/oss/dbevolution/LiquiBaseMigrationScriptTestBase.java
diff --git a/src/main/java/com/tyro/oss/dbevolution/LiquiBaseMigrationScriptsTestRunner.java b/src/main/java/com/tyro/oss/dbevolution/LiquiBaseMigrationScriptsTestRunner.java