From 6cffd9a71fb88f5445f0d05048d8de16a9130d7a Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Wed, 8 Jan 2025 12:45:33 +0100 Subject: [PATCH] WIP --- ...ng0870ReactorAwarePluginDiscoveryTest.java | 2 +- .../MavenITmng0947OptionalDependencyTest.java | 2 +- ...InjectionViaProjectLevelPluginDepTest.java | 2 +- ...mng1021EqualAttachmentBuildNumberTest.java | 6 ++-- ...nITmng1088ReactorPluginResolutionTest.java | 2 +- ...ITmng1142VersionRangeIntersectionTest.java | 2 +- ...nITmng1233WarDepWithProvidedScopeTest.java | 2 +- .../MavenITmng1323AntrunDependenciesTest.java | 2 +- .../MavenITmng1412DependenciesOrderTest.java | 2 +- ...ITmng1703PluginMgmtDepInheritanceTest.java | 2 +- ...cedMetadataUpdateDuringDeploymentTest.java | 4 +-- ...nITmng1895ScopeConflictResolutionTest.java | 4 +-- ...estJarDependenciesBrokenInReactorTest.java | 2 +- ...enITmng2068ReactorRelativeParentsTest.java | 6 ++-- ...ersionRangeSatisfiedFromWrongRepoTest.java | 6 ++-- ...enITmng2123VersionRangeDependencyTest.java | 2 +- ...g2130ParentLookupFromReactorCacheTest.java | 2 +- ...avenITmng2135PluginBuildInReactorTest.java | 2 +- ...4PluginDepsManagedByParentProfileTest.java | 2 +- .../MavenITmng2196ParentResolutionTest.java | 2 +- ...2OutputDirectoryReactorResolutionTest.java | 2 +- .../MavenITmng2228ComponentInjectionTest.java | 2 +- ...277AggregatorAndResolutionPluginsTest.java | 2 +- .../it/MavenITmng2305MultipleProxiesTest.java | 3 +- ...MavenITmng2362DeployedPomEncodingTest.java | 6 ++-- .../it/MavenITmng2387InactiveProxyTest.java | 4 +-- .../MavenITmng2432PluginPrefixOrderTest.java | 4 +-- ...pedDependencyVersionInterpolationTest.java | 5 +-- ...68UsePluginDependenciesForSortingTest.java | 6 ++-- ...enITmng2695OfflinePluginSnapshotsTest.java | 2 +- ...mng2749ExtensionAvailableToPluginTest.java | 2 +- ...MavenITmng2790LastUpdatedMetadataTest.java | 2 +- .../it/MavenITmng2820PomCommentsTest.java | 4 +-- ...avenITmng2861RelocationsAndRangesTest.java | 2 +- .../it/MavenITmng2865MirrorWildcardTest.java | 14 ++++---- ...ITmng2972OverridePluginDependencyTest.java | 6 ++-- ...nITmng2994SnapshotRangeRepositoryTest.java | 2 +- .../it/MavenITmng3012CoreClassImportTest.java | 4 +-- ...ng3023ReactorDependencyResolutionTest.java | 6 ++-- ...ng3043BestEffortReactorResolutionTest.java | 6 ++-- .../MavenITmng3052DepRepoAggregationTest.java | 9 +++-- ...SnapshotsExcludedFromVersionRangeTest.java | 2 +- ...Tmng3099SettingsProfilesWithNoPomTest.java | 2 +- ...seCachedMetadataOfBlacklistedRepoTest.java | 2 +- ...venITmng3217InterPluginDependencyTest.java | 2 +- .../it/MavenITmng3220ImportScopeTest.java | 4 +-- .../MavenITmng3284UsingCachedPluginsTest.java | 2 +- .../MavenITmng3314OfflineSnapshotsTest.java | 2 +- ...Tmng3372DirectInvocationOfPluginsTest.java | 2 +- ...Tmng3379ParallelArtifactDownloadsTest.java | 8 ++--- ...Tmng3380ManagedRelocatedTransdepsTest.java | 2 +- ...ecksumVerificationOfDependencyPomTest.java | 2 +- ...7DependencyResolutionErrorMessageTest.java | 2 +- ...mng3482DependencyPomInterpolationTest.java | 2 +- .../it/MavenITmng3498ForkToOtherMojoTest.java | 2 +- ...ITmng4199CompileMeetsRuntimeScopeTest.java | 2 +- ...4203TransitiveDependencyExclusionTest.java | 6 ++-- .../it/MavenITmng4207PluginWithLog4JTest.java | 2 +- ...Tmng4214MirroredParentSearchReposTest.java | 4 +-- ...eSystemPathInterpolatedWithEnvVarTest.java | 2 +- ...Tmng4413MirroringOfDependencyRepoTest.java | 5 +-- .../MavenITmng4428FollowHttpRedirectTest.java | 2 +- ...Tmng4433ForceParentSnapshotUpdateTest.java | 2 +- ...0StubModelForMissingDependencyPomTest.java | 2 +- ...esolutionOfSnapshotWithClassifierTest.java | 5 +-- ...4PlatformIndependentFileSeparatorTest.java | 2 +- ...ginPrefixFromLocalCacheOfDownRepoTest.java | 3 +- ...Tmng4482ForcePluginSnapshotUpdateTest.java | 2 +- ...88ValidateExternalParenPomLenientTest.java | 2 +- ...ITmng4489MirroringOfExtensionRepoTest.java | 7 ++-- ...avenITmng4498IgnoreBrokenMetadataTest.java | 3 +- ...500NoUpdateOfTimestampedSnapshotsTest.java | 2 +- ...ailUponMissingDependencyParentPomTest.java | 2 +- ...mng4526MavenProjectArtifactsScopeTest.java | 2 +- ...oreArtifactFilterConsidersGroupIdTest.java | 2 +- ...Tmng4554PluginPrefixMappingUpdateTest.java | 6 ++-- ...g4555MetaversionResolutionOfflineTest.java | 2 +- ...venITmng4561MirroringOfPluginRepoTest.java | 7 ++-- ...solutionFromVersionlessPluginMgmtTest.java | 2 +- ...tedPomUsesSystemAndUserPropertiesTest.java | 2 +- ...0DependencyOptionalFlagManagementTest.java | 2 +- ...654ArtifactHandlerForMainArtifactTest.java | 2 +- ...avenITmng4660OutdatedPackagedArtifact.java | 2 +- .../it/MavenITmng4660ResumeFromTest.java | 4 +-- .../it/MavenITmng4666CoreRealmImportTest.java | 36 +++++++++---------- ...enITmng4679SnapshotUpdateInPluginTest.java | 5 +-- ...0InterdependentConflictResolutionTest.java | 2 +- ...96MavenProjectDependencyArtifactsTest.java | 2 +- ...ependencyManagementExclusionMergeTest.java | 4 +-- ...ITmng4721OptionalPluginDependencyTest.java | 2 +- ...rrorProxyAuthUsedByProjectBuilderTest.java | 3 +- ...MavenITmng4745PluginVersionUpdateTest.java | 6 ++-- ...edMavenProjectDependencyArtifactsTest.java | 2 +- ...etchRemoteMetadataForVersionRangeTest.java | 3 +- ...768NearestMatchConflictResolutionTest.java | 2 +- ...DepsWithVersionRangeFromLocalRepoTest.java | 2 +- ...ransitiveResolutionInForkedThreadTest.java | 2 +- ...4789ScopeInheritanceMeetsConflictTest.java | 2 +- ...tBuilderResolvesRemotePomArtifactTest.java | 2 +- ...mng4800NearestWinsVsScopeWideningTest.java | 2 +- ...lutionOfDependenciesDuringReactorTest.java | 2 +- ...enITmng4829ChecksumFailureWarningTest.java | 2 +- ...entProjectResolvedFromRemoteReposTest.java | 2 +- .../MavenITmng4840MavenPrerequisiteTest.java | 4 +-- ...42ParentResolutionOfDependencyPomTest.java | 8 ++--- ...rResolutionAttachedWithExclusionsTest.java | 2 +- ...Tmng4874UpdateLatestPluginVersionTest.java | 2 +- ...lUponOverconstrainedVersionRangesTest.java | 2 +- ...ITmng4891RobustSnapshotResolutionTest.java | 2 +- ...PluginDepWithNonRelocatedMavenApiTest.java | 2 +- ...erPropertyVsDependencyPomPropertyTest.java | 2 +- ...ontainerLookupRealmDuringMojoExecTest.java | 2 +- ...Tmng4952MetadataReleaseInfoUpdateTest.java | 2 +- ...55LocalVsRemoteSnapshotResolutionTest.java | 3 +- ...mng4963ParentResolutionFromMirrorTest.java | 2 +- ...ExtensionVisibleToPluginInReactorTest.java | 2 +- ...87TimestampBasedSnapshotSelectionTest.java | 5 ++- .../it/MavenITmng4991NonProxyHostsTest.java | 2 +- ...onRangeDependencyParentResolutionTest.java | 3 +- ...sedCompLookupFromChildPluginRealmTest.java | 2 +- ...nITmng5064SuppressSnapshotUpdatesTest.java | 2 +- ...AtDependencyWithImpliedClassifierTest.java | 2 +- ...gatorDepResolutionModuleExtensionTest.java | 2 +- ...137ReactorResolutionInForkedBuildTest.java | 2 +- .../it/MavenITmng5214DontMapWsdlToJar.java | 2 +- ...SettingsProfilesRepositoriesOrderTest.java | 10 ++++-- .../MavenITmng5338FileOptionToDirectory.java | 2 +- .../maven/it/MavenITmng5382Jsr330Plugin.java | 2 +- .../maven/it/MavenITmng6656BuildConsumer.java | 24 +++++++++---- 129 files changed, 245 insertions(+), 206 deletions(-) diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0870ReactorAwarePluginDiscoveryTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0870ReactorAwarePluginDiscoveryTest.java index d1887193cfc5..601c6098fb95 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0870ReactorAwarePluginDiscoveryTest.java +++ b/its/core-it-suite/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/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0947OptionalDependencyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0947OptionalDependencyTest.java index 8e7b055d1cf4..d228930421c4 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0947OptionalDependencyTest.java +++ b/its/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/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0956ComponentInjectionViaProjectLevelPluginDepTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0956ComponentInjectionViaProjectLevelPluginDepTest.java index de0788d5705a..cd895d03fd18 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0956ComponentInjectionViaProjectLevelPluginDepTest.java +++ b/its/core-it-suite/src/test/java/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/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1021EqualAttachmentBuildNumberTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1021EqualAttachmentBuildNumberTest.java index a2e23dd9d0c7..4748f3ce2cd4 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1021EqualAttachmentBuildNumberTest.java +++ b/its/core-it-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/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1088ReactorPluginResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1088ReactorPluginResolutionTest.java index 13ac1a72cfef..d687bd567f27 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1088ReactorPluginResolutionTest.java +++ b/its/core-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/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1142VersionRangeIntersectionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1142VersionRangeIntersectionTest.java index 0c0cfed6692c..929e7cab784c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1142VersionRangeIntersectionTest.java +++ b/its/core-it-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/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1233WarDepWithProvidedScopeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1233WarDepWithProvidedScopeTest.java index 9145c8cd3249..79e81cb1bd59 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1233WarDepWithProvidedScopeTest.java +++ b/its/core-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/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1323AntrunDependenciesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1323AntrunDependenciesTest.java index 09023e3230d0..8e6cd336f9b9 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1323AntrunDependenciesTest.java +++ b/its/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 index 8bce9d200da5..53fc57f3af1c 100644 --- 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/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1703PluginMgmtDepInheritanceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1703PluginMgmtDepInheritanceTest.java index ca06f5f170de..b535a3609658 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1703PluginMgmtDepInheritanceTest.java +++ b/its/core-it-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/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1751ForcedMetadataUpdateDuringDeploymentTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1751ForcedMetadataUpdateDuringDeploymentTest.java index 06382a6e139b..6a5282953b80 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1751ForcedMetadataUpdateDuringDeploymentTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1751ForcedMetadataUpdateDuringDeploymentTest.java @@ -59,7 +59,7 @@ 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(); @@ -67,7 +67,7 @@ public void testit() throws Exception { // 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/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1895ScopeConflictResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1895ScopeConflictResolutionTest.java index 8161a202a104..975e5faf8dae 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1895ScopeConflictResolutionTest.java +++ b/its/core-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/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2045testJarDependenciesBrokenInReactorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2045testJarDependenciesBrokenInReactorTest.java index f042b1f2192e..e57087fe57cd 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2045testJarDependenciesBrokenInReactorTest.java +++ b/its/core-it-suite/src/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/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2068ReactorRelativeParentsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2068ReactorRelativeParentsTest.java index 70ed4451bc3a..08f40417edf1 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2068ReactorRelativeParentsTest.java +++ b/its/core-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/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2098VersionRangeSatisfiedFromWrongRepoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2098VersionRangeSatisfiedFromWrongRepoTest.java index cbba15250c0a..898a74e4b193 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2098VersionRangeSatisfiedFromWrongRepoTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2098VersionRangeSatisfiedFromWrongRepoTest.java @@ -47,7 +47,9 @@ 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"); @@ -55,6 +57,6 @@ public void testit() throws Exception { 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/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2123VersionRangeDependencyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2123VersionRangeDependencyTest.java index 0da91517b807..63f46c63fb4b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2123VersionRangeDependencyTest.java +++ b/its/core-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/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2130ParentLookupFromReactorCacheTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2130ParentLookupFromReactorCacheTest.java index 3f826513f048..9c63063fcebf 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2130ParentLookupFromReactorCacheTest.java +++ b/its/core-it-suite/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/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2135PluginBuildInReactorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2135PluginBuildInReactorTest.java index 07b6ce046490..0c82b91ce224 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2135PluginBuildInReactorTest.java +++ b/its/core-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/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2174PluginDepsManagedByParentProfileTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2174PluginDepsManagedByParentProfileTest.java index dcec55f706ea..29397008da62 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2174PluginDepsManagedByParentProfileTest.java +++ b/its/core-it-suite/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 index c7b3f1ddc7f3..1cf94c148b35 100644 --- 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/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2222OutputDirectoryReactorResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2222OutputDirectoryReactorResolutionTest.java index de4013f25a00..bfddd79aabf9 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2222OutputDirectoryReactorResolutionTest.java +++ b/its/core-it-suite/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/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2228ComponentInjectionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2228ComponentInjectionTest.java index 38ce63d3c13e..53e1cedee4b0 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2228ComponentInjectionTest.java +++ b/its/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/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2277AggregatorAndResolutionPluginsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2277AggregatorAndResolutionPluginsTest.java index 826b5e7153b9..ec770bd393cd 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2277AggregatorAndResolutionPluginsTest.java +++ b/its/core-it-suite/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 index adc45a1bcd4b..90ed2cfb5f8a 100644 --- 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 filterProps = verifier.newDefaultFilterMap(); filterProps.put("@proxy.http@", Integer.toString(httpPort)); filterProps.put("@proxy.https@", Integer.toString(proxyPort)); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2362DeployedPomEncodingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2362DeployedPomEncodingTest.java index 6b611aa86147..e5ee0f017498 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2362DeployedPomEncodingTest.java +++ b/its/core-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 index 046dc1131432..88bd5323265c 100644 --- 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 index 85a0c0e45034..516ef6927783 100644 --- 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/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2486TimestampedDependencyVersionInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2486TimestampedDependencyVersionInterpolationTest.java index 9c24471ff0a5..17104ed7b43d 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2486TimestampedDependencyVersionInterpolationTest.java +++ b/its/core-it-suite/src/test/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/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2668UsePluginDependenciesForSortingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2668UsePluginDependenciesForSortingTest.java index d39cdc49560a..2275def2557d 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2668UsePluginDependenciesForSortingTest.java +++ b/its/core-it-suite/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); } } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2695OfflinePluginSnapshotsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2695OfflinePluginSnapshotsTest.java index 41068fcc6790..fa809ed6d379 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2695OfflinePluginSnapshotsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2695OfflinePluginSnapshotsTest.java @@ -49,7 +49,7 @@ public void testitMNG2695() throws Exception { // phase 1: run build in online mode to fill local repo Verifier verifier = newVerifier(testDir.getAbsolutePath()); verifier.deleteDirectory("target"); - verifier.deleteArtifacts("org.apache.maven.its.mng2695"); + verifier.deleteArtifacts("org.apache.maven.its.mng2695", "maven-core-it"); verifier.setAutoclean(false); verifier.setLogFileName("log1.txt"); verifier.filterFile("settings-template.xml", "settings.xml"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2749ExtensionAvailableToPluginTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2749ExtensionAvailableToPluginTest.java index 306815b2fdc1..c41ac0298c96 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2749ExtensionAvailableToPluginTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2749ExtensionAvailableToPluginTest.java @@ -49,7 +49,7 @@ public void testitMNG2749() throws Exception { Verifier verifier = newVerifier(testDir.getAbsolutePath()); verifier.setAutoclean(false); verifier.deleteDirectory("target"); - verifier.deleteArtifacts("org.apache.maven.its.mng2749"); + verifier.deleteArtifacts("org.apache.maven.its.mng2749", "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/MavenITmng2790LastUpdatedMetadataTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2790LastUpdatedMetadataTest.java index d4b09345a6f7..71d00c74dc21 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2790LastUpdatedMetadataTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2790LastUpdatedMetadataTest.java @@ -55,7 +55,7 @@ public void testitMNG2790() throws Exception { * Phase 1: Install initial snapshot into local repo. */ Verifier verifier = newVerifier(testDir.getAbsolutePath()); - verifier.deleteArtifacts("org.apache.maven.its.mng2790"); + verifier.deleteArtifacts("org.apache.maven.its.mng2790", null); verifier.setAutoclean(false); verifier.addCliArgument("validate"); verifier.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2820PomCommentsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2820PomCommentsTest.java index 91db4f5e2cc6..ed29370a4ce2 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2820PomCommentsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2820PomCommentsTest.java @@ -48,12 +48,12 @@ public void testit() throws Exception { Verifier verifier = newVerifier(testDir.getAbsolutePath()); verifier.setAutoclean(false); verifier.deleteDirectory("target"); - verifier.deleteArtifacts("org.apache.maven.its.mng2820"); + verifier.deleteArtifacts("org.apache.maven.its.mng2820", null); verifier.addCliArgument("validate"); verifier.execute(); verifier.verifyErrorFreeLog(); - File installed = new File(verifier.getArtifactPath("org.apache.maven.its.mng2820", "test", "0.1", "pom")); + File installed = new File(verifier.getArtifactPath("org.apache.maven.its.mng2820", "test", "0.1", "pom", null)); assertPomComments(installed); File deployed = new File(testDir, "target/repo/org/apache/maven/its/mng2820/test/0.1/test-0.1.pom"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2861RelocationsAndRangesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2861RelocationsAndRangesTest.java index 7fa14eae8839..0b252bcdaf47 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2861RelocationsAndRangesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2861RelocationsAndRangesTest.java @@ -43,7 +43,7 @@ public void testitMNG2861() throws Exception { Verifier verifier = newVerifier(testDir.getAbsolutePath()); verifier.setAutoclean(false); verifier.deleteDirectory("A/target"); - verifier.deleteArtifacts("org.apache.maven.its.mng2861"); + verifier.deleteArtifacts("org.apache.maven.its.mng2861", "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/MavenITmng2865MirrorWildcardTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2865MirrorWildcardTest.java index 24c75f3c33c7..fa97c31f1f07 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2865MirrorWildcardTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2865MirrorWildcardTest.java @@ -41,7 +41,7 @@ public MavenITmng2865MirrorWildcardTest() { */ @Test public void testitFileRepo() throws Exception { - testit("file"); + testit("file", "test-mirror"); } /** @@ -51,7 +51,7 @@ public void testitFileRepo() throws Exception { */ @Test public void testitLocalhostRepo() throws Exception { - testit("localhost"); + testit("localhost", "test-mirror"); } /** @@ -61,7 +61,7 @@ public void testitLocalhostRepo() throws Exception { */ @Test public void testitExternalRepo() throws Exception { - testit("external"); + testit("external", "test-mirror"); } /** @@ -71,15 +71,15 @@ public void testitExternalRepo() throws Exception { */ @Test public void testitCentralRepo() throws Exception { - testit("central"); + testit("central", "central"); } - private void testit(String project) throws Exception { + private void testit(String project, String expectedRepoId) throws Exception { File testDir = extractResources("/mng-2865"); Verifier verifier = newVerifier(new File(testDir, project).getAbsolutePath()); verifier.setAutoclean(false); - verifier.deleteArtifacts("org.apache.maven.its.mng2865"); + verifier.deleteArtifacts("org.apache.maven.its.mng2865", expectedRepoId); verifier.filterFile("settings-template.xml", "settings.xml"); verifier.addCliArgument("--settings"); verifier.addCliArgument("settings.xml"); @@ -87,6 +87,6 @@ private void testit(String project) throws Exception { verifier.execute(); verifier.verifyErrorFreeLog(); - verifier.verifyArtifactPresent("org.apache.maven.its.mng2865", "a", "0.1", "jar"); + verifier.verifyArtifactPresent("org.apache.maven.its.mng2865", "a", "0.1", "jar", expectedRepoId); } } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2972OverridePluginDependencyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2972OverridePluginDependencyTest.java index 70bad20dea81..712dfb980ee4 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2972OverridePluginDependencyTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2972OverridePluginDependencyTest.java @@ -50,7 +50,8 @@ public void testitLifecycleInvocation() throws Exception { Verifier verifier = newVerifier(testDir.getAbsolutePath()); verifier.setAutoclean(false); verifier.deleteDirectory("target"); - verifier.deleteArtifact("org.apache.maven.its.plugins.class-loader", "dep-b", "0.2-mng-2972", "jar"); + verifier.deleteArtifact( + "org.apache.maven.its.plugins.class-loader", "dep-b", "0.2-mng-2972", "jar", "maven-core-it"); verifier.filterFile("settings-template.xml", "settings.xml"); verifier.addCliArgument("--settings"); verifier.addCliArgument("settings.xml"); @@ -80,7 +81,8 @@ public void testitCommandLineInvocation() throws Exception { Verifier verifier = newVerifier(testDir.getAbsolutePath()); verifier.setAutoclean(false); verifier.deleteDirectory("target"); - verifier.deleteArtifact("org.apache.maven.its.plugins.class-loader", "dep-b", "9.9-MNG-2972", "jar"); + verifier.deleteArtifact( + "org.apache.maven.its.plugins.class-loader", "dep-b", "9.9-MNG-2972", "jar", "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/MavenITmng2994SnapshotRangeRepositoryTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2994SnapshotRangeRepositoryTest.java index e29c00fffeb8..793ba5fd99f3 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2994SnapshotRangeRepositoryTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2994SnapshotRangeRepositoryTest.java @@ -43,7 +43,7 @@ public MavenITmng2994SnapshotRangeRepositoryTest() { public void testit() throws Exception { File testDir = extractResources("/mng-2994"); Verifier verifier = newVerifier(testDir.getAbsolutePath()); - verifier.deleteArtifacts("org.apache.maven.its.mng2994"); + verifier.deleteArtifacts("org.apache.maven.its.mng2994", "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/MavenITmng3012CoreClassImportTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3012CoreClassImportTest.java index 50b7ee4fb4f9..4096781fcdbd 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3012CoreClassImportTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3012CoreClassImportTest.java @@ -48,8 +48,8 @@ public void testitMNG3012() throws Exception { Verifier verifier = newVerifier(testDir.getAbsolutePath()); verifier.setAutoclean(false); verifier.deleteDirectory("target"); - verifier.deleteArtifact("org.codehaus.plexus", "plexus-utils", "0.1-mng3012", "jar"); - verifier.deleteArtifact("org.codehaus.plexus", "plexus-utils", "0.1-mng3012", "pom"); + verifier.deleteArtifact("org.codehaus.plexus", "plexus-utils", "0.1-mng3012", "jar", "maven-core-it"); + verifier.deleteArtifact("org.codehaus.plexus", "plexus-utils", "0.1-mng3012", "pom", "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/MavenITmng3023ReactorDependencyResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3023ReactorDependencyResolutionTest.java index 6dc0dcb9ddff..36dc9d560d4e 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3023ReactorDependencyResolutionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3023ReactorDependencyResolutionTest.java @@ -60,7 +60,7 @@ public void testitMNG3023A() throws Exception { verifier.setLogFileName("log-a.txt"); verifier.deleteDirectory("dependency/dependency-classes"); - verifier.deleteArtifacts("org.apache.maven.its.mng3023"); + verifier.deleteArtifacts("org.apache.maven.its.mng3023", null); verifier.addCliArgument("validate"); VerificationException exception = assertThrows( @@ -89,7 +89,7 @@ public void testitMNG3023B() throws Exception { // The IT doesn't actually run the compiler but merely mimics its effect, i.e. the creation of the output dir new File(testDir, "dependency/dependency-classes").mkdirs(); verifier.deleteDirectory("consumer/target"); - verifier.deleteArtifacts("org.apache.maven.its.mng3023"); + verifier.deleteArtifacts("org.apache.maven.its.mng3023", null); verifier.addCliArgument("initialize"); verifier.execute(); @@ -121,7 +121,7 @@ public void testitMNG3023C() throws Exception { Verifier verifier = newVerifier(testDir.getAbsolutePath()); verifier.setAutoclean(false); - verifier.deleteArtifacts("org.apache.maven.its.mng3023"); + verifier.deleteArtifacts("org.apache.maven.its.mng3023", null); verifier.deleteDirectory("consumer/target"); verifier.setLogFileName("log-c-1.txt"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3043BestEffortReactorResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3043BestEffortReactorResolutionTest.java index 9530312e9b1a..ff86c4ecf9d6 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3043BestEffortReactorResolutionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3043BestEffortReactorResolutionTest.java @@ -56,7 +56,7 @@ public void testitTestPhase() throws Exception { verifier.deleteDirectory("consumer-a/target"); verifier.deleteDirectory("consumer-b/target"); verifier.deleteDirectory("consumer-c/target"); - verifier.deleteArtifacts("org.apache.maven.its.mng3043"); + verifier.deleteArtifacts("org.apache.maven.its.mng3043", null); verifier.setLogFileName("log-test.txt"); verifier.addCliArgument("test"); verifier.execute(); @@ -112,7 +112,7 @@ public void testitPackagePhase() throws Exception { verifier.deleteDirectory("consumer-a/target"); verifier.deleteDirectory("consumer-b/target"); verifier.deleteDirectory("consumer-c/target"); - verifier.deleteArtifacts("org.apache.maven.its.mng3043"); + verifier.deleteArtifacts("org.apache.maven.its.mng3043", null); verifier.setLogFileName("log-package.txt"); verifier.addCliArgument("package"); verifier.execute(); @@ -172,7 +172,7 @@ public void testitPackagePhasesSlitted() throws Exception { verifier.deleteDirectory("consumer-a/target"); verifier.deleteDirectory("consumer-b/target"); verifier.deleteDirectory("consumer-c/target"); - verifier.deleteArtifacts("org.apache.maven.its.mng3043"); + verifier.deleteArtifacts("org.apache.maven.its.mng3043", null); verifier.setLogFileName("log-package-pre.txt"); verifier.addCliArguments("--also-make", "--projects", ":dependency", "package"); verifier.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3052DepRepoAggregationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3052DepRepoAggregationTest.java index 46e834a0fa89..d5a05102163e 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3052DepRepoAggregationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3052DepRepoAggregationTest.java @@ -49,7 +49,8 @@ public void testitMNG3052() throws Exception { Verifier verifier = newVerifier(testDir.getAbsolutePath()); verifier.setAutoclean(false); verifier.deleteDirectory("target"); - verifier.deleteArtifacts("org.apache.maven.its.mng3052"); + verifier.deleteArtifacts("org.apache.maven.its.mng3052", "maven-core-it-repo-d"); + verifier.deleteArtifacts("org.apache.maven.its.mng3052", "maven-core-it-repo-t"); verifier.filterFile("settings-template.xml", "settings.xml"); verifier.filterFile( "repo-d/org/apache/maven/its/mng3052/direct/0.1-SNAPSHOT/template.pom", @@ -60,7 +61,9 @@ public void testitMNG3052() throws Exception { verifier.execute(); verifier.verifyErrorFreeLog(); - verifier.verifyArtifactPresent("org.apache.maven.its.mng3052", "direct", "0.1-SNAPSHOT", "jar"); - verifier.verifyArtifactPresent("org.apache.maven.its.mng3052", "trans", "0.1-SNAPSHOT", "jar"); + verifier.verifyArtifactPresent( + "org.apache.maven.its.mng3052", "direct", "0.1-SNAPSHOT", "jar", "maven-core-it-repo-d"); + verifier.verifyArtifactPresent( + "org.apache.maven.its.mng3052", "trans", "0.1-SNAPSHOT", "jar", "maven-core-it-repo-t"); } } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3092SnapshotsExcludedFromVersionRangeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3092SnapshotsExcludedFromVersionRangeTest.java index 5754ea1aec23..b730d058047e 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3092SnapshotsExcludedFromVersionRangeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3092SnapshotsExcludedFromVersionRangeTest.java @@ -51,7 +51,7 @@ public void testit() throws Exception { Verifier verifier = newVerifier(testDir.getAbsolutePath()); verifier.setAutoclean(false); verifier.deleteDirectory("target"); - verifier.deleteArtifacts("org.apache.maven.its.mng3092"); + verifier.deleteArtifacts("org.apache.maven.its.mng3092", "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/MavenITmng3099SettingsProfilesWithNoPomTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3099SettingsProfilesWithNoPomTest.java index 9b0597cadb43..35b7b85ae762 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3099SettingsProfilesWithNoPomTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3099SettingsProfilesWithNoPomTest.java @@ -47,7 +47,7 @@ public void testit() throws Exception { Verifier verifier = newVerifier(testDir.getAbsolutePath()); verifier.setAutoclean(false); verifier.deleteDirectory("target"); - verifier.deleteArtifacts("org.apache.maven.its.mng3099"); + verifier.deleteArtifacts("org.apache.maven.its.mng3099", "maven-core-it"); verifier.filterFile("settings-template.xml", "settings.xml"); verifier.addCliArgument("-s"); verifier.addCliArgument("settings.xml"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3139UseCachedMetadataOfBlacklistedRepoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3139UseCachedMetadataOfBlacklistedRepoTest.java index cf166936fe3f..c4aee3ec0df3 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3139UseCachedMetadataOfBlacklistedRepoTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3139UseCachedMetadataOfBlacklistedRepoTest.java @@ -48,7 +48,7 @@ public void testitMNG3139() throws Exception { Verifier verifier = newVerifier(testDir.getAbsolutePath()); verifier.setAutoclean(false); - verifier.deleteArtifacts("org.apache.maven.its.mng3139"); + verifier.deleteArtifacts("org.apache.maven.its.mng3139", "maven-core-it"); verifier.filterFile("settings-template.xml", "settings.xml"); verifier.setLogFileName("log1.txt"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3217InterPluginDependencyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3217InterPluginDependencyTest.java index 0cfcfbe18a73..eec795fd66dd 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3217InterPluginDependencyTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3217InterPluginDependencyTest.java @@ -48,7 +48,7 @@ public void testitMNG3217() throws Exception { verifier.setAutoclean(false); verifier.deleteDirectory("sub-1/target"); verifier.deleteDirectory("sub-2/target"); - verifier.deleteArtifacts("org.apache.maven.its.mng3217"); + verifier.deleteArtifacts("org.apache.maven.its.mng3217", "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/MavenITmng3220ImportScopeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3220ImportScopeTest.java index 77c2b89a0d28..dca6302c60de 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3220ImportScopeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3220ImportScopeTest.java @@ -44,7 +44,7 @@ public void testitMNG3220a() throws Exception { Verifier verifier = newVerifier(testDir.getAbsolutePath()); verifier.setAutoclean(false); verifier.deleteDirectory("target"); - verifier.deleteArtifacts("org.apache.maven.its.mng3220"); + verifier.deleteArtifacts("org.apache.maven.its.mng3220", "maven-core-it"); verifier.filterFile("../settings-template.xml", "settings.xml"); verifier.addCliArgument("--settings"); verifier.addCliArgument("settings.xml"); @@ -62,7 +62,7 @@ public void testitMNG3220b() throws Exception { Verifier verifier = newVerifier(testDir.getAbsolutePath()); verifier.setAutoclean(false); verifier.deleteDirectory("target"); - verifier.deleteArtifacts("org.apache.maven.its.mng3220"); + verifier.deleteArtifacts("org.apache.maven.its.mng3220", "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/MavenITmng3284UsingCachedPluginsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3284UsingCachedPluginsTest.java index 11089669b967..9dbd783bee69 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3284UsingCachedPluginsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3284UsingCachedPluginsTest.java @@ -50,7 +50,7 @@ public void testitMNG3284() throws Exception { */ Verifier verifier = newVerifier(testDir.getAbsolutePath()); verifier.setAutoclean(false); - verifier.deleteArtifacts("org.apache.maven.its.mng3284"); + verifier.deleteArtifacts("org.apache.maven.its.mng3284", "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/MavenITmng3314OfflineSnapshotsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3314OfflineSnapshotsTest.java index 1cf6a5493d05..df916168417f 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3314OfflineSnapshotsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3314OfflineSnapshotsTest.java @@ -48,7 +48,7 @@ public void testitMNG3314() throws Exception { { // phase 1: run build in online mode to fill local repo Verifier verifier = newVerifier(testDir.getAbsolutePath()); - verifier.deleteArtifacts("org.apache.maven.its.mng3314"); + verifier.deleteArtifacts("org.apache.maven.its.mng3314", "maven-core-it"); verifier.setLogFileName("log1.txt"); verifier.filterFile("settings-template.xml", "settings.xml"); verifier.addCliArgument("--settings"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3372DirectInvocationOfPluginsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3372DirectInvocationOfPluginsTest.java index 6fc66bc37a82..59062a9853b8 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3372DirectInvocationOfPluginsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3372DirectInvocationOfPluginsTest.java @@ -44,7 +44,7 @@ public void testitMNG3372() throws Exception { Verifier verifier = newVerifier(plugin.getAbsolutePath()); - verifier.deleteArtifacts("org.apache.maven.its.mng3372"); + verifier.deleteArtifacts("org.apache.maven.its.mng3372", null); verifier.getSystemProperties().setProperty("updateReleaseInfo", "true"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3379ParallelArtifactDownloadsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3379ParallelArtifactDownloadsTest.java index 5589f853edba..07fa1937419a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3379ParallelArtifactDownloadsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3379ParallelArtifactDownloadsTest.java @@ -49,10 +49,10 @@ public void testitMNG3379() throws Exception { Verifier verifier = newVerifier(testDir.getAbsolutePath()); verifier.setAutoclean(false); - verifier.deleteArtifacts("org.apache.maven.its.mng3379.a"); - verifier.deleteArtifacts("org.apache.maven.its.mng3379.b"); - verifier.deleteArtifacts("org.apache.maven.its.mng3379.c"); - verifier.deleteArtifacts("org.apache.maven.its.mng3379.d"); + verifier.deleteArtifacts("org.apache.maven.its.mng3379.a", "maven-core-it"); + verifier.deleteArtifacts("org.apache.maven.its.mng3379.b", "maven-core-it"); + verifier.deleteArtifacts("org.apache.maven.its.mng3379.c", "maven-core-it"); + verifier.deleteArtifacts("org.apache.maven.its.mng3379.d", "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/MavenITmng3380ManagedRelocatedTransdepsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3380ManagedRelocatedTransdepsTest.java index 67269e6b7341..11d7a9a4234d 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3380ManagedRelocatedTransdepsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3380ManagedRelocatedTransdepsTest.java @@ -55,7 +55,7 @@ public void testitMNG3380() throws Exception { Verifier verifier = newVerifier(testDir.getAbsolutePath()); verifier.setAutoclean(false); verifier.deleteDirectory("target"); - verifier.deleteArtifacts("org.apache.maven.its.mng3380"); + verifier.deleteArtifacts("org.apache.maven.its.mng3380", "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/MavenITmng3470StrictChecksumVerificationOfDependencyPomTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3470StrictChecksumVerificationOfDependencyPomTest.java index ae3ed7e96b62..82ab0b4da2d5 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3470StrictChecksumVerificationOfDependencyPomTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3470StrictChecksumVerificationOfDependencyPomTest.java @@ -45,7 +45,7 @@ public void testit() throws Exception { Verifier verifier = newVerifier(testDir.getAbsolutePath()); verifier.setAutoclean(false); verifier.deleteDirectory("target"); - verifier.deleteArtifacts("org.apache.maven.its.mng3470"); + verifier.deleteArtifacts("org.apache.maven.its.mng3470", "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/MavenITmng3477DependencyResolutionErrorMessageTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3477DependencyResolutionErrorMessageTest.java index 8cf4ebbd6f89..5c028e7c0b3c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3477DependencyResolutionErrorMessageTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3477DependencyResolutionErrorMessageTest.java @@ -55,7 +55,7 @@ void testit(int port, String[] logExpectPatterns, String projectFile) throws Exc verifier.filterFile("settings-template.xml", "settings.xml", filterProps); verifier.setAutoclean(false); - verifier.deleteArtifacts("org.apache.maven.its.mng3477"); + verifier.deleteArtifacts("org.apache.maven.its.mng3477", "maven-core-it"); verifier.addCliArgument("-U"); verifier.addCliArguments("--settings", "settings.xml"); verifier.addCliArguments("-f", projectFile); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3482DependencyPomInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3482DependencyPomInterpolationTest.java index 50ccb1cc7ca6..7749a9d973cc 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3482DependencyPomInterpolationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3482DependencyPomInterpolationTest.java @@ -45,7 +45,7 @@ public void testitMNG3482() throws Exception { verifier.setAutoclean(false); verifier.filterFile("settings-template.xml", "settings.xml"); verifier.deleteDirectory("target"); - verifier.deleteArtifacts("org.apache.maven.its.mng3482"); + verifier.deleteArtifacts("org.apache.maven.its.mng3482", "testing-repo"); verifier.addCliArgument("-s"); verifier.addCliArgument("settings.xml"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3498ForkToOtherMojoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3498ForkToOtherMojoTest.java index 3bd3b912a7db..b3d979c5309e 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3498ForkToOtherMojoTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3498ForkToOtherMojoTest.java @@ -46,7 +46,7 @@ public void testitMNG3498() throws Exception { File projectDir = new File(testDir, "mng-3498-project"); Verifier verifier = newVerifier(pluginDir.getAbsolutePath()); - verifier.deleteArtifact("org.apache.maven.its.mng3498", "mavenit-mng3498-plugin", "1", "pom"); + verifier.deleteArtifact("org.apache.maven.its.mng3498", "mavenit-mng3498-plugin", "1", "pom", null); verifier.addCliArgument("install"); verifier.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4199CompileMeetsRuntimeScopeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4199CompileMeetsRuntimeScopeTest.java index 328fa2f72bdd..d4f28c5f1b8d 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4199CompileMeetsRuntimeScopeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4199CompileMeetsRuntimeScopeTest.java @@ -57,7 +57,7 @@ public void testit() throws Exception { Verifier verifier = newVerifier(testDir.getAbsolutePath()); verifier.setAutoclean(false); verifier.deleteDirectory("target"); - verifier.deleteArtifacts("org.apache.maven.its.mng4199"); + verifier.deleteArtifacts("org.apache.maven.its.mng4199", "maven-core-it"); verifier.filterFile("pom-template.xml", "pom.xml"); verifier.filterFile("settings-template.xml", "settings.xml"); verifier.addCliArgument("--settings"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4203TransitiveDependencyExclusionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4203TransitiveDependencyExclusionTest.java index 6048c5073b14..cd2cf6beda8b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4203TransitiveDependencyExclusionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4203TransitiveDependencyExclusionTest.java @@ -50,7 +50,7 @@ public void testit() throws Exception { Verifier verifier = newVerifier(testDir.getAbsolutePath()); verifier.setAutoclean(false); verifier.deleteDirectory("target"); - verifier.deleteArtifacts("org.apache.maven.its.mng4203"); + verifier.deleteArtifacts("org.apache.maven.its.mng4203", "maven-core-it"); verifier.filterFile("settings-template.xml", "settings.xml"); verifier.addCliArgument("-s"); verifier.addCliArgument("settings.xml"); @@ -67,7 +67,7 @@ public void testit() throws Exception { assertEquals(expected, artifacts); - verifier.verifyArtifactNotPresent("org.apache.maven.its.mng4203", "a", "0.1", "pom"); - verifier.verifyArtifactNotPresent("org.apache.maven.its.mng4203", "a", "0.1", "jar"); + verifier.verifyArtifactNotPresent("org.apache.maven.its.mng4203", "a", "0.1", "pom", "maven-core-it"); + verifier.verifyArtifactNotPresent("org.apache.maven.its.mng4203", "a", "0.1", "jar", "maven-core-it"); } } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4207PluginWithLog4JTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4207PluginWithLog4JTest.java index 8a36d684e550..02d3e5fe1433 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4207PluginWithLog4JTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4207PluginWithLog4JTest.java @@ -45,7 +45,7 @@ public void testit() throws Exception { Verifier verifier = newVerifier(testDir.getAbsolutePath()); verifier.setAutoclean(false); - verifier.deleteArtifacts("org.apache.maven.its.mng4207"); + verifier.deleteArtifacts("org.apache.maven.its.mng4207", null); verifier.addCliArgument("-s"); verifier.addCliArgument("settings.xml"); verifier.addCliArgument("initialize"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4214MirroredParentSearchReposTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4214MirroredParentSearchReposTest.java index 92b1be409cdf..e3aa918a92a7 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4214MirroredParentSearchReposTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4214MirroredParentSearchReposTest.java @@ -47,7 +47,7 @@ public void testit() throws Exception { Verifier verifier = newVerifier(testDir.getAbsolutePath()); verifier.setAutoclean(false); verifier.deleteDirectory("target"); - verifier.deleteArtifacts("org.apache.maven.its.mng4214"); + verifier.deleteArtifacts("org.apache.maven.its.mng4214", "maven-mirror"); verifier.filterFile("settings-template.xml", "settings.xml"); verifier.addCliArgument("-s"); verifier.addCliArgument("settings.xml"); @@ -55,6 +55,6 @@ public void testit() throws Exception { verifier.execute(); verifier.verifyErrorFreeLog(); - verifier.verifyArtifactPresent("org.apache.maven.its.mng4214", "parent", "0.1", "pom"); + verifier.verifyArtifactPresent("org.apache.maven.its.mng4214", "parent", "0.1", "pom", "maven-mirror"); } } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4379TransitiveSystemPathInterpolatedWithEnvVarTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4379TransitiveSystemPathInterpolatedWithEnvVarTest.java index aa25d23f3739..525cbd37d303 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4379TransitiveSystemPathInterpolatedWithEnvVarTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4379TransitiveSystemPathInterpolatedWithEnvVarTest.java @@ -49,7 +49,7 @@ public void testit() throws Exception { Verifier verifier = newVerifier(testDir.getAbsolutePath()); verifier.setAutoclean(false); verifier.deleteDirectory("target"); - verifier.deleteArtifacts("org.apache.maven.its.mng4379"); + verifier.deleteArtifacts("org.apache.maven.its.mng4379", "maven-core-it"); verifier.filterFile("settings-template.xml", "settings.xml"); verifier.setEnvironmentVariable("MNG_4379_HOME", testDir.getAbsolutePath()); verifier.addCliArgument("-s"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4413MirroringOfDependencyRepoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4413MirroringOfDependencyRepoTest.java index 029da6dd41c0..5d60b361d626 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4413MirroringOfDependencyRepoTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4413MirroringOfDependencyRepoTest.java @@ -97,7 +97,8 @@ public void testit() throws Exception { Verifier verifier = newVerifier(testDir.getAbsolutePath()); verifier.setAutoclean(false); verifier.deleteDirectory("target"); - verifier.deleteArtifacts("org.apache.maven.its.mng4413"); + verifier.deleteArtifacts("org.apache.maven.its.mng4413", "maven-core-it-repo"); + verifier.deleteArtifacts("org.apache.maven.its.mng4413", "it-mirror"); Map filterProps = verifier.newDefaultFilterMap(); filterProps.put("@port@", Integer.toString(port)); verifier.filterFile("settings-template.xml", "settings.xml", filterProps); @@ -107,7 +108,7 @@ public void testit() throws Exception { verifier.execute(); verifier.verifyErrorFreeLog(); - verifier.verifyArtifactPresent("org.apache.maven.its.mng4413", "a", "0.1", "jar"); + verifier.verifyArtifactPresent("org.apache.maven.its.mng4413", "a", "0.1", "jar", "it-mirror"); } finally { server.stop(); server.join(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4428FollowHttpRedirectTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4428FollowHttpRedirectTest.java index a6416cf4dcc8..afd7903ca713 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4428FollowHttpRedirectTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4428FollowHttpRedirectTest.java @@ -117,7 +117,7 @@ private void testit(boolean fromHttp, boolean toHttp, boolean relativeLocation) fail("Couldn't bind the server socket to a free port!"); } verifier.setAutoclean(false); - verifier.deleteArtifacts("org.apache.maven.its.mng4428"); + verifier.deleteArtifacts("org.apache.maven.its.mng4428", "maven-core-it"); verifier.deleteDirectory("target"); Map filterProps = verifier.newDefaultFilterMap(); filterProps.put("@protocol@", fromHttp ? "http" : "https"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4433ForceParentSnapshotUpdateTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4433ForceParentSnapshotUpdateTest.java index a170e136d5fa..c6ce2dab0151 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4433ForceParentSnapshotUpdateTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4433ForceParentSnapshotUpdateTest.java @@ -45,7 +45,7 @@ public void testit() throws Exception { Verifier verifier = newVerifier(testDir.getAbsolutePath()); verifier.setAutoclean(false); - verifier.deleteArtifacts("org.apache.maven.its.mng4433"); + verifier.deleteArtifacts("org.apache.maven.its.mng4433", "maven-core-it"); verifier.addCliArgument("-s"); verifier.addCliArgument("settings.xml"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4450StubModelForMissingDependencyPomTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4450StubModelForMissingDependencyPomTest.java index 0cffbdf97024..c76ee705752f 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4450StubModelForMissingDependencyPomTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4450StubModelForMissingDependencyPomTest.java @@ -48,7 +48,7 @@ public void testit() throws Exception { Verifier verifier = newVerifier(testDir.getAbsolutePath()); verifier.setAutoclean(false); verifier.deleteDirectory("target"); - verifier.deleteArtifacts("org.apache.maven.its.mng4450"); + verifier.deleteArtifacts("org.apache.maven.its.mng4450", null); verifier.addCliArgument("-s"); verifier.addCliArgument("settings.xml"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4452ResolutionOfSnapshotWithClassifierTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4452ResolutionOfSnapshotWithClassifierTest.java index 76ea4e75e2d1..7f415de421f6 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4452ResolutionOfSnapshotWithClassifierTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4452ResolutionOfSnapshotWithClassifierTest.java @@ -51,7 +51,7 @@ public void testit() throws Exception { Verifier verifier = newVerifier(new File(testDir, "producer").getAbsolutePath()); verifier.setAutoclean(false); verifier.deleteDirectory("target"); - verifier.deleteArtifacts("org.apache.maven.its.mng4452"); + verifier.deleteArtifacts("org.apache.maven.its.mng4452", null); verifier.addCliArgument("-Dmng4452.type=jar"); verifier.addCliArgument("-Dmng4452.classifier=unix"); verifier.setLogFileName("log-1.txt"); @@ -74,7 +74,8 @@ public void testit() throws Exception { verifier = newVerifier(new File(testDir, "consumer").getAbsolutePath()); verifier.setAutoclean(false); verifier.deleteDirectory("target"); - verifier.deleteArtifacts("org.apache.maven.its.mng4452"); + verifier.deleteArtifacts("org.apache.maven.its.mng4452", null); + verifier.deleteArtifacts("org.apache.maven.its.mng4452", "maven-core-it"); verifier.addCliArgument("-s"); verifier.addCliArgument("settings.xml"); verifier.filterFile("settings-template.xml", "settings.xml"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4464PlatformIndependentFileSeparatorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4464PlatformIndependentFileSeparatorTest.java index f26a563563b0..3bae32f4016e 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4464PlatformIndependentFileSeparatorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4464PlatformIndependentFileSeparatorTest.java @@ -49,7 +49,7 @@ public void testit() throws Exception { Verifier verifier = newVerifier(new File(testDir, "aggregator").getAbsolutePath()); verifier.setAutoclean(false); verifier.deleteDirectory("../sub/target"); - verifier.deleteArtifacts("org.apache.maven.its.mng4464"); + verifier.deleteArtifacts("org.apache.maven.its.mng4464", null); verifier.addCliArgument("validate"); verifier.execute(); verifier.verifyErrorFreeLog(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4465PluginPrefixFromLocalCacheOfDownRepoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4465PluginPrefixFromLocalCacheOfDownRepoTest.java index d1ee766d516c..b38f687345c1 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4465PluginPrefixFromLocalCacheOfDownRepoTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4465PluginPrefixFromLocalCacheOfDownRepoTest.java @@ -49,7 +49,8 @@ public void testit() throws Exception { Verifier verifier = newVerifier(testDir.getAbsolutePath()); verifier.setAutoclean(false); verifier.deleteDirectory("target"); - verifier.deleteArtifacts("org.apache.maven.its.mng4465"); + verifier.deleteArtifacts("org.apache.maven.its.mng4465", "central"); + verifier.deleteArtifacts("org.apache.maven.its.mng4465", "mng4465"); verifier.filterFile("settings-template.xml", "settings.xml"); verifier.setLogFileName("log1.txt"); verifier.addCliArgument("-s"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4482ForcePluginSnapshotUpdateTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4482ForcePluginSnapshotUpdateTest.java index 5efe236c9a60..684eb150b920 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4482ForcePluginSnapshotUpdateTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4482ForcePluginSnapshotUpdateTest.java @@ -49,7 +49,7 @@ public void testit() throws Exception { Verifier verifier = newVerifier(testDir.getAbsolutePath()); verifier.setAutoclean(false); - verifier.deleteArtifacts("org.apache.maven.its.mng4482"); + verifier.deleteArtifacts("org.apache.maven.its.mng4482", "maven-core-it"); verifier.addCliArgument("-s"); verifier.addCliArgument("settings.xml"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4488ValidateExternalParenPomLenientTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4488ValidateExternalParenPomLenientTest.java index c214628297cc..b778ad673787 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4488ValidateExternalParenPomLenientTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4488ValidateExternalParenPomLenientTest.java @@ -45,7 +45,7 @@ public void testit() throws Exception { Verifier verifier = newVerifier(testDir.getAbsolutePath()); verifier.setAutoclean(false); verifier.deleteDirectory("target"); - verifier.deleteArtifacts("org.apache.maven.its.mng4488"); + verifier.deleteArtifacts("org.apache.maven.its.mng4488", "maven-core-it"); verifier.filterFile("settings-template.xml", "settings.xml"); verifier.addCliArgument("-s"); verifier.addCliArgument("settings.xml"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4489MirroringOfExtensionRepoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4489MirroringOfExtensionRepoTest.java index 416cab914fd6..77a6653d0573 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4489MirroringOfExtensionRepoTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4489MirroringOfExtensionRepoTest.java @@ -97,7 +97,8 @@ public void testit() throws Exception { Verifier verifier = newVerifier(testDir.getAbsolutePath()); verifier.setAutoclean(false); verifier.deleteDirectory("target"); - verifier.deleteArtifacts("org.apache.maven.its.mng4489"); + verifier.deleteArtifacts("org.apache.maven.its.mng4489", "it-mirror-a"); + verifier.deleteArtifacts("org.apache.maven.its.mng4489", "it-mirror-b"); Map filterProps = verifier.newDefaultFilterMap(); filterProps.put("@port@", Integer.toString(port)); verifier.filterFile("settings-template.xml", "settings.xml", filterProps); @@ -107,8 +108,8 @@ public void testit() throws Exception { verifier.execute(); verifier.verifyErrorFreeLog(); - verifier.verifyArtifactPresent("org.apache.maven.its.mng4489", "ext-dep", "0.1", "jar"); - verifier.verifyArtifactPresent("org.apache.maven.its.mng4489", "ext-dep", "0.1", "pom"); + verifier.verifyArtifactPresent("org.apache.maven.its.mng4489", "ext-dep", "0.1", "jar", "it-mirror-b"); + verifier.verifyArtifactPresent("org.apache.maven.its.mng4489", "ext-dep", "0.1", "pom", "it-mirror-b"); } finally { server.stop(); server.join(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4498IgnoreBrokenMetadataTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4498IgnoreBrokenMetadataTest.java index 337f76f5db6f..3b35a285f01e 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4498IgnoreBrokenMetadataTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4498IgnoreBrokenMetadataTest.java @@ -48,7 +48,8 @@ public void testit() throws Exception { Verifier verifier = newVerifier(testDir.getAbsolutePath()); verifier.setAutoclean(false); verifier.deleteDirectory("target"); - verifier.deleteArtifacts("org.apache.maven.its.mng4498"); + verifier.deleteArtifacts("org.apache.maven.its.mng4498", "maven-core-it-a"); + verifier.deleteArtifacts("org.apache.maven.its.mng4498", "maven-core-it-b"); 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/MavenITmng4500NoUpdateOfTimestampedSnapshotsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4500NoUpdateOfTimestampedSnapshotsTest.java index fabb01124443..ab3b44210e1c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4500NoUpdateOfTimestampedSnapshotsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4500NoUpdateOfTimestampedSnapshotsTest.java @@ -94,7 +94,7 @@ public void handle( System.out.println("Bound server socket to the port " + port); verifier.setAutoclean(false); verifier.deleteDirectory("target"); - verifier.deleteArtifacts("org.apache.maven.its.mng4500"); + verifier.deleteArtifacts("org.apache.maven.its.mng4500", "maven-core-it"); Map filterProps = verifier.newDefaultFilterMap(); filterProps.put("@port@", Integer.toString(port)); verifier.filterFile("settings-template.xml", "settings.xml", filterProps); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4522FailUponMissingDependencyParentPomTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4522FailUponMissingDependencyParentPomTest.java index 74caa371c450..ab77d3ef607b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4522FailUponMissingDependencyParentPomTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4522FailUponMissingDependencyParentPomTest.java @@ -45,7 +45,7 @@ public void testit() throws Exception { Verifier verifier = newVerifier(testDir.getAbsolutePath()); verifier.setAutoclean(false); verifier.deleteDirectory("target"); - verifier.deleteArtifacts("org.apache.maven.its.mng4522"); + verifier.deleteArtifacts("org.apache.maven.its.mng4522", "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/MavenITmng4526MavenProjectArtifactsScopeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4526MavenProjectArtifactsScopeTest.java index d7d736ed17d7..e92fde22883f 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4526MavenProjectArtifactsScopeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4526MavenProjectArtifactsScopeTest.java @@ -50,7 +50,7 @@ public void testit() throws Exception { Verifier verifier = newVerifier(testDir.getAbsolutePath()); verifier.setAutoclean(false); verifier.deleteDirectory("target"); - verifier.deleteArtifacts("org.apache.maven.its.mng4526"); + verifier.deleteArtifacts("org.apache.maven.its.mng4526", "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/MavenITmng4553CoreArtifactFilterConsidersGroupIdTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4553CoreArtifactFilterConsidersGroupIdTest.java index dd76a4004644..a5da2ce86686 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4553CoreArtifactFilterConsidersGroupIdTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4553CoreArtifactFilterConsidersGroupIdTest.java @@ -49,7 +49,7 @@ public void testit() throws Exception { Verifier verifier = newVerifier(testDir.getAbsolutePath()); verifier.setAutoclean(false); verifier.deleteDirectory("target"); - verifier.deleteArtifacts("org.apache.maven.its.mng4553"); + verifier.deleteArtifacts("org.apache.maven.its.mng4553", "maven-core-it"); verifier.filterFile("settings-template.xml", "settings.xml"); verifier.addCliArgument("-s"); verifier.addCliArgument("settings.xml"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4554PluginPrefixMappingUpdateTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4554PluginPrefixMappingUpdateTest.java index c884ce304caf..d84fb0aee634 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4554PluginPrefixMappingUpdateTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4554PluginPrefixMappingUpdateTest.java @@ -94,7 +94,7 @@ public void handle( verifier.setAutoclean(false); verifier.deleteDirectory("target"); try { - verifier.deleteArtifacts("org.apache.maven.its.mng4554"); + verifier.deleteArtifacts("org.apache.maven.its.mng4554", "central"); } catch (IOException e) { // expected when running test on Windows using embedded Maven (JAR files locked by plugin class realm) assertFalse(new File(verifier.getArtifactMetadataPath( @@ -173,7 +173,7 @@ public void handle( verifier.setAutoclean(false); verifier.deleteDirectory("target"); try { - verifier.deleteArtifacts("org.apache.maven.its.mng4554"); + verifier.deleteArtifacts("org.apache.maven.its.mng4554", "central"); } catch (IOException e) { // expected when running test on Windows using embedded Maven (JAR files locked by plugin class realm) assertFalse(new File(verifier.getArtifactMetadataPath( @@ -255,7 +255,7 @@ public void handle( verifier.setAutoclean(false); verifier.deleteDirectory("target"); try { - verifier.deleteArtifacts("org.apache.maven.its.mng4554"); + verifier.deleteArtifacts("org.apache.maven.its.mng4554", "central"); } catch (IOException e) { // expected when running test on Windows using embedded Maven (JAR files locked by plugin class realm) assertFalse(new File(verifier.getArtifactMetadataPath( diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4555MetaversionResolutionOfflineTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4555MetaversionResolutionOfflineTest.java index 70339c3a22bc..763b74ac2490 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4555MetaversionResolutionOfflineTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4555MetaversionResolutionOfflineTest.java @@ -79,7 +79,7 @@ public void handle( Verifier verifier = newVerifier(testDir.getAbsolutePath()); verifier.setAutoclean(false); verifier.deleteDirectory("target"); - verifier.deleteArtifacts("org.apache.maven.its.mng4555"); + verifier.deleteArtifacts("org.apache.maven.its.mng4555", "maven-core-it"); try { if (server.isFailed()) { fail("Couldn't bind the server socket to a free port!"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4561MirroringOfPluginRepoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4561MirroringOfPluginRepoTest.java index fe2f40c789da..760d1b3e3c0f 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4561MirroringOfPluginRepoTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4561MirroringOfPluginRepoTest.java @@ -97,7 +97,8 @@ public void testit() throws Exception { System.out.println("Bound server socket to the port " + port); verifier.setAutoclean(false); verifier.deleteDirectory("target"); - verifier.deleteArtifacts("org.apache.maven.its.mng4561"); + verifier.deleteArtifacts("org.apache.maven.its.mng4561", "it-mirror-a"); + verifier.deleteArtifacts("org.apache.maven.its.mng4561", "it-mirror-b"); Map filterProps = verifier.newDefaultFilterMap(); filterProps.put("@port@", Integer.toString(port)); verifier.filterFile("settings-template.xml", "settings.xml", filterProps); @@ -107,8 +108,8 @@ public void testit() throws Exception { verifier.execute(); verifier.verifyErrorFreeLog(); - verifier.verifyArtifactPresent("org.apache.maven.its.mng4561", "plugin-dep", "0.1", "jar"); - verifier.verifyArtifactPresent("org.apache.maven.its.mng4561", "plugin-dep", "0.1", "pom"); + verifier.verifyArtifactPresent("org.apache.maven.its.mng4561", "plugin-dep", "0.1", "jar", "it-mirror-b"); + verifier.verifyArtifactPresent("org.apache.maven.its.mng4561", "plugin-dep", "0.1", "pom", "it-mirror-b"); verifier.verifyFilePresent("target/touch.txt"); } finally { server.stop(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4586PluginPrefixResolutionFromVersionlessPluginMgmtTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4586PluginPrefixResolutionFromVersionlessPluginMgmtTest.java index e3ea4ddc89e1..31105fdacefb 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4586PluginPrefixResolutionFromVersionlessPluginMgmtTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4586PluginPrefixResolutionFromVersionlessPluginMgmtTest.java @@ -47,7 +47,7 @@ public void testit() throws Exception { Verifier verifier = newVerifier(testDir.getAbsolutePath()); verifier.setAutoclean(false); verifier.deleteDirectory("target"); - verifier.deleteArtifacts("org.apache.maven.its.mng4586"); + verifier.deleteArtifacts("org.apache.maven.its.mng4586", "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/MavenITmng4590ImportedPomUsesSystemAndUserPropertiesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4590ImportedPomUsesSystemAndUserPropertiesTest.java index 5a369f906468..b1e2aaf25155 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4590ImportedPomUsesSystemAndUserPropertiesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4590ImportedPomUsesSystemAndUserPropertiesTest.java @@ -48,7 +48,7 @@ public void testit() throws Exception { Verifier verifier = newVerifier(testDir.getAbsolutePath()); verifier.setAutoclean(false); verifier.deleteDirectory("target"); - verifier.deleteArtifacts("org.apache.maven.its.mng4590"); + verifier.deleteArtifacts("org.apache.maven.its.mng4590", "maven-core-it"); verifier.filterFile("settings-template.xml", "settings.xml"); verifier.setEnvironmentVariable("MAVEN_OPTS", "-Dtest.file=pom.xml"); verifier.addCliArgument("-Dtest.dir=" + testDir.getAbsolutePath()); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4600DependencyOptionalFlagManagementTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4600DependencyOptionalFlagManagementTest.java index 0df0f99be585..a3dcbaaa2479 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4600DependencyOptionalFlagManagementTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4600DependencyOptionalFlagManagementTest.java @@ -73,7 +73,7 @@ public void testitResolution() throws Exception { Verifier verifier = newVerifier(testDir.getAbsolutePath()); verifier.setAutoclean(false); verifier.deleteDirectory("target"); - verifier.deleteArtifacts("org.apache.maven.its.mng4600"); + verifier.deleteArtifacts("org.apache.maven.its.mng4600", "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/MavenITmng4654ArtifactHandlerForMainArtifactTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4654ArtifactHandlerForMainArtifactTest.java index d7b6684fe75f..b3a57074606b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4654ArtifactHandlerForMainArtifactTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4654ArtifactHandlerForMainArtifactTest.java @@ -46,7 +46,7 @@ public void testit() throws Exception { Verifier verifier = newVerifier(testDir.getAbsolutePath()); verifier.setAutoclean(false); verifier.deleteDirectory("target"); - verifier.deleteArtifacts("org.apache.maven.its.mng4654"); + verifier.deleteArtifacts("org.apache.maven.its.mng4654", "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/MavenITmng4660OutdatedPackagedArtifact.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660OutdatedPackagedArtifact.java index 46ff32ec8bfa..4c822f309b29 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660OutdatedPackagedArtifact.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660OutdatedPackagedArtifact.java @@ -58,7 +58,7 @@ public void testShouldWarnWhenPackagedArtifactIsOutdated() throws Exception { // 1. Package the whole project final Verifier verifier1 = newVerifier(testDir.getAbsolutePath()); verifier1.deleteDirectory("target"); - verifier1.deleteArtifacts("org.apache.maven.its.mng4660"); + verifier1.deleteArtifacts("org.apache.maven.its.mng4660", null); verifier1.addCliArgument("package"); verifier1.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660ResumeFromTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660ResumeFromTest.java index baa580cab359..729502d4efb1 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660ResumeFromTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660ResumeFromTest.java @@ -47,7 +47,7 @@ public void testShouldResolveOutputDirectoryFromEarlierBuild() throws Exception final Verifier verifier1 = newVerifier(testDir.getAbsolutePath()); verifier1.deleteDirectory("target"); - verifier1.deleteArtifacts("org.apache.maven.its.mng4660"); + verifier1.deleteArtifacts("org.apache.maven.its.mng4660", null); try { verifier1.addCliArgument("test"); // The test goal will not create a packaged artifact @@ -80,7 +80,7 @@ public void testShouldResolvePackagedArtifactFromEarlierBuild() throws Exception final Verifier verifier1 = newVerifier(testDir.getAbsolutePath()); verifier1.deleteDirectory("target"); - verifier1.deleteArtifacts("org.apache.maven.its.mng4660"); + verifier1.deleteArtifacts("org.apache.maven.its.mng4660", null); try { verifier1.addCliArgument("verify"); // The verify goal will create a packaged artifact diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4666CoreRealmImportTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4666CoreRealmImportTest.java index 37c62eb17549..92ecbb8867ae 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4666CoreRealmImportTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4666CoreRealmImportTest.java @@ -53,24 +53,24 @@ public void testit() throws Exception { Verifier verifier = newVerifier(testDir.getAbsolutePath()); verifier.setAutoclean(false); verifier.deleteDirectory("target"); - verifier.deleteArtifacts("org.apache.maven", "maven-model", "0.1-stub"); - verifier.deleteArtifacts("org.apache.maven", "maven-settings", "0.1-stub"); - verifier.deleteArtifacts("org.apache.maven", "maven-project", "0.1-stub"); - verifier.deleteArtifacts("org.apache.maven", "maven-artifact", "0.1-stub"); - verifier.deleteArtifacts("org.apache.maven", "maven-core", "0.1-stub"); - verifier.deleteArtifacts("org.apache.maven", "maven-plugin-api", "0.1-stub"); - verifier.deleteArtifacts("org.apache.maven", "maven-plugin-descriptor", "0.1-stub"); - verifier.deleteArtifacts("plexus", "plexus-container-default", "0.1-stub"); - verifier.deleteArtifacts("org.codehaus.plexus", "plexus-container-default", "0.1-stub"); - verifier.deleteArtifacts("org.codehaus.plexus", "plexus-component-api", "0.1-stub"); - verifier.deleteArtifacts("org.codehaus.plexus", "plexus-utils", "0.1-stub"); - verifier.deleteArtifacts("org.codehaus.plexus", "plexus-classworlds", "0.1-stub"); - verifier.deleteArtifacts("org.sonatype.aether", "aether-api", "0.1-stub"); - verifier.deleteArtifacts("org.sonatype.aether", "aether-spi", "0.1-stub"); - verifier.deleteArtifacts("org.sonatype.aether", "aether-impl", "0.1-stub"); - verifier.deleteArtifacts("org.sonatype.sisu", "sisu-inject-plexus", "0.1-stub"); - verifier.deleteArtifacts("org.sonatype.spice", "spice-inject-plexus", "0.1-stub"); - verifier.deleteArtifacts("classworlds", "classworlds", "0.1-stub"); + verifier.deleteArtifacts("org.apache.maven", "maven-model", "0.1-stub", "maven-core-it"); + verifier.deleteArtifacts("org.apache.maven", "maven-settings", "0.1-stub", "maven-core-it"); + verifier.deleteArtifacts("org.apache.maven", "maven-project", "0.1-stub", "maven-core-it"); + verifier.deleteArtifacts("org.apache.maven", "maven-artifact", "0.1-stub", "maven-core-it"); + verifier.deleteArtifacts("org.apache.maven", "maven-core", "0.1-stub", "maven-core-it"); + verifier.deleteArtifacts("org.apache.maven", "maven-plugin-api", "0.1-stub", "maven-core-it"); + verifier.deleteArtifacts("org.apache.maven", "maven-plugin-descriptor", "0.1-stub", "maven-core-it"); + verifier.deleteArtifacts("plexus", "plexus-container-default", "0.1-stub", "maven-core-it"); + verifier.deleteArtifacts("org.codehaus.plexus", "plexus-container-default", "0.1-stub", "maven-core-it"); + verifier.deleteArtifacts("org.codehaus.plexus", "plexus-component-api", "0.1-stub", "maven-core-it"); + verifier.deleteArtifacts("org.codehaus.plexus", "plexus-utils", "0.1-stub", "maven-core-it"); + verifier.deleteArtifacts("org.codehaus.plexus", "plexus-classworlds", "0.1-stub", "maven-core-it"); + verifier.deleteArtifacts("org.sonatype.aether", "aether-api", "0.1-stub", "maven-core-it"); + verifier.deleteArtifacts("org.sonatype.aether", "aether-spi", "0.1-stub", "maven-core-it"); + verifier.deleteArtifacts("org.sonatype.aether", "aether-impl", "0.1-stub", "maven-core-it"); + verifier.deleteArtifacts("org.sonatype.sisu", "sisu-inject-plexus", "0.1-stub", "maven-core-it"); + verifier.deleteArtifacts("org.sonatype.spice", "spice-inject-plexus", "0.1-stub", "maven-core-it"); + verifier.deleteArtifacts("classworlds", "classworlds", "0.1-stub", "maven-core-it"); verifier.filterFile("settings-template.xml", "settings.xml"); verifier.addCliArgument("-s"); verifier.addCliArgument("settings.xml"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4679SnapshotUpdateInPluginTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4679SnapshotUpdateInPluginTest.java index 4a3efd1e00b0..10c10af00e72 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4679SnapshotUpdateInPluginTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4679SnapshotUpdateInPluginTest.java @@ -48,7 +48,7 @@ public void testit() throws Exception { Verifier verifier = newVerifier(testDir.getAbsolutePath()); verifier.setAutoclean(false); - verifier.deleteArtifacts("org.apache.maven.its.mng4679"); + verifier.deleteArtifacts("org.apache.maven.its.mng4679", "maven-core-it"); verifier.addCliArgument("-s"); verifier.addCliArgument("settings.xml"); @@ -78,7 +78,8 @@ public void testit() throws Exception { } private void assertChecksum(Verifier verifier, String ext, String checksum) throws Exception { - String path = verifier.getArtifactPath("org.apache.maven.its.mng4679", "dep", "0.1-SNAPSHOT", ext); + String path = + verifier.getArtifactPath("org.apache.maven.its.mng4679", "dep", "0.1-SNAPSHOT", ext, "maven-core-it"); String actual = ItUtils.calcHash(new File(path), "SHA-1"); assertEquals(checksum, actual); } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4690InterdependentConflictResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4690InterdependentConflictResolutionTest.java index 124aecca2108..07fc47148c2d 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4690InterdependentConflictResolutionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4690InterdependentConflictResolutionTest.java @@ -80,7 +80,7 @@ private void testit(String test) throws Exception { Verifier verifier = newVerifier(new File(testDir, test).getAbsolutePath()); verifier.setAutoclean(false); verifier.deleteDirectory("target"); - verifier.deleteArtifacts("org.apache.maven.its.mng4690"); + verifier.deleteArtifacts("org.apache.maven.its.mng4690", "maven-core-it"); verifier.addCliArgument("-s"); verifier.addCliArgument("settings.xml"); verifier.filterFile("../settings-template.xml", "settings.xml"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4696MavenProjectDependencyArtifactsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4696MavenProjectDependencyArtifactsTest.java index bfdde5a7c184..8f7a299de533 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4696MavenProjectDependencyArtifactsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4696MavenProjectDependencyArtifactsTest.java @@ -51,7 +51,7 @@ public void testit() throws Exception { Verifier verifier = newVerifier(testDir.getAbsolutePath()); verifier.setAutoclean(false); - verifier.deleteArtifacts("org.apache.maven.its.mng4696"); + verifier.deleteArtifacts("org.apache.maven.its.mng4696", "maven-core-it"); verifier.addCliArgument("-s"); verifier.addCliArgument("settings.xml"); verifier.filterFile("settings-template.xml", "settings.xml"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4720DependencyManagementExclusionMergeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4720DependencyManagementExclusionMergeTest.java index 8e1b9c92f29d..6cc844906bb0 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4720DependencyManagementExclusionMergeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4720DependencyManagementExclusionMergeTest.java @@ -52,7 +52,7 @@ public void testitWithTransitiveDependencyManager() throws Exception { Verifier verifier = newVerifier(testDir.getAbsolutePath()); verifier.setAutoclean(false); - verifier.deleteArtifacts("org.apache.maven.its.mng4720"); + verifier.deleteArtifacts("org.apache.maven.its.mng4720", "maven-core-it"); verifier.addCliArgument("-s"); verifier.addCliArgument("settings.xml"); verifier.filterFile("settings-template.xml", "settings.xml"); @@ -89,7 +89,7 @@ public void testitWithTransitiveDependencyManagerDisabled() throws Exception { Verifier verifier = newVerifier(testDir.getAbsolutePath()); verifier.setAutoclean(false); - verifier.deleteArtifacts("org.apache.maven.its.mng4720"); + verifier.deleteArtifacts("org.apache.maven.its.mng4720", "maven-core-it"); verifier.addCliArgument("-s"); verifier.addCliArgument("settings.xml"); verifier.filterFile("settings-template.xml", "settings.xml"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4721OptionalPluginDependencyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4721OptionalPluginDependencyTest.java index 268cdf18054d..25f06cdd214f 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4721OptionalPluginDependencyTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4721OptionalPluginDependencyTest.java @@ -47,7 +47,7 @@ public void testit() throws Exception { Verifier verifier = newVerifier(testDir.getAbsolutePath()); verifier.setAutoclean(false); - verifier.deleteArtifacts("org.apache.maven.its.mng4721"); + verifier.deleteArtifacts("org.apache.maven.its.mng4721", "maven-core-it"); verifier.addCliArgument("-s"); verifier.addCliArgument("settings.xml"); verifier.filterFile("settings-template.xml", "settings.xml"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4729MirrorProxyAuthUsedByProjectBuilderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4729MirrorProxyAuthUsedByProjectBuilderTest.java index 47106a36ff99..61cb904033aa 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4729MirrorProxyAuthUsedByProjectBuilderTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4729MirrorProxyAuthUsedByProjectBuilderTest.java @@ -99,7 +99,8 @@ public void testit() throws Exception { System.out.println("Bound server socket to the port " + port); verifier.setAutoclean(false); verifier.deleteDirectory("target"); - verifier.deleteArtifacts("org.apache.maven.its.mng4729"); + verifier.deleteArtifacts("org.apache.maven.its.mng4729", "it-mirror-a"); + verifier.deleteArtifacts("org.apache.maven.its.mng4729", "it-mirror-b"); Map filterProps = verifier.newDefaultFilterMap(); filterProps.put("@port@", Integer.toString(port)); verifier.filterFile("settings-template.xml", "settings.xml", filterProps); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4745PluginVersionUpdateTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4745PluginVersionUpdateTest.java index aaa04de8ca9b..55a3a539a6be 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4745PluginVersionUpdateTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4745PluginVersionUpdateTest.java @@ -50,7 +50,7 @@ public void testitRepoPolicyAlways() throws Exception { Verifier verifier = newVerifier(testDir.getAbsolutePath()); verifier.setAutoclean(false); verifier.setForkJvm(true); // TODO: why? - verifier.deleteArtifacts("org.apache.maven.its.mng4745"); + verifier.deleteArtifacts("org.apache.maven.its.mng4745", "maven-core-it"); verifier.addCliArgument("-s"); verifier.addCliArgument("settings.xml"); Map filterProps = verifier.newDefaultFilterMap(); @@ -85,7 +85,7 @@ public void testitRepoPolicyNever() throws Exception { Verifier verifier = newVerifier(testDir.getAbsolutePath()); verifier.setAutoclean(false); verifier.setForkJvm(true); // TODO: why? - verifier.deleteArtifacts("org.apache.maven.its.mng4745"); + verifier.deleteArtifacts("org.apache.maven.its.mng4745", "maven-core-it"); verifier.addCliArgument("-s"); verifier.addCliArgument("settings.xml"); Map filterProps = verifier.newDefaultFilterMap(); @@ -120,7 +120,7 @@ public void testitForceUpdate() throws Exception { Verifier verifier = newVerifier(testDir.getAbsolutePath()); verifier.setAutoclean(false); verifier.setForkJvm(true); // TODO: why? - verifier.deleteArtifacts("org.apache.maven.its.mng4745"); + verifier.deleteArtifacts("org.apache.maven.its.mng4745", "maven-core-it"); verifier.addCliArgument("-U"); verifier.addCliArgument("-s"); verifier.addCliArgument("settings.xml"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4750ResolvedMavenProjectDependencyArtifactsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4750ResolvedMavenProjectDependencyArtifactsTest.java index ac7f019a2f9b..c8c6fb00de7d 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4750ResolvedMavenProjectDependencyArtifactsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4750ResolvedMavenProjectDependencyArtifactsTest.java @@ -51,7 +51,7 @@ public void testit() throws Exception { Verifier verifier = newVerifier(testDir.getAbsolutePath()); verifier.setAutoclean(false); - verifier.deleteArtifacts("org.apache.maven.its.mng4750"); + verifier.deleteArtifacts("org.apache.maven.its.mng4750", "maven-core-it"); verifier.addCliArgument("-s"); verifier.addCliArgument("settings.xml"); verifier.filterFile("settings-template.xml", "settings.xml"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4755FetchRemoteMetadataForVersionRangeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4755FetchRemoteMetadataForVersionRangeTest.java index d7781325c98b..56c7c3d95786 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4755FetchRemoteMetadataForVersionRangeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4755FetchRemoteMetadataForVersionRangeTest.java @@ -49,7 +49,8 @@ public void testit() throws Exception { // setup: install a local version Verifier verifier = newVerifier(new File(testDir, "dependency").getAbsolutePath()); verifier.setAutoclean(false); - verifier.deleteArtifacts("org.apache.maven.its.mng4755"); + verifier.deleteArtifacts("org.apache.maven.its.mng4755", null); + verifier.deleteArtifacts("org.apache.maven.its.mng4755", "maven-core-it<"); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); verifier.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4768NearestMatchConflictResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4768NearestMatchConflictResolutionTest.java index 5851007b15d7..69bb7f89001f 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4768NearestMatchConflictResolutionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4768NearestMatchConflictResolutionTest.java @@ -82,7 +82,7 @@ private void testit(String test) throws Exception { Verifier verifier = newVerifier(new File(testDir, test).getAbsolutePath()); verifier.setAutoclean(false); verifier.deleteDirectory("target"); - verifier.deleteArtifacts("org.apache.maven.its.mng4768"); + verifier.deleteArtifacts("org.apache.maven.its.mng4768", "maven-core-it"); verifier.addCliArgument("-s"); verifier.addCliArgument("settings.xml"); verifier.filterFile("../settings-template.xml", "settings.xml"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4779MultipleDepsWithVersionRangeFromLocalRepoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4779MultipleDepsWithVersionRangeFromLocalRepoTest.java index cdece579a7bc..25f97b99ff64 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4779MultipleDepsWithVersionRangeFromLocalRepoTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4779MultipleDepsWithVersionRangeFromLocalRepoTest.java @@ -49,7 +49,7 @@ public void testit() throws Exception { Verifier verifier = newVerifier(testDir.getAbsolutePath()); verifier.setAutoclean(false); verifier.deleteDirectory("test/target"); - verifier.deleteArtifacts("org.apache.maven.its.mng4779"); + verifier.deleteArtifacts("org.apache.maven.its.mng4779", null); verifier.addCliArgument("validate"); verifier.execute(); verifier.verifyErrorFreeLog(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4785TransitiveResolutionInForkedThreadTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4785TransitiveResolutionInForkedThreadTest.java index 1d032207e185..aaee92d42d51 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4785TransitiveResolutionInForkedThreadTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4785TransitiveResolutionInForkedThreadTest.java @@ -49,7 +49,7 @@ public void testit() throws Exception { Verifier verifier = newVerifier(testDir.getAbsolutePath()); verifier.setAutoclean(false); verifier.deleteDirectory("target"); - verifier.deleteArtifacts("org.apache.maven.its.mng4785"); + verifier.deleteArtifacts("org.apache.maven.its.mng4785", "maven-core-it"); verifier.addCliArgument("-s"); verifier.addCliArgument("settings.xml"); verifier.filterFile("settings-template.xml", "settings.xml"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4789ScopeInheritanceMeetsConflictTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4789ScopeInheritanceMeetsConflictTest.java index 91893d27c201..4bfbed7530d9 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4789ScopeInheritanceMeetsConflictTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4789ScopeInheritanceMeetsConflictTest.java @@ -49,7 +49,7 @@ public void testit() throws Exception { Verifier verifier = newVerifier(testDir.getAbsolutePath()); verifier.setAutoclean(false); - verifier.deleteArtifacts("org.apache.maven.its.mng4789"); + verifier.deleteArtifacts("org.apache.maven.its.mng4789", "maven-core-it-repo"); verifier.deleteDirectory("target"); verifier.addCliArgument("-s"); verifier.addCliArgument("settings.xml"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4791ProjectBuilderResolvesRemotePomArtifactTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4791ProjectBuilderResolvesRemotePomArtifactTest.java index b1555c390bf0..5ff5cdd665f2 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4791ProjectBuilderResolvesRemotePomArtifactTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4791ProjectBuilderResolvesRemotePomArtifactTest.java @@ -50,7 +50,7 @@ public void testit() throws Exception { Verifier verifier = newVerifier(testDir.getAbsolutePath()); verifier.setAutoclean(false); verifier.deleteDirectory("target"); - verifier.deleteArtifacts("org.apache.maven.its.mng4791"); + verifier.deleteArtifacts("org.apache.maven.its.mng4791", "maven-core-it-repo"); verifier.addCliArgument("-s"); verifier.addCliArgument("settings.xml"); verifier.filterFile("settings-template.xml", "settings.xml"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4800NearestWinsVsScopeWideningTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4800NearestWinsVsScopeWideningTest.java index 57bc97388383..fe8bf302889b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4800NearestWinsVsScopeWideningTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4800NearestWinsVsScopeWideningTest.java @@ -58,7 +58,7 @@ private void testit(String test) throws Exception { Verifier verifier = newVerifier(new File(testDir, test).getAbsolutePath()); verifier.setAutoclean(false); verifier.deleteDirectory("target"); - verifier.deleteArtifacts("org.apache.maven.its.mng4800"); + verifier.deleteArtifacts("org.apache.maven.its.mng4800", "maven-core-it"); verifier.addCliArgument("-s"); verifier.addCliArgument("settings.xml"); verifier.filterFile("../settings-template.xml", "settings.xml"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4814ReResolutionOfDependenciesDuringReactorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4814ReResolutionOfDependenciesDuringReactorTest.java index bc9b857c7ccb..8402e8a2360c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4814ReResolutionOfDependenciesDuringReactorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4814ReResolutionOfDependenciesDuringReactorTest.java @@ -52,7 +52,7 @@ public void testit() throws Exception { verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteDirectory("consumer/target"); - verifier.deleteArtifacts("org.apache.maven.its.mng4814"); + verifier.deleteArtifacts("org.apache.maven.its.mng4814", "maven-core-it"); verifier.addCliArgument("-s"); verifier.addCliArgument("settings.xml"); verifier.filterFile("settings-template.xml", "settings.xml"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4829ChecksumFailureWarningTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4829ChecksumFailureWarningTest.java index 414bc608112d..a19209bbad97 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4829ChecksumFailureWarningTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4829ChecksumFailureWarningTest.java @@ -48,7 +48,7 @@ public void testit() throws Exception { Verifier verifier = newVerifier(testDir.getAbsolutePath()); verifier.setAutoclean(false); verifier.deleteDirectory("target"); - verifier.deleteArtifacts("org.apache.maven.its.mng4829"); + verifier.deleteArtifacts("org.apache.maven.its.mng4829", "maven-core-it"); verifier.addCliArgument("-s"); verifier.addCliArgument("settings.xml"); verifier.setEnvironmentVariable("CI", "false"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4834ParentProjectResolvedFromRemoteReposTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4834ParentProjectResolvedFromRemoteReposTest.java index 80f4d60229a9..f7daff3641d4 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4834ParentProjectResolvedFromRemoteReposTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4834ParentProjectResolvedFromRemoteReposTest.java @@ -49,7 +49,7 @@ public void testit() throws Exception { Verifier verifier = newVerifier(testDir.getAbsolutePath()); verifier.setAutoclean(false); verifier.deleteDirectory("target"); - verifier.deleteArtifacts("org.apache.maven.its.mng4834"); + verifier.deleteArtifacts("org.apache.maven.its.mng4834", "maven-core-it"); verifier.addCliArgument("-s"); verifier.addCliArgument("settings.xml"); verifier.filterFile("settings-template.xml", "settings.xml"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4840MavenPrerequisiteTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4840MavenPrerequisiteTest.java index a0dfe4bea566..45a3ec7e3ece 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4840MavenPrerequisiteTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4840MavenPrerequisiteTest.java @@ -45,7 +45,7 @@ public void testitMojoExecution() throws Exception { Verifier verifier = newVerifier(new File(testDir, "test-1").getAbsolutePath()); verifier.setAutoclean(false); verifier.deleteDirectory("target"); - verifier.deleteArtifacts("org.apache.maven.its.mng4840"); + verifier.deleteArtifacts("org.apache.maven.its.mng4840", "maven-core-it"); verifier.addCliArgument("-s"); verifier.addCliArgument("settings.xml"); verifier.filterFile("../settings-template.xml", "settings.xml"); @@ -72,7 +72,7 @@ public void testitPluginVersionResolution() throws Exception { Verifier verifier = newVerifier(new File(testDir, "test-2").getAbsolutePath()); verifier.setAutoclean(false); verifier.deleteDirectory("target"); - verifier.deleteArtifacts("org.apache.maven.its.mng4840"); + verifier.deleteArtifacts("org.apache.maven.its.mng4840", "maven-core-it"); verifier.addCliArgument("-s"); verifier.addCliArgument("settings.xml"); verifier.filterFile("../settings-template.xml", "settings.xml"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4842ParentResolutionOfDependencyPomTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4842ParentResolutionOfDependencyPomTest.java index 78f3b5ba924b..02b9f92b5d10 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4842ParentResolutionOfDependencyPomTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4842ParentResolutionOfDependencyPomTest.java @@ -50,7 +50,7 @@ public void testitCore() throws Exception { Verifier verifier = newVerifier(new File(testDir, "core").getAbsolutePath()); verifier.setAutoclean(false); verifier.deleteDirectory("target"); - verifier.deleteArtifacts("org.apache.maven.its.mng4842"); + verifier.deleteArtifacts("org.apache.maven.its.mng4842", "maven-core-it"); verifier.addCliArgument("-s"); verifier.addCliArgument("settings.xml"); verifier.filterFile("../settings-template.xml", "settings.xml"); @@ -61,7 +61,7 @@ public void testitCore() throws Exception { List compile = verifier.loadLines("target/compile.txt"); assertTrue(compile.contains("dep-0.1.jar"), compile.toString()); - verifier.verifyArtifactPresent("org.apache.maven.its.mng4842", "parent", "0.1", "pom"); + verifier.verifyArtifactPresent("org.apache.maven.its.mng4842", "parent", "0.1", "pom", "maven-core-it"); } /** @@ -78,7 +78,7 @@ public void testitPlugin() throws Exception { Verifier verifier = newVerifier(new File(testDir, "plugin").getAbsolutePath()); verifier.setAutoclean(false); verifier.deleteDirectory("target"); - verifier.deleteArtifacts("org.apache.maven.its.mng4842"); + verifier.deleteArtifacts("org.apache.maven.its.mng4842", "maven-core-it"); verifier.addCliArgument("-s"); verifier.addCliArgument("settings.xml"); verifier.filterFile("../settings-template.xml", "settings.xml"); @@ -86,6 +86,6 @@ public void testitPlugin() throws Exception { verifier.execute(); verifier.verifyErrorFreeLog(); - verifier.verifyArtifactPresent("org.apache.maven.its.mng4842", "parent", "0.1", "pom"); + verifier.verifyArtifactPresent("org.apache.maven.its.mng4842", "parent", "0.1", "pom", "maven-core-it"); } } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4872ReactorResolutionAttachedWithExclusionsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4872ReactorResolutionAttachedWithExclusionsTest.java index 84479de5c222..a5f6b5cc8012 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4872ReactorResolutionAttachedWithExclusionsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4872ReactorResolutionAttachedWithExclusionsTest.java @@ -49,7 +49,7 @@ public void testit() throws Exception { Verifier verifier = newVerifier(testDir.getAbsolutePath()); verifier.setAutoclean(false); verifier.deleteDirectory("consumer/target"); - verifier.deleteArtifacts("org.apache.maven.its.mng4872"); + verifier.deleteArtifacts("org.apache.maven.its.mng4872", null); verifier.addCliArgument("validate"); verifier.execute(); verifier.verifyErrorFreeLog(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4874UpdateLatestPluginVersionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4874UpdateLatestPluginVersionTest.java index d848cb539a20..2f7dcb1724b8 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4874UpdateLatestPluginVersionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4874UpdateLatestPluginVersionTest.java @@ -48,7 +48,7 @@ public void testit() throws Exception { Verifier verifier = newVerifier(testDir.getAbsolutePath()); verifier.setAutoclean(false); verifier.deleteDirectory("target"); - verifier.deleteArtifacts("org.apache.maven.its.mng4874"); + verifier.deleteArtifacts("org.apache.maven.its.mng4874", null); verifier.addCliArgument("validate"); verifier.execute(); verifier.verifyErrorFreeLog(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4883FailUponOverconstrainedVersionRangesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4883FailUponOverconstrainedVersionRangesTest.java index b66d25e217f6..ca424a4954fd 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4883FailUponOverconstrainedVersionRangesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4883FailUponOverconstrainedVersionRangesTest.java @@ -45,7 +45,7 @@ public void testit() throws Exception { Verifier verifier = newVerifier(testDir.getAbsolutePath()); verifier.setAutoclean(false); verifier.deleteDirectory("target"); - verifier.deleteArtifacts("org.apache.maven.its.mng4883"); + verifier.deleteArtifacts("org.apache.maven.its.mng4883", "maven-core-it"); verifier.addCliArgument("-s"); verifier.addCliArgument("settings.xml"); verifier.filterFile("settings-template.xml", "settings.xml"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4891RobustSnapshotResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4891RobustSnapshotResolutionTest.java index 822ab8b2ac32..a1e0dea0e511 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4891RobustSnapshotResolutionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4891RobustSnapshotResolutionTest.java @@ -49,7 +49,7 @@ public void testit() throws Exception { Verifier verifier = newVerifier(new File(testDir, "producer").getAbsolutePath()); verifier.setAutoclean(false); verifier.deleteDirectory("target"); - verifier.deleteArtifacts("org.apache.maven.its.mng4891"); + verifier.deleteArtifacts("org.apache.maven.its.mng4891", null); verifier.addCliArgument("validate"); verifier.execute(); verifier.verifyErrorFreeLog(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4895PluginDepWithNonRelocatedMavenApiTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4895PluginDepWithNonRelocatedMavenApiTest.java index ec82fa227e38..fb63e44260d7 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4895PluginDepWithNonRelocatedMavenApiTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4895PluginDepWithNonRelocatedMavenApiTest.java @@ -46,7 +46,7 @@ public void testit() throws Exception { Verifier verifier = newVerifier(testDir.getAbsolutePath()); verifier.setAutoclean(false); verifier.deleteDirectory("target"); - verifier.deleteArtifacts("org.apache.maven.its.mng4895"); + verifier.deleteArtifacts("org.apache.maven.its.mng4895", "maven-core-it"); verifier.addCliArgument("-s"); verifier.addCliArgument("settings.xml"); verifier.filterFile("settings-template.xml", "settings.xml"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4913UserPropertyVsDependencyPomPropertyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4913UserPropertyVsDependencyPomPropertyTest.java index 5655c2fc793a..d150ea79196a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4913UserPropertyVsDependencyPomPropertyTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4913UserPropertyVsDependencyPomPropertyTest.java @@ -49,7 +49,7 @@ public void testit() throws Exception { Verifier verifier = newVerifier(testDir.getAbsolutePath()); verifier.setAutoclean(false); verifier.deleteDirectory("target"); - verifier.deleteArtifacts("org.apache.maven.its.mng4913"); + verifier.deleteArtifacts("org.apache.maven.its.mng4913", "maven-core-it"); verifier.addCliArgument("-s"); verifier.addCliArgument("settings.xml"); verifier.addCliArgument("-Dmng4913.version=98.76"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4925ContainerLookupRealmDuringMojoExecTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4925ContainerLookupRealmDuringMojoExecTest.java index 659ee4f5c48d..956a2e745a92 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4925ContainerLookupRealmDuringMojoExecTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4925ContainerLookupRealmDuringMojoExecTest.java @@ -46,7 +46,7 @@ public void testit() throws Exception { Verifier verifier = newVerifier(testDir.getAbsolutePath()); verifier.setAutoclean(false); verifier.deleteDirectory("target"); - verifier.deleteArtifacts("org.apache.maven.its.mng4925"); + verifier.deleteArtifacts("org.apache.maven.its.mng4925", "maven-core-it"); verifier.addCliArgument("-s"); verifier.addCliArgument("settings.xml"); verifier.filterFile("settings-template.xml", "settings.xml"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4952MetadataReleaseInfoUpdateTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4952MetadataReleaseInfoUpdateTest.java index b525cc40c4ab..321fa5e5700f 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4952MetadataReleaseInfoUpdateTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4952MetadataReleaseInfoUpdateTest.java @@ -49,7 +49,7 @@ public void testit() throws Exception { Verifier verifier = newVerifier(testDir.getAbsolutePath()); verifier.setAutoclean(false); verifier.deleteDirectory("target"); - verifier.deleteArtifacts("org.apache.maven.its.mng4952"); + verifier.deleteArtifacts("org.apache.maven.its.mng4952", null); Map props = verifier.newDefaultFilterMap(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4955LocalVsRemoteSnapshotResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4955LocalVsRemoteSnapshotResolutionTest.java index d931bf1afdd2..0a3e8440df4b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4955LocalVsRemoteSnapshotResolutionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4955LocalVsRemoteSnapshotResolutionTest.java @@ -49,7 +49,8 @@ public void testit() throws Exception { Verifier verifier = newVerifier(new File(testDir, "dep").getAbsolutePath()); verifier.setAutoclean(false); verifier.deleteDirectory("target"); - verifier.deleteArtifacts("org.apache.maven.its.mng4955"); + verifier.deleteArtifacts("org.apache.maven.its.mng4955", null); + verifier.deleteArtifacts("org.apache.maven.its.mng4955", "maven-core-it"); verifier.addCliArgument("validate"); verifier.execute(); verifier.verifyErrorFreeLog(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4963ParentResolutionFromMirrorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4963ParentResolutionFromMirrorTest.java index 7c651bb77bfa..b9e64e19579d 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4963ParentResolutionFromMirrorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4963ParentResolutionFromMirrorTest.java @@ -47,7 +47,7 @@ public void testit() throws Exception { Verifier verifier = newVerifier(testDir.getAbsolutePath()); verifier.setAutoclean(false); verifier.deleteDirectory("target"); - verifier.deleteArtifacts("org.apache.maven.its.mng4963"); + verifier.deleteArtifacts("org.apache.maven.its.mng4963", "maven-core-it-mirror"); verifier.addCliArgument("-s"); verifier.addCliArgument("settings.xml"); verifier.filterFile("settings-template.xml", "settings.xml"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4973ExtensionVisibleToPluginInReactorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4973ExtensionVisibleToPluginInReactorTest.java index acf064434f47..4e36e0efe170 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4973ExtensionVisibleToPluginInReactorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4973ExtensionVisibleToPluginInReactorTest.java @@ -50,7 +50,7 @@ public void testit() throws Exception { Verifier verifier = newVerifier(testDir.getAbsolutePath()); verifier.setAutoclean(false); verifier.deleteDirectory("sub-b/target"); - verifier.deleteArtifacts("org.apache.maven.its.mng4973"); + verifier.deleteArtifacts("org.apache.maven.its.mng4973", "maven-core-it"); verifier.addCliArgument("-s"); verifier.addCliArgument("settings.xml"); verifier.filterFile("settings-template.xml", "settings.xml"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4987TimestampBasedSnapshotSelectionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4987TimestampBasedSnapshotSelectionTest.java index 2e820fe23bef..1e2d52ee4f0a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4987TimestampBasedSnapshotSelectionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4987TimestampBasedSnapshotSelectionTest.java @@ -49,7 +49,10 @@ public void testit() throws Exception { Verifier verifier = newVerifier(testDir.getAbsolutePath()); verifier.setAutoclean(false); verifier.deleteDirectory("target"); - verifier.deleteArtifacts("org.apache.maven.its.mng4987"); + verifier.deleteArtifacts("org.apache.maven.its.mng4987", "maven-core-it-1"); + verifier.deleteArtifacts("org.apache.maven.its.mng4987", "maven-core-it-2"); + verifier.deleteArtifacts("org.apache.maven.its.mng4987", "maven-core-it-3"); + verifier.deleteArtifacts("org.apache.maven.its.mng4987", "maven-core-it-4"); verifier.addCliArgument("-s"); verifier.addCliArgument("settings.xml"); verifier.filterFile("settings-template.xml", "settings.xml"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4991NonProxyHostsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4991NonProxyHostsTest.java index 5f9f9b4b2c68..d230b522ddf7 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4991NonProxyHostsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4991NonProxyHostsTest.java @@ -83,7 +83,7 @@ public void testit() throws Exception { verifier.setAutoclean(false); verifier.deleteDirectory("target"); - verifier.deleteArtifacts("org.apache.maven.its.mng4991"); + verifier.deleteArtifacts("org.apache.maven.its.mng4991", "central"); Map filterProps = verifier.newDefaultFilterMap(); int port = ((NetworkConnector) server.getConnectors()[0]).getLocalPort(); filterProps.put("@port@", Integer.toString(port)); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5006VersionRangeDependencyParentResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5006VersionRangeDependencyParentResolutionTest.java index 1818ce83ee4e..a9262acc7f82 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5006VersionRangeDependencyParentResolutionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5006VersionRangeDependencyParentResolutionTest.java @@ -51,7 +51,8 @@ public void testit() throws Exception { Verifier verifier = newVerifier(testDir.getAbsolutePath()); verifier.setAutoclean(false); verifier.deleteDirectory("target"); - verifier.deleteArtifacts("org.apache.maven.its.mng5006"); + verifier.deleteArtifacts("org.apache.maven.its.mng5006", "maven-core-it-1"); + verifier.deleteArtifacts("org.apache.maven.its.mng5006", "maven-core-it-2"); verifier.addCliArgument("-s"); verifier.addCliArgument("settings.xml"); verifier.filterFile("settings-template.xml", "settings.xml"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5019StringBasedCompLookupFromChildPluginRealmTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5019StringBasedCompLookupFromChildPluginRealmTest.java index a175839a27dc..aad51ff97804 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5019StringBasedCompLookupFromChildPluginRealmTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5019StringBasedCompLookupFromChildPluginRealmTest.java @@ -45,7 +45,7 @@ public void testit() throws Exception { Verifier verifier = newVerifier(testDir.getAbsolutePath()); verifier.setAutoclean(false); verifier.deleteDirectory("target"); - verifier.deleteArtifacts("org.apache.maven.its.mng5019"); + verifier.deleteArtifacts("org.apache.maven.its.mng5019", "maven-core-it"); verifier.addCliArgument("-s"); verifier.addCliArgument("settings.xml"); verifier.filterFile("settings-template.xml", "settings.xml"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5064SuppressSnapshotUpdatesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5064SuppressSnapshotUpdatesTest.java index d0b7f45c9476..760ddf612ca9 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5064SuppressSnapshotUpdatesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5064SuppressSnapshotUpdatesTest.java @@ -95,7 +95,7 @@ public void handle( System.out.println("Bound server socket to the port " + port); verifier.setAutoclean(false); verifier.deleteDirectory("target"); - verifier.deleteArtifacts("org.apache.maven.its.mng5064"); + verifier.deleteArtifacts("org.apache.maven.its.mng5064", "maven-core-it"); Map filterProps = verifier.newDefaultFilterMap(); filterProps.put("@port@", Integer.toString(port)); verifier.filterFile("settings-template.xml", "settings.xml", filterProps); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5096ExclusionAtDependencyWithImpliedClassifierTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5096ExclusionAtDependencyWithImpliedClassifierTest.java index 13cd0b8e3935..2914b9235efe 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5096ExclusionAtDependencyWithImpliedClassifierTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5096ExclusionAtDependencyWithImpliedClassifierTest.java @@ -51,7 +51,7 @@ public void testit() throws Exception { Verifier verifier = newVerifier(testDir.getAbsolutePath()); verifier.setAutoclean(false); verifier.deleteDirectory("target"); - verifier.deleteArtifacts("org.apache.maven.its.mng5096"); + verifier.deleteArtifacts("org.apache.maven.its.mng5096", "maven-core-it"); verifier.addCliArgument("-s"); verifier.addCliArgument("settings.xml"); verifier.filterFile("settings-template.xml", "settings.xml"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5135AggregatorDepResolutionModuleExtensionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5135AggregatorDepResolutionModuleExtensionTest.java index 1fabe508f20a..b57314f7e2f9 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5135AggregatorDepResolutionModuleExtensionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5135AggregatorDepResolutionModuleExtensionTest.java @@ -48,7 +48,7 @@ public void testit() throws Exception { Verifier verifier = newVerifier(testDir.getAbsolutePath()); verifier.setAutoclean(false); verifier.deleteDirectory("target"); - verifier.deleteArtifacts("org.apache.maven.its.mng5135"); + verifier.deleteArtifacts("org.apache.maven.its.mng5135", "maven-core-it"); verifier.addCliArgument("-s"); verifier.addCliArgument("settings.xml"); verifier.filterFile("settings-template.xml", "settings.xml"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5137ReactorResolutionInForkedBuildTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5137ReactorResolutionInForkedBuildTest.java index 7b59131cda43..88f046def51f 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5137ReactorResolutionInForkedBuildTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5137ReactorResolutionInForkedBuildTest.java @@ -52,7 +52,7 @@ public void testit() throws Exception { verifier.deleteDirectory("target"); verifier.deleteDirectory("producer/target"); verifier.deleteDirectory("consumer/target"); - verifier.deleteArtifacts("org.apache.maven.its.mng5137"); + verifier.deleteArtifacts("org.apache.maven.its.mng5137", null); verifier.addCliArgument( "org.apache.maven.its.plugins:maven-it-plugin-fork:2.1-SNAPSHOT:fork-lifecycle-aggregator"); verifier.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5214DontMapWsdlToJar.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5214DontMapWsdlToJar.java index 67980071c3d3..81bcb8f12bfe 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5214DontMapWsdlToJar.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5214DontMapWsdlToJar.java @@ -45,7 +45,7 @@ public void testitTestPhase() throws Exception { setupVerifier.setAutoclean(false); setupVerifier.addCliArgument("-X"); setupVerifier.deleteDirectory("target"); - setupVerifier.deleteArtifacts("org.apache.maven.its.mng5214"); + setupVerifier.deleteArtifacts("org.apache.maven.its.mng5214", null); setupVerifier.setLogFileName("log-setup.txt"); setupVerifier.addCliArgument("-PcreateWsdl"); setupVerifier.addCliArgument("generate-resources"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5280SettingsProfilesRepositoriesOrderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5280SettingsProfilesRepositoriesOrderTest.java index fe5f6d302553..06fc5cc19a7d 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5280SettingsProfilesRepositoriesOrderTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5280SettingsProfilesRepositoriesOrderTest.java @@ -87,7 +87,10 @@ public void testRepositoriesOrder() throws Exception { verifier.setAutoclean(false); verifier.deleteDirectory("target"); - verifier.deleteArtifacts("org.apache.maven.its.mng5280"); + verifier.deleteArtifacts("org.apache.maven.its.mng5280", "repo1"); + verifier.deleteArtifacts("org.apache.maven.its.mng5280", "pluginRepo1"); + verifier.deleteArtifacts("org.apache.maven.its.mng5280", "repo2"); + verifier.deleteArtifacts("org.apache.maven.its.mng5280", "pluginRepo2"); Map filterProps = verifier.newDefaultFilterMap(); filterProps.put("@httpserver.port@", Integer.toString(httpPort)); verifier.filterFile("settings-template.xml", "settings.xml", filterProps); @@ -122,7 +125,10 @@ public void testPluginRepositoriesOrder() throws Exception { verifier.setAutoclean(false); verifier.deleteDirectory("target"); - verifier.deleteArtifacts("org.apache.maven.its.mng5280"); + verifier.deleteArtifacts("org.apache.maven.its.mng5280", "repo1"); + verifier.deleteArtifacts("org.apache.maven.its.mng5280", "pluginRepo1"); + verifier.deleteArtifacts("org.apache.maven.its.mng5280", "repo2"); + verifier.deleteArtifacts("org.apache.maven.its.mng5280", "pluginRepo2"); Map filterProps = verifier.newDefaultFilterMap(); filterProps.put("@httpserver.port@", Integer.toString(httpPort)); verifier.filterFile("settings-template.xml", "settings.xml", filterProps); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5338FileOptionToDirectory.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5338FileOptionToDirectory.java index a7602f37252f..9caa70fe84c1 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5338FileOptionToDirectory.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5338FileOptionToDirectory.java @@ -47,7 +47,7 @@ public void testFileOptionToADirectory() throws Exception { verifier.setAutoclean(false); verifier.deleteDirectory("target"); - verifier.deleteArtifacts("org.apache.maven.its.mng5338"); + verifier.deleteArtifacts("org.apache.maven.its.mng5338", null); verifier.addCliArgument("-f"); verifier.addCliArgument("project"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5382Jsr330Plugin.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5382Jsr330Plugin.java index 350f50df5ebb..94d3a4eff1f0 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5382Jsr330Plugin.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5382Jsr330Plugin.java @@ -49,7 +49,7 @@ public void testJsr330PluginExecution() throws Exception { Verifier v0 = newVerifier(testDir.getAbsolutePath()); v0.setAutoclean(false); v0.deleteDirectory("target"); - v0.deleteArtifacts("org.apache.maven.its.mng5382"); + v0.deleteArtifacts("org.apache.maven.its.mng5382", null); v0.addCliArgument("install"); v0.execute(); v0.verifyErrorFreeLog(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6656BuildConsumer.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6656BuildConsumer.java index 046256787546..30d7a5c1fcef 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6656BuildConsumer.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6656BuildConsumer.java @@ -75,37 +75,47 @@ public void testPublishedPoms() throws Exception { assertTextEquals( new File(testDir, "expected/parent.pom"), new File(verifier.getArtifactPath( - "org.sonatype.mavenbook.multi", "parent", "0.9-MNG6656-SNAPSHOT", "pom"))); + "org.sonatype.mavenbook.multi", "parent", "0.9-MNG6656-SNAPSHOT", "pom", null))); assertTextEquals( new File(testDir, "expected/parent-build.pom"), new File(verifier.getArtifactPath( - "org.sonatype.mavenbook.multi", "parent", "0.9-MNG6656-SNAPSHOT", "pom", "build"))); + "org.sonatype.mavenbook.multi", "parent", "0.9-MNG6656-SNAPSHOT", "pom", "build", null))); assertTextEquals( new File(testDir, "expected/simple-parent.pom"), new File(verifier.getArtifactPath( - "org.sonatype.mavenbook.multi", "simple-parent", "0.9-MNG6656-SNAPSHOT", "pom"))); + "org.sonatype.mavenbook.multi", "simple-parent", "0.9-MNG6656-SNAPSHOT", "pom", null))); assertTextEquals( new File(testDir, "expected/simple-weather.pom"), new File(verifier.getArtifactPath( - "org.sonatype.mavenbook.multi", "simple-weather", "0.9-MNG6656-SNAPSHOT", "pom"))); + "org.sonatype.mavenbook.multi", "simple-weather", "0.9-MNG6656-SNAPSHOT", "pom", null))); assertTextEquals( new File(testDir, "expected/simple-weather-build.pom"), new File(verifier.getArtifactPath( - "org.sonatype.mavenbook.multi", "simple-weather", "0.9-MNG6656-SNAPSHOT", "pom", "build"))); + "org.sonatype.mavenbook.multi", + "simple-weather", + "0.9-MNG6656-SNAPSHOT", + "pom", + "build", + null))); assertTextEquals( new File(testDir, "expected/simple-webapp.pom"), new File(verifier.getArtifactPath( - "org.sonatype.mavenbook.multi", "simple-webapp", "0.9-MNG6656-SNAPSHOT", "pom"))); + "org.sonatype.mavenbook.multi", "simple-webapp", "0.9-MNG6656-SNAPSHOT", "pom", null))); assertTextEquals( new File(testDir, "expected/simple-webapp-build.pom"), new File(verifier.getArtifactPath( - "org.sonatype.mavenbook.multi", "simple-webapp", "0.9-MNG6656-SNAPSHOT", "pom", "build"))); + "org.sonatype.mavenbook.multi", + "simple-webapp", + "0.9-MNG6656-SNAPSHOT", + "pom", + "build", + null))); } static void assertTextEquals(File file1, File file2) throws IOException {