diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4368TimestampAwareArtifactInstallerTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4368TimestampAwareArtifactInstallerTest.java index b58ea201a..e622eef5c 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4368TimestampAwareArtifactInstallerTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4368TimestampAwareArtifactInstallerTest.java @@ -33,7 +33,7 @@ public class MavenITmng4368TimestampAwareArtifactInstallerTest extends AbstractMavenIntegrationTestCase { public MavenITmng4368TimestampAwareArtifactInstallerTest() { - super("[2.0.3,3.0-alpha-1),[3.0-alpha-6,)"); + super("[2.0.3,3.0-alpha-1),[3.0-alpha-6,3.10.0-SNAPSHOT)"); } /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7470ResolverTransportTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7470ResolverTransportTest.java index 56970ec47..f86a36277 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7470ResolverTransportTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7470ResolverTransportTest.java @@ -100,11 +100,19 @@ private void performTest(/* nullable */ final String transport, final String log private static final String WAGON_LOG_SNIPPET = "[DEBUG] Using transporter WagonTransporter"; - private static final String NATIVE_LOG_SNIPPET = "[DEBUG] Using transporter HttpTransporter"; + // Resolver1: HttpTransporter + private static final String NATIVE_R1_LOG_SNIPPET = "[DEBUG] Using transporter HttpTransporter"; + + // Resolver2: renamed to ApacheTransporter + private static final String NATIVE_R2_LOG_SNIPPET = "[DEBUG] Using transporter ApacheTransporter"; @Test public void testResolverTransportDefault() throws Exception { - performTest(null, NATIVE_LOG_SNIPPET); + if (matchesVersionRange("[3.9.0,3.10.0)")) { + performTest(null, NATIVE_R1_LOG_SNIPPET); + } else { + performTest(null, NATIVE_R2_LOG_SNIPPET); + } } @Test @@ -114,6 +122,10 @@ public void testResolverTransportWagon() throws Exception { @Test public void testResolverTransportNative() throws Exception { - performTest("native", NATIVE_LOG_SNIPPET); + if (matchesVersionRange("[3.9.0,3.10.0)")) { + performTest("native", NATIVE_R1_LOG_SNIPPET); + } else { + performTest("native", NATIVE_R2_LOG_SNIPPET); + } } }