Repository: maven-integration-testing Updated Branches: refs/heads/mng-6155 1013b7d6b -> 6c86dc6fe (forced update)
[MNG-6155] The mirror's id is used when comparing the origin so use the same id as when resolving the extension Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/6c86dc6f Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/6c86dc6f Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/6c86dc6f Branch: refs/heads/mng-6155 Commit: 6c86dc6fe8bad24950fa76d295910e7d7e145a21 Parents: ad98af7 Author: Stephen Connolly <stephen.alan.conno...@gmail.com> Authored: Fri Jan 13 13:27:41 2017 +0000 Committer: Stephen Connolly <stephen.alan.conno...@gmail.com> Committed: Fri Jan 13 13:27:41 2017 +0000 ---------------------------------------------------------------------- .../maven/it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java | 2 -- .../src/test/resources/mng-3599-mk2/settings-template.xml | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/6c86dc6f/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java index 0377348..6e9954b 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java @@ -152,7 +152,6 @@ public class MavenITmng3599useHttpProxyForWebDAVMk2Test verifier = newVerifier( testDir.getAbsolutePath() ); - verifier.addCliOption( "--legacy-local-repository" ); // FIXME this is a temporary band-aid MNG-6155 verifier.addCliOption( "--settings" ); verifier.addCliOption( "settings.xml" ); verifier.addCliOption( "-X" ); @@ -195,7 +194,6 @@ public class MavenITmng3599useHttpProxyForWebDAVMk2Test verifier = newVerifier( testDir.getAbsolutePath() ); - verifier.addCliOption( "--legacy-local-repository" ); // FIXME this is a temporary band-aid MNG-6155 verifier.addCliOption( "--settings" ); verifier.addCliOption( "settings.xml" ); verifier.addCliOption( "-X" ); http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/6c86dc6f/core-it-suite/src/test/resources/mng-3599-mk2/settings-template.xml ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-3599-mk2/settings-template.xml b/core-it-suite/src/test/resources/mng-3599-mk2/settings-template.xml index 809db8f..257b399 100644 --- a/core-it-suite/src/test/resources/mng-3599-mk2/settings-template.xml +++ b/core-it-suite/src/test/resources/mng-3599-mk2/settings-template.xml @@ -1,7 +1,7 @@ <settings> <mirrors> <mirror> - <id>test-mirror</id> + <id>central</id> <url>@protocol@://www.example.com/</url> <mirrorOf>*</mirrorOf> </mirror>
