You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2021/07/03 09:27:21 UTC
[maven-integration-testing] 01/01: [MNG-7115]
MavenITmng5771CoreExtensionsTest fails on maven-3.8.x branch
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch MNG-7115
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git
commit bd99d879460627c036dfc175a76b8686fca6505c
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sat Jul 3 11:26:49 2021 +0200
[MNG-7115] MavenITmng5771CoreExtensionsTest fails on maven-3.8.x branch
---
.../apache/maven/it/MavenITmng5771CoreExtensionsTest.java | 12 +++++++++++-
.../settings-template-mirror-auth.xml | 2 +-
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5771CoreExtensionsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5771CoreExtensionsTest.java
index 23bd4ae..94c6994 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5771CoreExtensionsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5771CoreExtensionsTest.java
@@ -74,7 +74,17 @@ public class MavenITmng5771CoreExtensionsTest
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
Properties properties = verifier.newDefaultFilterProperties();
- properties.setProperty("@port@", Integer.toString(server.port()));
+ properties.setProperty("@port@", Integer.toString( server.port() ) );
+ String mirrorOf;
+ if ( matchesVersionRange( "[4.0.0-alpha-1,)" ) )
+ {
+ mirrorOf = "*";
+ }
+ else
+ {
+ mirrorOf = "external:*";
+ }
+ properties.setProperty("@mirrorOf@", mirrorOf );
verifier.filterFile( "settings-template-mirror-auth.xml", "settings.xml", "UTF-8", properties );
verifier = newVerifier( new File( testDir, "client" ).getAbsolutePath() );
diff --git a/core-it-suite/src/test/resources/mng-5771-core-extensions/settings-template-mirror-auth.xml b/core-it-suite/src/test/resources/mng-5771-core-extensions/settings-template-mirror-auth.xml
index 85e82e6..efaaab3 100644
--- a/core-it-suite/src/test/resources/mng-5771-core-extensions/settings-template-mirror-auth.xml
+++ b/core-it-suite/src/test/resources/mng-5771-core-extensions/settings-template-mirror-auth.xml
@@ -12,7 +12,7 @@
<id>repoman</id>
<name>Mirror</name>
<url>http://localhost:@port@</url>
- <mirrorOf>*</mirrorOf>
+ <mirrorOf>@mirrorOf@</mirrorOf>
</mirror>
</mirrors>