#784 - Implement support for JUnit 5 - initial commit, will need to add a JUnit5 test

Author: ipolevoy

activejdbc/pom.xml

@@ -404,6 +404,20 @@
             <scope>provided</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>${junit-jupiter.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.vintage</groupId>
+            <artifactId>junit-vintage-engine</artifactId>
+            <version>${junit-jupiter.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>

activejdbc/src/main/java/org/javalite/activejdbc/test/DBSpec.java

@@ -23,6 +23,8 @@
 import org.javalite.test.jspec.JSpecSupport;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -100,7 +102,7 @@ public void setRollback(boolean rollback) {
         }
     }
 
-    @Before
+    @Before @BeforeEach
     public final void openTestConnections() {
 
         if(!suppressDb){
@@ -121,7 +123,7 @@ public final void openTestConnections() {
         }
     }
 
-    @After
+    @After @AfterEach
     public final void closeTestConnections() {
         if(!suppressDb){
             List<ConnectionSpecWrapper> connectionWrappers = getTestConnectionWrappers();

pom.xml

@@ -25,7 +25,11 @@
 		<maven.compiler.target>1.8</maven.compiler.target>
         <skipTests>false</skipTests>
         <slf4j.version>1.7.0</slf4j.version> <!--//TODO: replace with latest version when this is fixed: http://jira.qos.ch/browse/SLF4J-389-->
-	</properties>
+
+        <junit.version>4.12</junit.version>
+        <junit-vintage-engine>4.12.1</junit-vintage-engine>
+        <junit-jupiter.version>5.3.0</junit-jupiter.version>
+    </properties>
 
     <licenses>
         <license>
@@ -85,7 +89,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.19.1</version>
+                    <version>2.22.0</version>
                     <configuration>
                         <useFile>false</useFile>
                         <skipTests>${skipTests}</skipTests>
@@ -148,7 +152,21 @@
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
-                <version>4.11</version>
+                <version>${junit.version}</version>
+                <scope>test</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>org.junit.jupiter</groupId>
+                <artifactId>junit-jupiter-engine</artifactId>
+                <version>${junit-jupiter.version}</version>
+                <scope>test</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>org.junit.vintage</groupId>
+                <artifactId>junit-vintage-engine</artifactId>
+                <version>${junit-jupiter.version}</version>
                 <scope>test</scope>
             </dependency>