Cleanup test used only with Maven 4.x

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

@@ -20,7 +20,6 @@
 
 import java.io.File;
 
-import org.apache.maven.shared.verifier.VerificationException;
 import org.apache.maven.shared.verifier.Verifier;
 import org.apache.maven.shared.verifier.util.ResourceExtractor;
 import org.junit.jupiter.api.Test;
@@ -34,11 +33,11 @@ public class MavenITmng3991ValidDependencyScopeTest extends AbstractMavenIntegra
 
     public MavenITmng3991ValidDependencyScopeTest() {
         // TODO: One day, we should be able to error out but this requires to consider extensions and their use cases
-        super("[4.0,)");
+        super(ALL_MAVEN_VERSIONS);
     }
 
     /**
-     * Test that invalid dependency scopes cause a validation error during building.
+     * Test that invalid dependency scopes cause a validation warning during building.
      *
      * @throws Exception in case of failure
      */
@@ -49,13 +48,10 @@ public void testit() throws Exception {
         Verifier verifier = newVerifier(testDir.getAbsolutePath());
         verifier.setAutoclean(false);
         verifier.deleteDirectory("target");
-        try {
-            verifier.addCliArgument("validate");
-            verifier.execute();
-            verifier.verifyErrorFreeLog();
-            fail("Invalid dependency scope did not cause validation error");
-        } catch (VerificationException e) {
-            // expected
-        }
+        verifier.addCliArgument("validate");
+        verifier.execute();
+        verifier.verifyErrorFreeLog();
+        verifier.verifyTextInLog(
+                "[WARNING] 'dependencies.dependency.scope' for org.apache.maven.its.mng3991:a:jar must be one of");
     }
 }

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

@@ -32,7 +32,7 @@
 public class MavenITmng4262MakeLikeReactorDottedPath370Test extends AbstractMavenIntegrationTestCase {
 
     public MavenITmng4262MakeLikeReactorDottedPath370Test() {
-        super("[4.0.0-alpha-1,)");
+        super(ALL_MAVEN_VERSIONS);
     }
 
     private void clean(Verifier verifier) throws Exception {
@@ -47,6 +47,7 @@ private void clean(Verifier verifier) throws Exception {
      */
     @Test
     public void testitMakeRoot() throws Exception {
+        requiresMavenVersion("[4.0.0,)");
         File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-4262");
 
         Verifier verifier = newVerifier(new File(testDir, "parent").getAbsolutePath());