You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by cs...@apache.org on 2022/12/02 15:12:37 UTC
[maven-integration-testing] branch master updated: MNG-7608] Make native transport the default (#216)
This is an automated email from the ASF dual-hosted git repository.
cstamas pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git
The following commit(s) were added to refs/heads/master by this push:
new 18afe0813 MNG-7608] Make native transport the default (#216)
18afe0813 is described below
commit 18afe0813deaeeaa3713c9d354a96eaa2cd08b66
Author: Tamas Cservenak <ta...@cservenak.net>
AuthorDate: Fri Dec 2 16:12:31 2022 +0100
MNG-7608] Make native transport the default (#216)
Changed default transport from 4.0.0-alpha3
---
https://issues.apache.org/jira/browse/MNG-7608
---
.../maven/it/MavenITmng7470ResolverTransportTest.java | 17 ++++++++++++++---
.../src/test/resources/mng-5175/settings-template.xml | 1 +
2 files changed, 15 insertions(+), 3 deletions(-)
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 24e41f7ea..1a0265ee2 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
@@ -97,24 +97,35 @@ public class MavenITmng7470ResolverTransportTest
verifier.resetStreams();
}
+ private static final String WAGON_LOG_SNIPPET = "[DEBUG] Using transporter WagonTransporter";
+
+ private static final String NATIVE_LOG_SNIPPET = "[DEBUG] Using transporter HttpTransporter";
+
@Test
public void testResolverTransportDefault()
throws Exception
{
- performTest( null, "[DEBUG] Using transporter WagonTransporter" );
+ if ( matchesVersionRange( "[4.0.0-alpha-3,)" ) )
+ {
+ performTest( null, NATIVE_LOG_SNIPPET );
+ }
+ else // [3.9.0,) but not 4, see above and ctor
+ {
+ performTest( null, WAGON_LOG_SNIPPET );
+ }
}
@Test
public void testResolverTransportWagon()
throws Exception
{
- performTest( "wagon", "[DEBUG] Using transporter WagonTransporter" );
+ performTest( "wagon", WAGON_LOG_SNIPPET );
}
@Test
public void testResolverTransportNative()
throws Exception
{
- performTest( "native", "[DEBUG] Using transporter HttpTransporter" );
+ performTest( "native", NATIVE_LOG_SNIPPET );
}
}
diff --git a/core-it-suite/src/test/resources/mng-5175/settings-template.xml b/core-it-suite/src/test/resources/mng-5175/settings-template.xml
index 5e4f67cbd..c6fc8614c 100644
--- a/core-it-suite/src/test/resources/mng-5175/settings-template.xml
+++ b/core-it-suite/src/test/resources/mng-5175/settings-template.xml
@@ -2,6 +2,7 @@
<servers>
<server>
<id>test-small-timeout</id>
+ <!-- Plexus Configuration: legacy (only all supported) -->
<configuration>
<httpConfiguration>
<all>