WIP

apache · Jan 8, 2025 · 6cffd9a · 6cffd9a
1 parent 80b0414
commit 6cffd9a
Show file tree

Hide file tree

Showing 129 changed files with 245 additions and 206 deletions.
diff --git a/...uite/src/test/java/org/apache/maven/it/MavenITmng0870ReactorAwarePluginDiscoveryTest.java b/...uite/src/test/java/org/apache/maven/it/MavenITmng0870ReactorAwarePluginDiscoveryTest.java
@@ -47,7 +47,7 @@ public void testitMNG0870() throws Exception {
         Verifier verifier = newVerifier(testDir.getAbsolutePath());
         verifier.setAutoclean(false);
         verifier.deleteDirectory("project/target");
-        verifier.deleteArtifacts("org.apache.maven.its.mng0870");
+        verifier.deleteArtifacts("org.apache.maven.its.mng0870", "maven-core-it");
         verifier.filterFile("settings-template.xml", "settings.xml");
         verifier.addCliArgument("--settings");
         verifier.addCliArgument("settings.xml");

diff --git a/...core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0947OptionalDependencyTest.java b/...core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0947OptionalDependencyTest.java
@@ -52,7 +52,7 @@ public void testit() throws Exception {
         Verifier verifier = newVerifier(testDir.getAbsolutePath());
         verifier.setAutoclean(false);
         verifier.deleteDirectory("target");
-        verifier.deleteArtifacts("org.apache.maven.its.mng0947");
+        verifier.deleteArtifacts("org.apache.maven.its.mng0947", "maven-core-it");
         verifier.filterFile("settings-template.xml", "settings.xml");
         verifier.addCliArgument("--settings");
         verifier.addCliArgument("settings.xml");

diff --git a/...ava/org/apache/maven/it/MavenITmng0956ComponentInjectionViaProjectLevelPluginDepTest.java b/...ava/org/apache/maven/it/MavenITmng0956ComponentInjectionViaProjectLevelPluginDepTest.java
@@ -47,7 +47,7 @@ public void testitMNG0956() throws Exception {
         Verifier verifier = newVerifier(testDir.getAbsolutePath());
         verifier.setAutoclean(false);
         verifier.deleteDirectory("target");
-        verifier.deleteArtifacts("org.apache.maven.its.mng0956");
+        verifier.deleteArtifacts("org.apache.maven.its.mng0956", "maven-core-it");
         verifier.filterFile("settings-template.xml", "settings.xml");
         verifier.addCliArgument("--settings");
         verifier.addCliArgument("settings.xml");

diff --git a/...suite/src/test/java/org/apache/maven/it/MavenITmng1021EqualAttachmentBuildNumberTest.java b/...suite/src/test/java/org/apache/maven/it/MavenITmng1021EqualAttachmentBuildNumberTest.java
@@ -47,14 +47,14 @@ public void testitMNG1021() throws Exception {
         Verifier verifier = newVerifier(testDir.getAbsolutePath());
         verifier.setAutoclean(false);
         verifier.deleteDirectory("repo");
-        verifier.deleteArtifacts("org.apache.maven.its.mng1021");
+        verifier.deleteArtifacts("org.apache.maven.its.mng1021", null);
         verifier.addCliArgument("-Dmaven.consumer.pom=false");
         verifier.addCliArgument("initialize");
         verifier.execute();
         verifier.verifyErrorFreeLog();
 
-        verifier.verifyArtifactPresent("org.apache.maven.its.mng1021", "test", "1-SNAPSHOT", "pom");
-        verifier.verifyArtifactPresent("org.apache.maven.its.mng1021", "test", "1-SNAPSHOT", "jar");
+        verifier.verifyArtifactPresent("org.apache.maven.its.mng1021", "test", "1-SNAPSHOT", "pom", null);
+        verifier.verifyArtifactPresent("org.apache.maven.its.mng1021", "test", "1-SNAPSHOT", "jar", null);
 
         String dir = "repo/org/apache/maven/its/mng1021/test/";
         String snapshot = getSnapshotVersion(new File(testDir, dir + "1-SNAPSHOT"));

diff --git a/...it-suite/src/test/java/org/apache/maven/it/MavenITmng1088ReactorPluginResolutionTest.java b/...it-suite/src/test/java/org/apache/maven/it/MavenITmng1088ReactorPluginResolutionTest.java
@@ -50,7 +50,7 @@ public void testitMNG1088() throws Exception {
         Verifier verifier = newVerifier(testDir.getAbsolutePath());
         verifier.setAutoclean(false);
         verifier.deleteDirectory("client/target");
-        verifier.deleteArtifacts("org.apache.maven.its.mng1088");
+        verifier.deleteArtifacts("org.apache.maven.its.mng1088", "maven-core-it");
         verifier.filterFile("settings-template.xml", "settings.xml");
         verifier.addCliArgument("--settings");
         verifier.addCliArgument("settings.xml");

diff --git a/...t-suite/src/test/java/org/apache/maven/it/MavenITmng1142VersionRangeIntersectionTest.java b/...t-suite/src/test/java/org/apache/maven/it/MavenITmng1142VersionRangeIntersectionTest.java
@@ -65,7 +65,7 @@ private void testit(String project) throws Exception {
         Verifier verifier = newVerifier(new File(testDir, project).getAbsolutePath());
         verifier.setAutoclean(false);
         verifier.deleteDirectory("target");
-        verifier.deleteArtifacts("org.apache.maven.its.mng1142");
+        verifier.deleteArtifacts("org.apache.maven.its.mng1142", "maven-core-it");
         verifier.addCliArgument("-s");
         verifier.addCliArgument("settings.xml");
         verifier.filterFile("../settings-template.xml", "settings.xml");

diff --git a/...it-suite/src/test/java/org/apache/maven/it/MavenITmng1233WarDepWithProvidedScopeTest.java b/...it-suite/src/test/java/org/apache/maven/it/MavenITmng1233WarDepWithProvidedScopeTest.java
@@ -49,7 +49,7 @@ public void testitMNG1233() throws Exception {
         Verifier verifier = newVerifier(testDir.getAbsolutePath());
         verifier.setAutoclean(false);
         verifier.deleteDirectory("target");
-        verifier.deleteArtifacts("org.apache.maven.its.it0083");
+        verifier.deleteArtifacts("org.apache.maven.its.it0083", "maven-core-it");
         verifier.filterFile("settings-template.xml", "settings.xml");
         verifier.addCliArgument("--settings");
         verifier.addCliArgument("settings.xml");

diff --git a/...core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1323AntrunDependenciesTest.java b/...core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1323AntrunDependenciesTest.java
@@ -54,7 +54,7 @@ public void testitMNG1323() throws Exception {
         verifier.deleteDirectory("a/target");
         verifier.deleteDirectory("b/target");
         verifier.deleteDirectory("c/target");
-        verifier.deleteArtifacts("org.apache.maven.its.mng1323");
+        verifier.deleteArtifacts("org.apache.maven.its.mng1323", "maven-core-it");
         verifier.filterFile("settings-template.xml", "settings.xml");
         verifier.addCliArgument("--settings");
         verifier.addCliArgument("settings.xml");

diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1412DependenciesOrderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1412DependenciesOrderTest.java
@@ -45,7 +45,7 @@ public void testitMNG1412() throws Exception {
         Verifier verifier = newVerifier(testDir.getAbsolutePath());
         verifier.setAutoclean(false);
         verifier.deleteDirectory("target");
-        verifier.deleteArtifacts("org.apache.maven.its.mng1412");
+        verifier.deleteArtifacts("org.apache.maven.its.mng1412", "maven-core-it");
         verifier.filterFile("settings-template.xml", "settings.xml");
         verifier.addCliArgument("--settings");
         verifier.addCliArgument("settings.xml");

diff --git a/...t-suite/src/test/java/org/apache/maven/it/MavenITmng1703PluginMgmtDepInheritanceTest.java b/...t-suite/src/test/java/org/apache/maven/it/MavenITmng1703PluginMgmtDepInheritanceTest.java
@@ -54,7 +54,7 @@ public void testitMNG1703() throws Exception {
         verifier.addCliArgument("--settings");
         verifier.addCliArgument("settings.xml");
         verifier.deleteDirectory("target");
-        verifier.deleteArtifacts("org.apache.maven.its.mng1703");
+        verifier.deleteArtifacts("org.apache.maven.its.mng1703", "maven-core-it");
         verifier.addCliArgument("validate");
         verifier.execute();
         verifier.verifyErrorFreeLog();

diff --git a/...test/java/org/apache/maven/it/MavenITmng1751ForcedMetadataUpdateDuringDeploymentTest.java b/...test/java/org/apache/maven/it/MavenITmng1751ForcedMetadataUpdateDuringDeploymentTest.java
@@ -59,15 +59,15 @@ public void testit() throws Exception {
         // phase 1: deploy a new snapshot, this should update the metadata despite its future timestamp
         Verifier verifier = newVerifier(new File(testDir, "dep").getAbsolutePath());
         verifier.setAutoclean(false);
-        verifier.deleteArtifacts("org.apache.maven.its.mng1751");
+        verifier.deleteArtifacts("org.apache.maven.its.mng1751", "maven-core-it");
         verifier.addCliArgument("validate");
         verifier.execute();
         verifier.verifyErrorFreeLog();
 
         // phase 2: resolve snapshot, if the previous deployment didn't update the metadata, we get the wrong file
         verifier = newVerifier(new File(testDir, "test").getAbsolutePath());
         verifier.setAutoclean(false);
-        verifier.deleteArtifacts("org.apache.maven.its.mng1751");
+        verifier.deleteArtifacts("org.apache.maven.its.mng1751", "maven-core-it");
         verifier.filterFile("settings-template.xml", "settings.xml");
         verifier.addCliArgument("--settings");
         verifier.addCliArgument("settings.xml");

diff --git a/...it-suite/src/test/java/org/apache/maven/it/MavenITmng1895ScopeConflictResolutionTest.java b/...it-suite/src/test/java/org/apache/maven/it/MavenITmng1895ScopeConflictResolutionTest.java
@@ -50,7 +50,7 @@ public void testitDirectVsIndirect() throws Exception {
 
         Verifier verifier = newVerifier(testDir.getAbsolutePath());
         verifier.setAutoclean(false);
-        verifier.deleteArtifacts("org.apache.maven.its.mng1895");
+        verifier.deleteArtifacts("org.apache.maven.its.mng1895", "maven-core-it");
         verifier.deleteDirectory("target");
         verifier.addCliArgument("-s");
         verifier.addCliArgument("settings.xml");
@@ -217,7 +217,7 @@ private Verifier run(String scopeB, String scopeA) throws Exception {
 
         Verifier verifier = newVerifier(testDir.getAbsolutePath());
         verifier.setAutoclean(false);
-        verifier.deleteArtifacts("org.apache.maven.its.mng1895");
+        verifier.deleteArtifacts("org.apache.maven.its.mng1895", "maven-core-it");
         verifier.deleteDirectory("target");
         verifier.addCliArgument("-s");
         verifier.addCliArgument("settings.xml");

diff --git a/...c/test/java/org/apache/maven/it/MavenITmng2045testJarDependenciesBrokenInReactorTest.java b/...c/test/java/org/apache/maven/it/MavenITmng2045testJarDependenciesBrokenInReactorTest.java
@@ -48,7 +48,7 @@ public void testitMNG2045() throws Exception {
         Verifier verifier = newVerifier(testDir.getAbsolutePath());
         verifier.setAutoclean(false);
         verifier.deleteDirectory("test-user/target");
-        verifier.deleteArtifacts("org.apache.maven.its.mng2045");
+        verifier.deleteArtifacts("org.apache.maven.its.mng2045", null);
         verifier.addCliArgument("validate");
         verifier.execute();
         verifier.verifyErrorFreeLog();

diff --git a/...-it-suite/src/test/java/org/apache/maven/it/MavenITmng2068ReactorRelativeParentsTest.java b/...-it-suite/src/test/java/org/apache/maven/it/MavenITmng2068ReactorRelativeParentsTest.java
@@ -50,7 +50,7 @@ public void testitInheritedIdFields() throws Exception {
 
         Verifier verifier = newVerifier(projectDir.getAbsolutePath());
         verifier.setAutoclean(false);
-        verifier.deleteArtifacts("org.apache.maven.its.mng2068");
+        verifier.deleteArtifacts("org.apache.maven.its.mng2068", null);
         verifier.addCliArgument("validate");
         verifier.execute();
         verifier.verifyErrorFreeLog();
@@ -68,7 +68,7 @@ public void testitExplicitIdFields() throws Exception {
 
         Verifier verifier = newVerifier(projectDir.getAbsolutePath());
         verifier.setAutoclean(false);
-        verifier.deleteArtifacts("org.apache.maven.its.mng2068");
+        verifier.deleteArtifacts("org.apache.maven.its.mng2068", null);
         verifier.addCliArgument("validate");
         verifier.execute();
         verifier.verifyErrorFreeLog();
@@ -86,7 +86,7 @@ public void testitComplex() throws Exception {
 
         Verifier verifier = newVerifier(projectDir.getAbsolutePath());
         verifier.setAutoclean(false);
-        verifier.deleteArtifacts("org.apache.maven.its.mng2068");
+        verifier.deleteArtifacts("org.apache.maven.its.mng2068", null);
         verifier.addCliArgument("validate");
         verifier.execute();
         verifier.verifyErrorFreeLog();

diff --git a/...c/test/java/org/apache/maven/it/MavenITmng2098VersionRangeSatisfiedFromWrongRepoTest.java b/...c/test/java/org/apache/maven/it/MavenITmng2098VersionRangeSatisfiedFromWrongRepoTest.java
@@ -47,14 +47,16 @@ public void testit() throws Exception {
 
         Verifier verifier = newVerifier(testDir.getAbsolutePath());
         verifier.setAutoclean(false);
-        verifier.deleteArtifacts("org.apache.maven.its.mng2098");
+        verifier.deleteArtifacts("org.apache.maven.its.mng2098", "maven-core-it-1");
+        verifier.deleteArtifacts("org.apache.maven.its.mng2098", "maven-core-it-2");
+        verifier.deleteArtifacts("org.apache.maven.its.mng2098", "maven-core-it-3");
         verifier.addCliArgument("-s");
         verifier.addCliArgument("settings.xml");
         verifier.filterFile("settings-template.xml", "settings.xml");
         verifier.addCliArgument("validate");
         verifier.execute();
         verifier.verifyErrorFreeLog();
 
-        verifier.verifyArtifactPresent("org.apache.maven.its.mng2098", "dep", "0.1", "jar");
+        verifier.verifyArtifactPresent("org.apache.maven.its.mng2098", "dep", "0.1", "jar", "maven-core-it-1");
     }
 }
diff --git a/...-it-suite/src/test/java/org/apache/maven/it/MavenITmng2123VersionRangeDependencyTest.java b/...-it-suite/src/test/java/org/apache/maven/it/MavenITmng2123VersionRangeDependencyTest.java
@@ -41,7 +41,7 @@ public void testitMNG2123() throws Exception {
         Verifier verifier = newVerifier(testDir.getAbsolutePath());
         verifier.setAutoclean(false);
         verifier.deleteDirectory("target");
-        verifier.deleteArtifacts("org.apache.maven.its.mng2123");
+        verifier.deleteArtifacts("org.apache.maven.its.mng2123", "maven-core-it");
         verifier.filterFile("settings-template.xml", "settings.xml");
         verifier.addCliArgument("--settings");
         verifier.addCliArgument("settings.xml");

diff --git a/...ite/src/test/java/org/apache/maven/it/MavenITmng2130ParentLookupFromReactorCacheTest.java b/...ite/src/test/java/org/apache/maven/it/MavenITmng2130ParentLookupFromReactorCacheTest.java
@@ -42,7 +42,7 @@ public void testitMNG2130() throws Exception {
 
         Verifier verifier = newVerifier(testDir.getAbsolutePath());
         verifier.setAutoclean(false);
-        verifier.deleteArtifacts("org.apache.maven.mng2130");
+        verifier.deleteArtifacts("org.apache.maven.mng2130", null);
         verifier.addCliArgument("validate");
         verifier.execute();
         verifier.verifyErrorFreeLog();

diff --git a/...re-it-suite/src/test/java/org/apache/maven/it/MavenITmng2135PluginBuildInReactorTest.java b/...re-it-suite/src/test/java/org/apache/maven/it/MavenITmng2135PluginBuildInReactorTest.java
@@ -46,7 +46,7 @@ public void testit() throws Exception {
         verifier.setAutoclean(false);
         verifier.deleteDirectory("plugin/target");
         verifier.deleteDirectory("project/target");
-        verifier.deleteArtifacts("org.apache.maven.its.mng2135");
+        verifier.deleteArtifacts("org.apache.maven.its.mng2135", null);
         verifier.addCliArgument("package");
         verifier.execute();
         verifier.verifyErrorFreeLog();

diff --git a/...src/test/java/org/apache/maven/it/MavenITmng2174PluginDepsManagedByParentProfileTest.java b/...src/test/java/org/apache/maven/it/MavenITmng2174PluginDepsManagedByParentProfileTest.java
@@ -51,7 +51,7 @@ public void testitMNG2174() throws Exception {
         Verifier verifier = newVerifier(new File(testDir, "sub").getAbsolutePath());
         verifier.setAutoclean(false);
         verifier.deleteDirectory("target");
-        verifier.deleteArtifacts("org.apache.maven.its.mng2174");
+        verifier.deleteArtifacts("org.apache.maven.its.mng2174", "maven-core-it");
         verifier.filterFile("settings-template.xml", "settings.xml");
         verifier.addCliArgument("--settings");
         verifier.addCliArgument("settings.xml");

diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2196ParentResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2196ParentResolutionTest.java
@@ -44,7 +44,7 @@ public void testitMNG2196() throws Exception {
 
         Verifier verifier = newVerifier(testDir.getAbsolutePath());
         verifier.setAutoclean(false);
-        verifier.deleteArtifacts("org.apache.maven.its.mng2196");
+        verifier.deleteArtifacts("org.apache.maven.its.mng2196", null);
 
         if (matchesVersionRange("(,3.0-alpha-1)")) {
             verifier.addCliArgument("validate");

diff --git a/...src/test/java/org/apache/maven/it/MavenITmng2222OutputDirectoryReactorResolutionTest.java b/...src/test/java/org/apache/maven/it/MavenITmng2222OutputDirectoryReactorResolutionTest.java
@@ -51,7 +51,7 @@ public void testit() throws Exception {
         verifier.setAutoclean(false);
         verifier.deleteDirectory("mod-a/target");
         verifier.deleteDirectory("mod-b/target");
-        verifier.deleteArtifacts("org.apache.maven.its.mng2222");
+        verifier.deleteArtifacts("org.apache.maven.its.mng2222", null);
         verifier.addCliArgument("compile");
         verifier.execute();
         verifier.verifyErrorFreeLog();

diff --git a/...core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2228ComponentInjectionTest.java b/...core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2228ComponentInjectionTest.java
@@ -49,7 +49,7 @@ public void testitMNG2228() throws Exception {
         Verifier verifier = newVerifier(testDir.getAbsolutePath());
         verifier.setAutoclean(false);
         verifier.deleteDirectory("target");
-        verifier.deleteArtifacts("org.apache.maven.its.mng2228");
+        verifier.deleteArtifacts("org.apache.maven.its.mng2228", "maven-core-it");
         verifier.filterFile("settings-template.xml", "settings.xml");
         verifier.addCliArgument("--settings");
         verifier.addCliArgument("settings.xml");

diff --git a/...e/src/test/java/org/apache/maven/it/MavenITmng2277AggregatorAndResolutionPluginsTest.java b/...e/src/test/java/org/apache/maven/it/MavenITmng2277AggregatorAndResolutionPluginsTest.java
@@ -40,7 +40,7 @@ public void testitMNG2277() throws Exception {
 
         Verifier verifier = newVerifier(testDir.getAbsolutePath());
         verifier.setAutoclean(false);
-        verifier.deleteArtifacts("org.apache.maven.its.mng2277");
+        verifier.deleteArtifacts("org.apache.maven.its.mng2277", null);
         verifier.addCliArgument("org.apache.maven.its.plugins:maven-it-plugin-all:aggregator-dependencies");
         verifier.execute();
         verifier.verifyErrorFreeLog();

diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2305MultipleProxiesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2305MultipleProxiesTest.java
@@ -94,7 +94,8 @@ public void testit() throws Exception {
         try {
             verifier.setAutoclean(false);
             verifier.deleteDirectory("target");
-            verifier.deleteArtifacts("org.apache.maven.its.mng2305");
+            verifier.deleteArtifacts("org.apache.maven.its.mng2305", "http");
+            verifier.deleteArtifacts("org.apache.maven.its.mng2305", "https");
             Map<String, String> filterProps = verifier.newDefaultFilterMap();
             filterProps.put("@proxy.http@", Integer.toString(httpPort));
             filterProps.put("@proxy.https@", Integer.toString(proxyPort));

diff --git a/...ore-it-suite/src/test/java/org/apache/maven/it/MavenITmng2362DeployedPomEncodingTest.java b/...ore-it-suite/src/test/java/org/apache/maven/it/MavenITmng2362DeployedPomEncodingTest.java
@@ -51,20 +51,20 @@ public void testit() throws Exception {
         verifier.setAutoclean(false);
         verifier.deleteDirectory("utf-8/target");
         verifier.deleteDirectory("latin-1/target");
-        verifier.deleteArtifacts("org.apache.maven.its.mng2362");
+        verifier.deleteArtifacts("org.apache.maven.its.mng2362", null);
         verifier.addCliArgument("validate");
         verifier.execute();
         verifier.verifyErrorFreeLog();
 
         File pomFile;
 
-        pomFile = new File(verifier.getArtifactPath("org.apache.maven.its.mng2362", "utf-8", "0.1", "pom"));
+        pomFile = new File(verifier.getArtifactPath("org.apache.maven.its.mng2362", "utf-8", "0.1", "pom", null));
         assertPomUtf8(pomFile);
 
         pomFile = new File(testDir, "utf-8/target/repo/org/apache/maven/its/mng2362/utf-8/0.1/utf-8-0.1.pom");
         assertPomUtf8(pomFile);
 
-        pomFile = new File(verifier.getArtifactPath("org.apache.maven.its.mng2362", "latin-1", "0.1", "pom"));
+        pomFile = new File(verifier.getArtifactPath("org.apache.maven.its.mng2362", "latin-1", "0.1", "pom", null));
         assertPomLatin1(pomFile);
 
         pomFile = new File(testDir, "latin-1/target/repo/org/apache/maven/its/mng2362/latin-1/0.1/latin-1-0.1.pom");

diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2387InactiveProxyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2387InactiveProxyTest.java
@@ -116,13 +116,13 @@ public void testit() throws Exception {
         verifier.filterFile("settings-template.xml", "settings.xml", properties);
 
         verifier.setAutoclean(false);
-        verifier.deleteArtifacts("org.apache.maven.its.mng2387");
+        verifier.deleteArtifacts("org.apache.maven.its.mng2387", "maven-core-it");
         verifier.addCliArgument("--settings");
         verifier.addCliArgument("settings.xml");
         verifier.addCliArgument("validate");
         verifier.execute();
         verifier.verifyErrorFreeLog();
 
-        verifier.verifyArtifactPresent("org.apache.maven.its.mng2387", "a", "0.1", "jar");
+        verifier.verifyArtifactPresent("org.apache.maven.its.mng2387", "a", "0.1", "jar", "maven-core-it");
     }
 }
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2432PluginPrefixOrderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2432PluginPrefixOrderTest.java
@@ -47,8 +47,8 @@ public void testitMNG2432() throws Exception {
         Verifier verifier = newVerifier(testDir.getAbsolutePath());
         verifier.setAutoclean(false);
         verifier.deleteDirectory("target");
-        verifier.deleteArtifacts("org.apache.maven.its.mng2432.pom");
-        verifier.deleteArtifacts("org.apache.maven.its.mng2432.settings");
+        verifier.deleteArtifacts("org.apache.maven.its.mng2432.pom", "maven-core-it");
+        verifier.deleteArtifacts("org.apache.maven.its.mng2432.settings", "maven-core-it");
         verifier.filterFile("settings-template.xml", "settings.xml");
         verifier.addCliArgument("--settings");
         verifier.addCliArgument("settings.xml");

diff --git a/...java/org/apache/maven/it/MavenITmng2486TimestampedDependencyVersionInterpolationTest.java b/...java/org/apache/maven/it/MavenITmng2486TimestampedDependencyVersionInterpolationTest.java
@@ -52,7 +52,7 @@ public void testit() throws Exception {
         verifier = newVerifier(new File(testDir, "dep-a").getAbsolutePath());
         verifier.setAutoclean(false);
         verifier.deleteDirectory("target");
-        verifier.deleteArtifacts("org.apache.maven.its.mng2486");
+        verifier.deleteArtifacts("org.apache.maven.its.mng2486", null);
         verifier.addCliArgument("validate");
         verifier.execute();
         verifier.verifyErrorFreeLog();
@@ -75,7 +75,8 @@ public void testit() throws Exception {
         verifier.setAutoclean(false);
         verifier.deleteDirectory("target");
         // enforce remote resolution
-        verifier.deleteArtifacts("org.apache.maven.its.mng2486");
+        verifier.deleteArtifacts("org.apache.maven.its.mng2486", null);
+        verifier.deleteArtifacts("org.apache.maven.its.mng2486", "maven-core-it");
         verifier.filterFile("settings-template.xml", "settings.xml");
         verifier.addCliArgument("--settings");
         verifier.addCliArgument("settings.xml");

diff --git a/.../src/test/java/org/apache/maven/it/MavenITmng2668UsePluginDependenciesForSortingTest.java b/.../src/test/java/org/apache/maven/it/MavenITmng2668UsePluginDependenciesForSortingTest.java
@@ -39,12 +39,12 @@ public void testitMNG2668() throws Exception {
 
         Verifier verifier = newVerifier(testDir.getAbsolutePath());
         verifier.setAutoclean(false);
-        verifier.deleteArtifacts("org.apache.maven.its.mng2668");
+        verifier.deleteArtifacts("org.apache.maven.its.mng2668", null);
         verifier.addCliArgument("validate");
         verifier.execute();
         verifier.verifyErrorFreeLog();
 
-        verifier.verifyArtifactPresent("org.apache.maven.its.mng2668", "project", "1.0-SNAPSHOT", "jar");
-        verifier.verifyArtifactPresent("org.apache.maven.its.mng2668", "tools", "1.0-SNAPSHOT", "jar");
+        verifier.verifyArtifactPresent("org.apache.maven.its.mng2668", "project", "1.0-SNAPSHOT", "jar", null);
+        verifier.verifyArtifactPresent("org.apache.maven.its.mng2668", "tools", "1.0-SNAPSHOT", "jar", null);
     }
 }