[MNG-8403] Collapse IT utils and helpers (#1949)

Changes:
* move all into same package
* stop direct use of ResourceExtractor, redirect all ITs to superclass method
* drop unneeded ResourceExtractor, it never "extracts" anything
* un-fork ITs where applicable (ie. due new CLI param or so that was not supported before)

---

https://issues.apache.org/jira/browse/MNG-8403

Author: cstamas

its/core-it-suite/pom.xml

@@ -517,6 +517,7 @@ under the License.
           <skip>true</skip>
           <promoteUserPropertiesToSystemProperties>false</promoteUserPropertiesToSystemProperties>
           <systemPropertyVariables>
+            <maven.test.tmpdir>${project.build.testOutputDirectory}</maven.test.tmpdir>
             <maven.version>${maven.version}</maven.version>
             <maven.home>${preparedMavenHome}</maven.home>
             <!-- TODO: This is for now legacy as Verifier is confused otherwise -->

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

@@ -20,7 +20,6 @@
 
 import java.io.File;
 
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
 import org.junit.jupiter.api.Test;
 
 public class MavenIT0008SimplePluginTest extends AbstractMavenIntegrationTestCase {
@@ -39,7 +38,7 @@ public MavenIT0008SimplePluginTest() {
      */
     @Test
     public void testit0008() throws Exception {
-        File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/it0008");
+        File testDir = extractResources("/it0008");
         Verifier verifier = newVerifier(testDir.getAbsolutePath());
         verifier.setAutoclean(false);
         verifier.deleteDirectory("target");

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

@@ -20,7 +20,6 @@
 
 import java.io.File;
 
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
 import org.junit.jupiter.api.Test;
 
 public class MavenIT0009GoalConfigurationTest extends AbstractMavenIntegrationTestCase {
@@ -40,7 +39,7 @@ public void testit0009() throws Exception {
 
         boolean supportSpaceInXml = matchesVersionRange("[3.1.0,)");
 
-        File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/it0009");
+        File testDir = extractResources("/it0009");
         Verifier verifier = newVerifier(testDir.getAbsolutePath());
         verifier.setAutoclean(false);
         verifier.deleteDirectory("target");

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

@@ -21,7 +21,6 @@
 import java.io.File;
 import java.util.List;
 
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -40,7 +39,7 @@ public MavenIT0010DependencyClosureResolutionTest() {
      */
     @Test
     public void testit0010() throws Exception {
-        File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/it0010");
+        File testDir = extractResources("/it0010");
 
         Verifier verifier = newVerifier(testDir.getAbsolutePath());
         verifier.setAutoclean(false);

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

@@ -21,7 +21,6 @@
 import java.io.File;
 import java.util.List;
 
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -38,7 +37,7 @@ public MavenIT0011DefaultVersionByDependencyManagementTest() {
      */
     @Test
     public void testit0011() throws Exception {
-        File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/it0011");
+        File testDir = extractResources("/it0011");
         Verifier verifier = newVerifier(testDir.getAbsolutePath());
         verifier.setAutoclean(false);
         verifier.deleteDirectory("target");

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

@@ -20,7 +20,6 @@
 
 import java.io.File;
 
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
 import org.junit.jupiter.api.Test;
 
 public class MavenIT0012PomInterpolationTest extends AbstractMavenIntegrationTestCase {
@@ -35,7 +34,7 @@ public MavenIT0012PomInterpolationTest() {
      */
     @Test
     public void testit0012() throws Exception {
-        File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/it0012");
+        File testDir = extractResources("/it0012");
         Verifier verifier = newVerifier(testDir.getAbsolutePath());
         verifier.setAutoclean(false);
         verifier.deleteDirectory("target");

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

@@ -20,7 +20,6 @@
 
 import java.io.File;
 
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
 import org.junit.jupiter.api.Test;
 
 public class MavenIT0018DependencyManagementTest extends AbstractMavenIntegrationTestCase {
@@ -37,7 +36,7 @@ public MavenIT0018DependencyManagementTest() {
      */
     @Test
     public void testit0018() throws Exception {
-        File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/it0018");
+        File testDir = extractResources("/it0018");
         Verifier verifier = newVerifier(testDir.getAbsolutePath());
         verifier.setAutoclean(false);
         verifier.deleteArtifacts("org.apache.maven.its.it0018");

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

@@ -20,7 +20,6 @@
 
 import java.io.File;
 
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
 import org.junit.jupiter.api.Test;
 
 public class MavenIT0019PluginVersionMgmtBySuperPomTest extends AbstractMavenIntegrationTestCase {
@@ -35,7 +34,7 @@ public MavenIT0019PluginVersionMgmtBySuperPomTest() {
      */
     @Test
     public void testit0019() throws Exception {
-        File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/it0019");
+        File testDir = extractResources("/it0019");
         Verifier verifier = newVerifier(testDir.getAbsolutePath());
         verifier.setAutoclean(false);
         verifier.deleteDirectory("target");

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

@@ -20,7 +20,6 @@
 
 import java.io.File;
 
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
 import org.junit.jupiter.api.Test;
 
 public class MavenIT0021PomProfileTest extends AbstractMavenIntegrationTestCase {
@@ -36,7 +35,7 @@ public MavenIT0021PomProfileTest() {
      */
     @Test
     public void testit0021() throws Exception {
-        File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/it0021");
+        File testDir = extractResources("/it0021");
 
         Verifier verifier = newVerifier(testDir.getAbsolutePath());
         verifier.setAutoclean(false);

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

@@ -20,7 +20,6 @@
 
 import java.io.File;
 
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
 import org.junit.jupiter.api.Test;
 
 public class MavenIT0023SettingsProfileTest extends AbstractMavenIntegrationTestCase {
@@ -36,7 +35,7 @@ public MavenIT0023SettingsProfileTest() {
      */
     @Test
     public void testit0023() throws Exception {
-        File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/it0023");
+        File testDir = extractResources("/it0023");
 
         Verifier verifier = newVerifier(testDir.getAbsolutePath());
         verifier.setAutoclean(false);