Move ITs to JDK 8 / JUnit 5

core-it-suite/pom.xml

@@ -88,17 +88,10 @@ under the License.
 
   <dependencies>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter</artifactId>
       <!-- NOTE: Use compile scope for transitivity. -->
     </dependency>
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-all</artifactId>
-      <version>1.3</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
@@ -166,9 +159,10 @@ under the License.
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <includes>
-            <include>**/IntegrationTestSuite.java</include>
+            <include>**/MavenIT*.java</include>
           </includes>
-          <forkMode>never</forkMode>
+          <forkCount>0</forkCount>
+          <reuseForks>true</reuseForks>
           <skip>true</skip>
           <systemProperties>
             <property>
@@ -318,7 +312,8 @@ under the License.
             <artifactId>maven-surefire-plugin</artifactId>
             <configuration>
               <skip>false</skip>
-              <forkMode>once</forkMode>
+              <forkCount>1</forkCount>
+              <reuseForks>true</reuseForks>
               <argLine>${surefireMemory}
                 -Dcom.sun.management.jmxremote=true</argLine>
               <!-- NOTE: Maven plugins have access to the system class path

core-it-suite/src/test/java/org/apache/maven/it/ItUtils.java

@@ -19,6 +19,7 @@
  * under the License.
  */
 
+import org.junit.jupiter.api.Test;
 import java.io.File;
 import java.io.FileInputStream;
 import java.security.DigestInputStream;

core-it-suite/src/test/java/org/apache/maven/it/MavenIT0008SimplePluginTest.java

@@ -19,10 +19,12 @@
  * under the License.
  */
 
-import org.apache.maven.it.util.ResourceExtractor;
-
 import java.io.File;
 
+import org.apache.maven.shared.verifier.Verifier;
+import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.junit.jupiter.api.Test;
+
 public class MavenIT0008SimplePluginTest
     extends AbstractMavenIntegrationTestCase
 {
@@ -40,6 +42,7 @@ public MavenIT0008SimplePluginTest()
      *
      * @throws Exception in case of failure
      */
+    @Test
     public void testit0008()
         throws Exception
     {

core-it-suite/src/test/java/org/apache/maven/it/MavenIT0009GoalConfigurationTest.java

@@ -19,10 +19,12 @@
  * under the License.
  */
 
-import org.apache.maven.it.util.ResourceExtractor;
-
 import java.io.File;
 
+import org.apache.maven.shared.verifier.Verifier;
+import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.junit.jupiter.api.Test;
+
 public class MavenIT0009GoalConfigurationTest
     extends AbstractMavenIntegrationTestCase
 {
@@ -38,6 +40,7 @@ public MavenIT0009GoalConfigurationTest()
      *
      * @throws Exception in case of failure
      */
+    @Test
     public void testit0009()
         throws Exception
     {

core-it-suite/src/test/java/org/apache/maven/it/MavenIT0010DependencyClosureResolutionTest.java

@@ -19,11 +19,13 @@
  * under the License.
  */
 
-import org.apache.maven.it.util.ResourceExtractor;
-
 import java.io.File;
 import java.util.List;
 
+import org.apache.maven.shared.verifier.Verifier;
+import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.junit.jupiter.api.Test;
+
 public class MavenIT0010DependencyClosureResolutionTest
     extends AbstractMavenIntegrationTestCase
 {
@@ -39,6 +41,7 @@ public MavenIT0010DependencyClosureResolutionTest()
      *
      * @throws Exception in case of failure
      */
+    @Test
     public void testit0010()
         throws Exception
     {

core-it-suite/src/test/java/org/apache/maven/it/MavenIT0011DefaultVersionByDependencyManagementTest.java

@@ -19,11 +19,13 @@
  * under the License.
  */
 
-import org.apache.maven.it.util.ResourceExtractor;
-
 import java.io.File;
 import java.util.List;
 
+import org.apache.maven.shared.verifier.Verifier;
+import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.junit.jupiter.api.Test;
+
 public class MavenIT0011DefaultVersionByDependencyManagementTest
     extends AbstractMavenIntegrationTestCase
 {
@@ -37,6 +39,7 @@ public MavenIT0011DefaultVersionByDependencyManagementTest()
      *
      * @throws Exception in case of failure
      */
+    @Test
     public void testit0011()
         throws Exception
     {

core-it-suite/src/test/java/org/apache/maven/it/MavenIT0012PomInterpolationTest.java

@@ -19,10 +19,12 @@
  * under the License.
  */
 
-import org.apache.maven.it.util.ResourceExtractor;
-
 import java.io.File;
 
+import org.apache.maven.shared.verifier.Verifier;
+import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.junit.jupiter.api.Test;
+
 public class MavenIT0012PomInterpolationTest
     extends AbstractMavenIntegrationTestCase
 {
@@ -36,6 +38,7 @@ public MavenIT0012PomInterpolationTest()
      *
      * @throws Exception in case of failure
      */
+    @Test
     public void testit0012()
         throws Exception
     {

core-it-suite/src/test/java/org/apache/maven/it/MavenIT0018DependencyManagementTest.java

@@ -19,10 +19,12 @@
  * under the License.
  */
 
-import org.apache.maven.it.util.ResourceExtractor;
-
 import java.io.File;
 
+import org.apache.maven.shared.verifier.Verifier;
+import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.junit.jupiter.api.Test;
+
 public class MavenIT0018DependencyManagementTest
     extends AbstractMavenIntegrationTestCase
 {
@@ -38,6 +40,7 @@ public MavenIT0018DependencyManagementTest()
      *
      * @throws Exception in case of failure
      */
+    @Test
     public void testit0018()
         throws Exception
     {

core-it-suite/src/test/java/org/apache/maven/it/MavenIT0019PluginVersionMgmtBySuperPomTest.java

@@ -19,10 +19,12 @@
  * under the License.
  */
 
-import org.apache.maven.it.util.ResourceExtractor;
-
 import java.io.File;
 
+import org.apache.maven.shared.verifier.Verifier;
+import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.junit.jupiter.api.Test;
+
 public class MavenIT0019PluginVersionMgmtBySuperPomTest
     extends AbstractMavenIntegrationTestCase
 {
@@ -36,6 +38,7 @@ public MavenIT0019PluginVersionMgmtBySuperPomTest()
      *
      * @throws Exception in case of failure
      */
+    @Test
     public void testit0019()
         throws Exception
     {

core-it-suite/src/test/java/org/apache/maven/it/MavenIT0021PomProfileTest.java

@@ -19,10 +19,12 @@
  * under the License.
  */
 
-import org.apache.maven.it.util.ResourceExtractor;
-
 import java.io.File;
 
+import org.apache.maven.shared.verifier.Verifier;
+import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.junit.jupiter.api.Test;
+
 public class MavenIT0021PomProfileTest
     extends AbstractMavenIntegrationTestCase
 {
@@ -37,6 +39,7 @@ public MavenIT0021PomProfileTest()
      *
      * @throws Exception in case of failure
      */
+    @Test
     public void testit0021()
         throws Exception
     {

core-it-suite/src/test/java/org/apache/maven/it/MavenIT0023SettingsProfileTest.java

@@ -19,10 +19,12 @@
  * under the License.
  */
 
-import org.apache.maven.it.util.ResourceExtractor;
-
 import java.io.File;
 
+import org.apache.maven.shared.verifier.Verifier;
+import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.junit.jupiter.api.Test;
+
 public class MavenIT0023SettingsProfileTest
     extends AbstractMavenIntegrationTestCase
 {
@@ -37,6 +39,7 @@ public MavenIT0023SettingsProfileTest()
      *
      * @throws Exception in case of failure
      */
+    @Test
     public void testit0023()
         throws Exception
     {

core-it-suite/src/test/java/org/apache/maven/it/MavenIT0024MultipleGoalExecutionsTest.java

@@ -19,10 +19,12 @@
  * under the License.
  */
 
-import org.apache.maven.it.util.ResourceExtractor;
-
 import java.io.File;
 
+import org.apache.maven.shared.verifier.Verifier;
+import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.junit.jupiter.api.Test;
+
 /**
  * This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-172">MNG-172</a>.
  *
@@ -43,6 +45,7 @@ public MavenIT0024MultipleGoalExecutionsTest()
      *
      * @throws Exception in case of failure
      */
+    @Test
     public void testit0024()
         throws Exception
     {

core-it-suite/src/test/java/org/apache/maven/it/MavenIT0025MultipleExecutionLevelConfigsTest.java

@@ -19,10 +19,12 @@
  * under the License.
  */
 
-import org.apache.maven.it.util.ResourceExtractor;
-
 import java.io.File;
 
+import org.apache.maven.shared.verifier.Verifier;
+import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.junit.jupiter.api.Test;
+
 /**
  * This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-172">MNG-172</a>.
  *
@@ -42,6 +44,7 @@ public MavenIT0025MultipleExecutionLevelConfigsTest()
      *
      * @throws Exception in case of failure
      */
+    @Test
     public void testit0025()
         throws Exception
     {

core-it-suite/src/test/java/org/apache/maven/it/MavenIT0030DepPomDepMgmtInheritanceTest.java

@@ -19,10 +19,12 @@
  * under the License.
  */
 
-import org.apache.maven.it.util.ResourceExtractor;
-
 import java.io.File;
 
+import org.apache.maven.shared.verifier.Verifier;
+import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.junit.jupiter.api.Test;
+
 public class MavenIT0030DepPomDepMgmtInheritanceTest
     extends AbstractMavenIntegrationTestCase
 {
@@ -37,6 +39,7 @@ public MavenIT0030DepPomDepMgmtInheritanceTest()
      *
      * @throws Exception in case of failure
      */
+    @Test
     public void testit0030()
         throws Exception
     {

core-it-suite/src/test/java/org/apache/maven/it/MavenIT0032MavenPrerequisiteTest.java

@@ -19,10 +19,12 @@
  * under the License.
  */
 
-import org.apache.maven.it.util.ResourceExtractor;
-
 import java.io.File;
 
+import org.apache.maven.shared.verifier.Verifier;
+import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.junit.jupiter.api.Test;
+
 public class MavenIT0032MavenPrerequisiteTest
     extends AbstractMavenIntegrationTestCase
 {
@@ -36,6 +38,7 @@ public MavenIT0032MavenPrerequisiteTest()
      *
      * @throws Exception in case of failure
      */
+    @Test
     public void testit0032()
         throws Exception
     {

core-it-suite/src/test/java/org/apache/maven/it/MavenIT0037AlternatePomFileSameDirTest.java

@@ -19,10 +19,12 @@
  * under the License.
  */
 
-import org.apache.maven.it.util.ResourceExtractor;
-
 import java.io.File;
 
+import org.apache.maven.shared.verifier.Verifier;
+import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.junit.jupiter.api.Test;
+
 /**
  * This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-607">MNG-607</a>.
  *
@@ -42,6 +44,7 @@ public MavenIT0037AlternatePomFileSameDirTest()
      *
      * @throws Exception in case of failure
      */
+    @Test
     public void testit0037()
         throws Exception
     {

core-it-suite/src/test/java/org/apache/maven/it/MavenIT0038AlternatePomFileDifferentDirTest.java

@@ -19,10 +19,12 @@
  * under the License.
  */
 
-import org.apache.maven.it.util.ResourceExtractor;
-
 import java.io.File;
 
+import org.apache.maven.shared.verifier.Verifier;
+import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.junit.jupiter.api.Test;
+
 /**
  * This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-607">MNG-607</a>.
  *
@@ -42,6 +44,7 @@ public MavenIT0038AlternatePomFileDifferentDirTest()
      *
      * @throws Exception in case of failure
      */
+    @Test
     public void testit0038()
         throws Exception
     {