Move to JUnit 4

TestNG requires Java 7 now
JodaOrg · Oct 27, 2017 · b7faa05 · b7faa05
1 parent 91eec97
commit b7faa05
Show file tree

Hide file tree

Showing 15 changed files with 2,571 additions and 1,937 deletions.
diff --git a/pom.xml b/pom.xml
@@ -374,20 +374,15 @@
       <optional>true</optional><!-- mandatory in Scala -->
     </dependency>
     <dependency>
-      <groupId>org.testng</groupId>
-      <artifactId>testng</artifactId>
-      <version>6.8.5</version>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.12</version>
+    </dependency>
+    <dependency>
+      <groupId>com.tngtech.java</groupId>
+      <artifactId>junit-dataprovider</artifactId>
+      <version>1.10.0</version>
       <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.yaml</groupId>
-          <artifactId>snakeyaml</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.beanshell</groupId>
-          <artifactId>bsh</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
   </dependencies>
 
@@ -610,7 +605,7 @@
     <!-- Plugin version numbers -->
     <maven-assembly-plugin.version>3.0.0</maven-assembly-plugin.version>
     <maven-changes-plugin.version>2.12.1</maven-changes-plugin.version>
-    <maven-checkstyle-plugin.version>2.11</maven-checkstyle-plugin.version><!-- later versions do not work on JDK6 -->
+    <maven-checkstyle-plugin.version>2.14</maven-checkstyle-plugin.version>
     <maven-clean-plugin.version>3.0.0</maven-clean-plugin.version>
     <maven-compiler-plugin.version>3.6.1</maven-compiler-plugin.version>
     <maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version>