From 57b57cb24b0794ab6bcf54c9b1959835b1169d32 Mon Sep 17 00:00:00 2001
From: Tamas Cservenak <tamas@cservenak.net>
Date: Wed, 11 May 2022 10:29:35 +0200
Subject: [PATCH 01/14] [MNG-7470] mvn 3.9+ IT that uses wagon (default) and
 native transport

---
 .../apache/maven/it/IntegrationTestSuite.java |   1 +
 .../MavenITmng7470ResolverTransportTest.java  |  89 ++++++++++++++++++
 .../native/pom.xml                            |  42 +++++++++
 .../native/dependency/1.0/dependency-1.0.jar  | Bin 0 -> 2045 bytes
 .../dependency/1.0/dependency-1.0.jar.sha1    |   1 +
 .../native/dependency/1.0/dependency-1.0.pom  |  34 +++++++
 .../dependency/1.0/dependency-1.0.pom.sha1    |   1 +
 .../wagon/dependency/1.0/dependency-1.0.jar   | Bin 0 -> 2045 bytes
 .../dependency/1.0/dependency-1.0.jar.sha1    |   1 +
 .../wagon/dependency/1.0/dependency-1.0.pom   |  34 +++++++
 .../dependency/1.0/dependency-1.0.pom.sha1    |   1 +
 .../settings-template.xml                     |  40 ++++++++
 .../mng-7470-resolver-transport/wagon/pom.xml |  42 +++++++++
 13 files changed, 286 insertions(+)
 create mode 100644 core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7470ResolverTransportTest.java
 create mode 100644 core-it-suite/src/test/resources/mng-7470-resolver-transport/native/pom.xml
 create mode 100644 core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/native/dependency/1.0/dependency-1.0.jar
 create mode 100644 core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/native/dependency/1.0/dependency-1.0.jar.sha1
 create mode 100644 core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/native/dependency/1.0/dependency-1.0.pom
 create mode 100644 core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/native/dependency/1.0/dependency-1.0.pom.sha1
 create mode 100644 core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/wagon/dependency/1.0/dependency-1.0.jar
 create mode 100644 core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/wagon/dependency/1.0/dependency-1.0.jar.sha1
 create mode 100644 core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/wagon/dependency/1.0/dependency-1.0.pom
 create mode 100644 core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/wagon/dependency/1.0/dependency-1.0.pom.sha1
 create mode 100644 core-it-suite/src/test/resources/mng-7470-resolver-transport/settings-template.xml
 create mode 100644 core-it-suite/src/test/resources/mng-7470-resolver-transport/wagon/pom.xml

diff --git a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
index 69b9c906d..2e6462554 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
@@ -106,6 +106,7 @@ public static Test suite()
         // Tests that don't run stable and need to be fixed
         // -------------------------------------------------------------------------------------------------------------
         // suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); -- MNG-3137
+        suite.addTestSuite( MavenITmng7470ResolverTransportTest.class );
         suite.addTestSuite( MavenITmng7464ReadOnlyMojoParametersWarningTest.class );
         suite.addTestSuite( MavenITmng7404IgnorePrefixlessExpressionsTest.class );
         suite.addTestSuite( MavenITmng5222MojoDeprecatedTest.class );
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
new file mode 100644
index 000000000..61a906a35
--- /dev/null
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7470ResolverTransportTest.java
@@ -0,0 +1,89 @@
+package org.apache.maven.it;
+
+import java.io.File;
+import java.util.HashMap;
+
+import org.apache.maven.it.util.ResourceExtractor;
+
+/**
+ * This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-7470">MNG-7470</a>:
+ * check that Maven two bundled transports works as expected.
+ */
+public class MavenITmng7470ResolverTransportTest
+        extends AbstractMavenIntegrationTestCase
+{
+    public MavenITmng7470ResolverTransportTest()
+    {
+        super( "[3.9.0,)" );
+    }
+
+    public void testResolverTransportWagon()
+            throws Exception
+    {
+        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-7470-resolver-transport" );
+
+        HttpServer server = HttpServer.builder()
+                .port( 0 )
+                .source( new File( testDir, "repo" ) )
+                .build();
+        server.start();
+        try
+        {
+            Verifier verifier = newVerifier( testDir.getAbsolutePath() );
+            HashMap<String, String> properties = new HashMap<>();
+            properties.put( "@port@", Integer.toString( server.port() ) );
+            verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", properties );
+
+            verifier = newVerifier( new File( testDir, "wagon" ).getAbsolutePath() );
+            verifier.deleteDirectory( "target" );
+            verifier.deleteArtifacts( "org.apache.maven.its.resolver-transport.wagon" );
+            verifier.addCliOption( "-X" );
+            verifier.addCliOption("-s" );
+            verifier.addCliOption(new File( testDir, "settings.xml" ).getAbsolutePath() );
+            verifier.addCliOption( "-Pmaven-core-it-repo" );
+            verifier.addCliOption( "-Dmaven.resolver.transport=wagon" );
+            verifier.executeGoal( "verify" );
+            verifier.verifyErrorFreeLog();
+            verifier.resetStreams();
+        }
+        finally
+        {
+            server.stop();
+        }
+    }
+
+    public void testResolverTransportNative()
+            throws Exception
+    {
+        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-7470-resolver-transport" );
+
+        HttpServer server = HttpServer.builder()
+                .port( 0 )
+                .source( new File( testDir, "repo" ) )
+                .build();
+        server.start();
+        try
+        {
+            Verifier verifier = newVerifier( testDir.getAbsolutePath() );
+            HashMap<String, String> properties = new HashMap<>();
+            properties.put( "@port@", Integer.toString( server.port() ) );
+            verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", properties );
+
+            verifier = newVerifier( new File( testDir, "native" ).getAbsolutePath() );
+            verifier.deleteDirectory( "target" );
+            verifier.deleteArtifacts( "org.apache.maven.its.resolver-transport.native" );
+            verifier.addCliOption( "-X" );
+            verifier.addCliOption("-s" );
+            verifier.addCliOption(new File( testDir, "settings.xml" ).getAbsolutePath() );
+            verifier.addCliOption( "-Pmaven-core-it-repo" );
+            verifier.addCliOption( "-Dmaven.resolver.transport=native" );
+            verifier.executeGoal( "verify" );
+            verifier.verifyErrorFreeLog();
+            verifier.resetStreams();
+        }
+        finally
+        {
+            server.stop();
+        }
+    }
+}
diff --git a/core-it-suite/src/test/resources/mng-7470-resolver-transport/native/pom.xml b/core-it-suite/src/test/resources/mng-7470-resolver-transport/native/pom.xml
new file mode 100644
index 000000000..ce114fcaf
--- /dev/null
+++ b/core-it-suite/src/test/resources/mng-7470-resolver-transport/native/pom.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project>
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.apache.maven.its.resolver-transport.native</groupId>
+  <artifactId>artifact</artifactId>
+  <version>0.1</version>
+  <packaging>jar</packaging>
+
+  <name>Maven Integration Test :: resolver-transport :: native</name>
+  <description>
+    Verify that Maven transport Native works.
+  </description>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.maven.its.resolver-transport.native</groupId>
+      <artifactId>dependency</artifactId>
+      <version>1.0</version>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/native/dependency/1.0/dependency-1.0.jar b/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/native/dependency/1.0/dependency-1.0.jar
new file mode 100644
index 0000000000000000000000000000000000000000..c7c00e8cce3c42d98a2cd36b37cee7d6e3a53168
GIT binary patch
literal 2045
zcmWIWW@h1H0D*H&qUK-*l;8x?zOEsTx}JV+`T<a791LfH%0d?_6{G>BYk*h;S(&e+
zpQoE^aEP9-+h^Z1r+vJ2^)B*y>uQ}lbAEG>!4=~NPm6TC&YjTl)^*}wf3hTOikS8R
zm5QBnx`TwhgMv%uYONKK;TD=~93)yJd^+eeP{zx+*z3R}PuG>IssfE7vFoSgOnAAh
zitQuYvpq3;Vi;iVVqiFf=6r6TyYh2V(u?v-3p`VhJOEO->f4fkA&d+R;!F?^ASrY#
zD9}sJNh~hT4Lt32I6%O5`+A$6+}zyS?ANQfW-aaRQfSg(5!EVv_-Y&P$7!?gOi*i@
zzm%I*ysklB)$fv%rb)NunVFWx>3Mbk_tj50&dKLHWkcSA#$|oH!n1E&+ORgUePM|n
zlVH5T6KnU{wnI~;cJhe2v%HIa#DC|-M1B=RQ+M8-Z$5i0`Prj$L_g_JK<N~j%86cw
zZcnV0Y>Qp>BZh_N?77Xx&(`0WX7k}qoJ{9|*J;%iPbO~Kx8zL1w-6!TyV(=pUC4Zp
zc`L=Sd0pc5Lvr6F*GPwZU9Ae5D6`d6CL&|u*?_n$PS2ikzhh4>m(UN`yWR86uado9
zD=y5~C3vb%LEBKWXs3VMEAI?8T_0o5bTg~d>s+K=tG<6Z-MI9frqq<1Ej=45{;+<V
zH`TXmY0s4nP8VmH39J*6(pYRHJU{ht$8U#q)Bd|8+8t0~IaxaCY`esYq}~bt60b%6
zXGcUAdTQfGPDZ(jWvO}aD8o#eQkaU7Vi30_N_h1Z6y;~7CYQkN<zQF`Oe*b$#qLSK
zq$17Cz@SN#{(}5my^7qN-k^h7hYfi4e%E%oxwUN9H-oO{zZax7AH1=4$HrN!yx$~P
zdmg{B|9sgcRY{Su&GY6h`L440)C=Pjy`589H}!v>Tzs|dQjp1ljukFtOpAQ|;^&o@
z_y$cnXZ`G1(#Pp{x9MhvPb{Cm%=_2A+xvbU3epLPR1abM969MnS8wl!u=GO<!~RQ5
zzmw#WaB<D|mv*Y++RyLwCoG*7u%~h3KI?v7iMa`lQ>0_V{U^P4`sVMpKH>!T;}04}
z&kxsG_w;RW_-JM4(x>%2JyAmT(1e^{k=~n9wn*}ZEoxbq+QSqxyXpRhlNlatlUlf@
zuuN6F!O*ktJfB3Q^>wbhM?!u2W4`pPT<@_<D{f-DJzLVPv|UW^4*Yuc?(WKk!Iq16
zgr8A~O8*ehe))ZikmZyGG4Xi|E{V-GYnGfM^Eb0#g4ndeBTRpmas6-an!K&=Uaf2k
zYv;4sLQd^=`*(9EEql9nhji2*-QB-G+~kKvG^9{k8y0gh9vDF>Kx{yCL;)kcAhoC@
zGqpIl%>S&nu9uFdZ=lDjkPp5(-e(^N@oD;o7U=kf8yJNcm~1vO+GJ!DT)@j0XkcVu
z@LUU8vYB2ne&VHnN?-Sb&&IRoJsXX73UzxKT^5?`-LQz&^=IVDld7PSijhf#8Fx_&
zbTJSJFuZjH(MSa^OdIy17o->jmNcpZNw_wof*9FiY=tCPJJ{m=Kqg8)LRgKh(1d6N
zS^WZ4BfJPjwi;W8M_8Q)EQsNbhh=}5_1Fslgyz|pnz4EV(;QHNfH3DWUULw|1I%66
z3kaBrOB#iNMFyIuklY0`4_aIx!U}tGMi{$?g;-+|i95iXl?`M9ClJ;Fy_v}h;sF5n
CIh%6;

literal 0
HcmV?d00001

diff --git a/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/native/dependency/1.0/dependency-1.0.jar.sha1 b/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/native/dependency/1.0/dependency-1.0.jar.sha1
new file mode 100644
index 000000000..ad5066ce3
--- /dev/null
+++ b/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/native/dependency/1.0/dependency-1.0.jar.sha1
@@ -0,0 +1 @@
+b530516717ab5b3052fd3cdca860fc28574bd718
\ No newline at end of file
diff --git a/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/native/dependency/1.0/dependency-1.0.pom b/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/native/dependency/1.0/dependency-1.0.pom
new file mode 100644
index 000000000..f9fed21d3
--- /dev/null
+++ b/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/native/dependency/1.0/dependency-1.0.pom
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project>
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>org.apache.maven.its.resolver-transport.wagon</groupId>
+    <artifactId>dependency</artifactId>
+    <version>1.0</version>
+    <packaging>jar</packaging>
+
+    <name>Maven Integration Test :: resolver-transport :: wagon</name>
+    <description>
+        Verify that Maven transport Wagon works.
+    </description>
+</project>
diff --git a/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/native/dependency/1.0/dependency-1.0.pom.sha1 b/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/native/dependency/1.0/dependency-1.0.pom.sha1
new file mode 100644
index 000000000..f4443cd56
--- /dev/null
+++ b/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/native/dependency/1.0/dependency-1.0.pom.sha1
@@ -0,0 +1 @@
+97641443fee307b6c3593080be865df89ace3d86
diff --git a/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/wagon/dependency/1.0/dependency-1.0.jar b/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/wagon/dependency/1.0/dependency-1.0.jar
new file mode 100644
index 0000000000000000000000000000000000000000..c7c00e8cce3c42d98a2cd36b37cee7d6e3a53168
GIT binary patch
literal 2045
zcmWIWW@h1H0D*H&qUK-*l;8x?zOEsTx}JV+`T<a791LfH%0d?_6{G>BYk*h;S(&e+
zpQoE^aEP9-+h^Z1r+vJ2^)B*y>uQ}lbAEG>!4=~NPm6TC&YjTl)^*}wf3hTOikS8R
zm5QBnx`TwhgMv%uYONKK;TD=~93)yJd^+eeP{zx+*z3R}PuG>IssfE7vFoSgOnAAh
zitQuYvpq3;Vi;iVVqiFf=6r6TyYh2V(u?v-3p`VhJOEO->f4fkA&d+R;!F?^ASrY#
zD9}sJNh~hT4Lt32I6%O5`+A$6+}zyS?ANQfW-aaRQfSg(5!EVv_-Y&P$7!?gOi*i@
zzm%I*ysklB)$fv%rb)NunVFWx>3Mbk_tj50&dKLHWkcSA#$|oH!n1E&+ORgUePM|n
zlVH5T6KnU{wnI~;cJhe2v%HIa#DC|-M1B=RQ+M8-Z$5i0`Prj$L_g_JK<N~j%86cw
zZcnV0Y>Qp>BZh_N?77Xx&(`0WX7k}qoJ{9|*J;%iPbO~Kx8zL1w-6!TyV(=pUC4Zp
zc`L=Sd0pc5Lvr6F*GPwZU9Ae5D6`d6CL&|u*?_n$PS2ikzhh4>m(UN`yWR86uado9
zD=y5~C3vb%LEBKWXs3VMEAI?8T_0o5bTg~d>s+K=tG<6Z-MI9frqq<1Ej=45{;+<V
zH`TXmY0s4nP8VmH39J*6(pYRHJU{ht$8U#q)Bd|8+8t0~IaxaCY`esYq}~bt60b%6
zXGcUAdTQfGPDZ(jWvO}aD8o#eQkaU7Vi30_N_h1Z6y;~7CYQkN<zQF`Oe*b$#qLSK
zq$17Cz@SN#{(}5my^7qN-k^h7hYfi4e%E%oxwUN9H-oO{zZax7AH1=4$HrN!yx$~P
zdmg{B|9sgcRY{Su&GY6h`L440)C=Pjy`589H}!v>Tzs|dQjp1ljukFtOpAQ|;^&o@
z_y$cnXZ`G1(#Pp{x9MhvPb{Cm%=_2A+xvbU3epLPR1abM969MnS8wl!u=GO<!~RQ5
zzmw#WaB<D|mv*Y++RyLwCoG*7u%~h3KI?v7iMa`lQ>0_V{U^P4`sVMpKH>!T;}04}
z&kxsG_w;RW_-JM4(x>%2JyAmT(1e^{k=~n9wn*}ZEoxbq+QSqxyXpRhlNlatlUlf@
zuuN6F!O*ktJfB3Q^>wbhM?!u2W4`pPT<@_<D{f-DJzLVPv|UW^4*Yuc?(WKk!Iq16
zgr8A~O8*ehe))ZikmZyGG4Xi|E{V-GYnGfM^Eb0#g4ndeBTRpmas6-an!K&=Uaf2k
zYv;4sLQd^=`*(9EEql9nhji2*-QB-G+~kKvG^9{k8y0gh9vDF>Kx{yCL;)kcAhoC@
zGqpIl%>S&nu9uFdZ=lDjkPp5(-e(^N@oD;o7U=kf8yJNcm~1vO+GJ!DT)@j0XkcVu
z@LUU8vYB2ne&VHnN?-Sb&&IRoJsXX73UzxKT^5?`-LQz&^=IVDld7PSijhf#8Fx_&
zbTJSJFuZjH(MSa^OdIy17o->jmNcpZNw_wof*9FiY=tCPJJ{m=Kqg8)LRgKh(1d6N
zS^WZ4BfJPjwi;W8M_8Q)EQsNbhh=}5_1Fslgyz|pnz4EV(;QHNfH3DWUULw|1I%66
z3kaBrOB#iNMFyIuklY0`4_aIx!U}tGMi{$?g;-+|i95iXl?`M9ClJ;Fy_v}h;sF5n
CIh%6;

literal 0
HcmV?d00001

diff --git a/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/wagon/dependency/1.0/dependency-1.0.jar.sha1 b/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/wagon/dependency/1.0/dependency-1.0.jar.sha1
new file mode 100644
index 000000000..ad5066ce3
--- /dev/null
+++ b/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/wagon/dependency/1.0/dependency-1.0.jar.sha1
@@ -0,0 +1 @@
+b530516717ab5b3052fd3cdca860fc28574bd718
\ No newline at end of file
diff --git a/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/wagon/dependency/1.0/dependency-1.0.pom b/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/wagon/dependency/1.0/dependency-1.0.pom
new file mode 100644
index 000000000..f9fed21d3
--- /dev/null
+++ b/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/wagon/dependency/1.0/dependency-1.0.pom
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project>
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>org.apache.maven.its.resolver-transport.wagon</groupId>
+    <artifactId>dependency</artifactId>
+    <version>1.0</version>
+    <packaging>jar</packaging>
+
+    <name>Maven Integration Test :: resolver-transport :: wagon</name>
+    <description>
+        Verify that Maven transport Wagon works.
+    </description>
+</project>
diff --git a/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/wagon/dependency/1.0/dependency-1.0.pom.sha1 b/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/wagon/dependency/1.0/dependency-1.0.pom.sha1
new file mode 100644
index 000000000..f4443cd56
--- /dev/null
+++ b/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/wagon/dependency/1.0/dependency-1.0.pom.sha1
@@ -0,0 +1 @@
+97641443fee307b6c3593080be865df89ace3d86
diff --git a/core-it-suite/src/test/resources/mng-7470-resolver-transport/settings-template.xml b/core-it-suite/src/test/resources/mng-7470-resolver-transport/settings-template.xml
new file mode 100644
index 000000000..58c6e14f8
--- /dev/null
+++ b/core-it-suite/src/test/resources/mng-7470-resolver-transport/settings-template.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<settings>
+  <profiles>
+    <profile>
+      <id>maven-core-it-repo</id>
+      <repositories>
+        <repository>
+          <id>maven-core-it</id>
+          <url>http://localhost:@port@</url>
+          <releases>
+            <enabled>true</enabled>
+          </releases>
+          <snapshots>
+            <enabled>true</enabled>
+          </snapshots>
+        </repository>
+      </repositories>
+    </profile>
+  </profiles>
+</settings>
diff --git a/core-it-suite/src/test/resources/mng-7470-resolver-transport/wagon/pom.xml b/core-it-suite/src/test/resources/mng-7470-resolver-transport/wagon/pom.xml
new file mode 100644
index 000000000..ced327b9e
--- /dev/null
+++ b/core-it-suite/src/test/resources/mng-7470-resolver-transport/wagon/pom.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project>
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.apache.maven.its.resolver-transport.wagon</groupId>
+  <artifactId>artifact</artifactId>
+  <version>0.1</version>
+  <packaging>jar</packaging>
+
+  <name>Maven Integration Test :: resolver-transport :: wagon</name>
+  <description>
+    Verify that Maven transport Wagon works.
+  </description>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.maven.its.resolver-transport.wagon</groupId>
+      <artifactId>dependency</artifactId>
+      <version>1.0</version>
+    </dependency>
+  </dependencies>
+</project>

From fbfb1ddeef2a56b891c61697a1292269557b30e3 Mon Sep 17 00:00:00 2001
From: Tamas Cservenak <tamas@cservenak.net>
Date: Wed, 11 May 2022 10:36:03 +0200
Subject: [PATCH 02/14] Add spaces

---
 .../apache/maven/it/MavenITmng7470ResolverTransportTest.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 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 61a906a35..4772c9cd2 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
@@ -39,7 +39,7 @@ public void testResolverTransportWagon()
             verifier.deleteArtifacts( "org.apache.maven.its.resolver-transport.wagon" );
             verifier.addCliOption( "-X" );
             verifier.addCliOption("-s" );
-            verifier.addCliOption(new File( testDir, "settings.xml" ).getAbsolutePath() );
+            verifier.addCliOption( new File( testDir, "settings.xml" ).getAbsolutePath() );
             verifier.addCliOption( "-Pmaven-core-it-repo" );
             verifier.addCliOption( "-Dmaven.resolver.transport=wagon" );
             verifier.executeGoal( "verify" );
@@ -74,7 +74,7 @@ public void testResolverTransportNative()
             verifier.deleteArtifacts( "org.apache.maven.its.resolver-transport.native" );
             verifier.addCliOption( "-X" );
             verifier.addCliOption("-s" );
-            verifier.addCliOption(new File( testDir, "settings.xml" ).getAbsolutePath() );
+            verifier.addCliOption( new File( testDir, "settings.xml" ).getAbsolutePath() );
             verifier.addCliOption( "-Pmaven-core-it-repo" );
             verifier.addCliOption( "-Dmaven.resolver.transport=native" );
             verifier.executeGoal( "verify" );

From 9f9cf45f1dc0019000a903b9689f5ff970e322a3 Mon Sep 17 00:00:00 2001
From: Tamas Cservenak <tamas@cservenak.net>
Date: Wed, 11 May 2022 10:40:59 +0200
Subject: [PATCH 03/14] Fix repo POM GAVs

---
 .../native/dependency/1.0/dependency-1.0.pom                | 6 +++---
 .../wagon/dependency/1.0/dependency-1.0.pom                 | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/native/dependency/1.0/dependency-1.0.pom b/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/native/dependency/1.0/dependency-1.0.pom
index f9fed21d3..5003ebc80 100644
--- a/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/native/dependency/1.0/dependency-1.0.pom
+++ b/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/native/dependency/1.0/dependency-1.0.pom
@@ -22,13 +22,13 @@ under the License.
 <project>
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.apache.maven.its.resolver-transport.wagon</groupId>
+    <groupId>org.apache.maven.its.resolver-transport.native</groupId>
     <artifactId>dependency</artifactId>
     <version>1.0</version>
     <packaging>jar</packaging>
 
-    <name>Maven Integration Test :: resolver-transport :: wagon</name>
+    <name>Maven Integration Test :: resolver-transport :: native</name>
     <description>
-        Verify that Maven transport Wagon works.
+        Dependency pulled with native transport.
     </description>
 </project>
diff --git a/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/wagon/dependency/1.0/dependency-1.0.pom b/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/wagon/dependency/1.0/dependency-1.0.pom
index f9fed21d3..14648107d 100644
--- a/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/wagon/dependency/1.0/dependency-1.0.pom
+++ b/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/wagon/dependency/1.0/dependency-1.0.pom
@@ -29,6 +29,6 @@ under the License.
 
     <name>Maven Integration Test :: resolver-transport :: wagon</name>
     <description>
-        Verify that Maven transport Wagon works.
+        Dependency pulled with Wagon transport.
     </description>
 </project>

From bc46631427e9f4a9b0053b172a6e6390962cd64e Mon Sep 17 00:00:00 2001
From: Tamas Cservenak <tamas@cservenak.net>
Date: Wed, 11 May 2022 10:42:53 +0200
Subject: [PATCH 04/14] Explain intent

---
 .../maven/it/MavenITmng7470ResolverTransportTest.java       | 6 ++++++
 1 file changed, 6 insertions(+)

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 4772c9cd2..47c88a975 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
@@ -42,6 +42,9 @@ public void testResolverTransportWagon()
             verifier.addCliOption( new File( testDir, "settings.xml" ).getAbsolutePath() );
             verifier.addCliOption( "-Pmaven-core-it-repo" );
             verifier.addCliOption( "-Dmaven.resolver.transport=wagon" );
+            // Maven will fail if project dependencies cannot be resolved.
+            // As dependency exists ONLY in HTTP repo, it MUST be reached using selected transport and
+            // successfully resolved from it.
             verifier.executeGoal( "verify" );
             verifier.verifyErrorFreeLog();
             verifier.resetStreams();
@@ -77,6 +80,9 @@ public void testResolverTransportNative()
             verifier.addCliOption( new File( testDir, "settings.xml" ).getAbsolutePath() );
             verifier.addCliOption( "-Pmaven-core-it-repo" );
             verifier.addCliOption( "-Dmaven.resolver.transport=native" );
+            // Maven will fail if project dependencies cannot be resolved.
+            // As dependency exists ONLY in HTTP repo, it MUST be reached using selected transport and
+            // successfully resolved from it.
             verifier.executeGoal( "verify" );
             verifier.verifyErrorFreeLog();
             verifier.resetStreams();

From 3a4078649c222720338f8219445cc73a4b78688c Mon Sep 17 00:00:00 2001
From: Tamas Cservenak <tamas@cservenak.net>
Date: Wed, 11 May 2022 11:41:25 +0200
Subject: [PATCH 05/14] Add in the twist

---
 .../MavenITmng7470ResolverTransportTest.java  |   4 +-
 .../test/resources/bootstrap/group-15/pom.xml |  69 ++++++++
 .../src/test/resources/bootstrap/pom.xml      |   1 +
 .../native/pom.xml                            |  28 +++-
 .../dependency/1.0/dependency-1.0.pom.sha1    |   3 +-
 .../dependency/1.0/dependency-1.0.pom.sha1    |   3 +-
 .../resolver-demo-maven-plugin-1.7.3.jar      | Bin 0 -> 11819 bytes
 .../resolver-demo-maven-plugin-1.7.3.jar.sha1 |   1 +
 .../resolver-demo-maven-plugin-1.7.3.pom      | 149 ++++++++++++++++++
 .../resolver-demo-maven-plugin-1.7.3.pom.sha1 |   1 +
 .../settings-template.xml                     |  12 ++
 .../mng-7470-resolver-transport/wagon/pom.xml |  28 +++-
 12 files changed, 281 insertions(+), 18 deletions(-)
 create mode 100644 core-it-suite/src/test/resources/bootstrap/group-15/pom.xml
 create mode 100644 core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/resolver/resolver-demo-maven-plugin/1.7.3/resolver-demo-maven-plugin-1.7.3.jar
 create mode 100644 core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/resolver/resolver-demo-maven-plugin/1.7.3/resolver-demo-maven-plugin-1.7.3.jar.sha1
 create mode 100644 core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/resolver/resolver-demo-maven-plugin/1.7.3/resolver-demo-maven-plugin-1.7.3.pom
 create mode 100644 core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/resolver/resolver-demo-maven-plugin/1.7.3/resolver-demo-maven-plugin-1.7.3.pom.sha1

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 47c88a975..e81bf02e1 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
@@ -36,7 +36,7 @@ public void testResolverTransportWagon()
 
             verifier = newVerifier( new File( testDir, "wagon" ).getAbsolutePath() );
             verifier.deleteDirectory( "target" );
-            verifier.deleteArtifacts( "org.apache.maven.its.resolver-transport.wagon" );
+            verifier.deleteArtifacts( "org.apache.maven.its.resolver-transport" );
             verifier.addCliOption( "-X" );
             verifier.addCliOption("-s" );
             verifier.addCliOption( new File( testDir, "settings.xml" ).getAbsolutePath() );
@@ -74,7 +74,7 @@ public void testResolverTransportNative()
 
             verifier = newVerifier( new File( testDir, "native" ).getAbsolutePath() );
             verifier.deleteDirectory( "target" );
-            verifier.deleteArtifacts( "org.apache.maven.its.resolver-transport.native" );
+            verifier.deleteArtifacts( "org.apache.maven.its.resolver-transport" );
             verifier.addCliOption( "-X" );
             verifier.addCliOption("-s" );
             verifier.addCliOption( new File( testDir, "settings.xml" ).getAbsolutePath() );
diff --git a/core-it-suite/src/test/resources/bootstrap/group-15/pom.xml b/core-it-suite/src/test/resources/bootstrap/group-15/pom.xml
new file mode 100644
index 000000000..4b85d1395
--- /dev/null
+++ b/core-it-suite/src/test/resources/bootstrap/group-15/pom.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project>
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.maven.its.bootstrap</groupId>
+    <artifactId>maven-it-boostrap</artifactId>
+    <version>1.0</version>
+  </parent>
+
+  <groupId>org.apache.maven.its.bootstrap</groupId>
+  <artifactId>group-15</artifactId>
+  <version>1.0</version>
+  <packaging>jar</packaging>
+
+  <name>Maven Integration Test :: Boostrap :: Group-15 :: Resolver 1.7.3</name>
+
+  <properties>
+    <resolverVersion>1.7.3</resolverVersion>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.maven.resolver</groupId>
+      <artifactId>maven-resolver-api</artifactId>
+      <version>${resolverVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.resolver</groupId>
+      <artifactId>maven-resolver-spi</artifactId>
+      <version>${resolverVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.resolver</groupId>
+      <artifactId>maven-resolver-util</artifactId>
+      <version>${resolverVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.resolver</groupId>
+      <artifactId>maven-resolver-impl</artifactId>
+      <version>${resolverVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.resolver</groupId>
+      <artifactId>maven-resolver-connector-basic</artifactId>
+      <version>${resolverVersion}</version>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/core-it-suite/src/test/resources/bootstrap/pom.xml b/core-it-suite/src/test/resources/bootstrap/pom.xml
index d32b27440..c4f82317e 100644
--- a/core-it-suite/src/test/resources/bootstrap/pom.xml
+++ b/core-it-suite/src/test/resources/bootstrap/pom.xml
@@ -51,6 +51,7 @@ under the License.
     <module>group-12</module>
     <module>group-13</module>
     <module>group-14</module>
+    <module>group-15</module>
   </modules>
 
   <properties>
diff --git a/core-it-suite/src/test/resources/mng-7470-resolver-transport/native/pom.xml b/core-it-suite/src/test/resources/mng-7470-resolver-transport/native/pom.xml
index ce114fcaf..a1bb0dae8 100644
--- a/core-it-suite/src/test/resources/mng-7470-resolver-transport/native/pom.xml
+++ b/core-it-suite/src/test/resources/mng-7470-resolver-transport/native/pom.xml
@@ -32,11 +32,25 @@ under the License.
     Verify that Maven transport Native works.
   </description>
 
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.maven.its.resolver-transport.native</groupId>
-      <artifactId>dependency</artifactId>
-      <version>1.0</version>
-    </dependency>
-  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.resolver</groupId>
+        <artifactId>resolver-demo-maven-plugin</artifactId>
+        <version>1.7.3</version>
+        <executions>
+          <execution>
+            <id>resolve</id>
+            <phase>validate</phase>
+            <goals>
+              <goal>resolve-artifact</goal>
+            </goals>
+            <configuration>
+              <artifactCoords>org.apache.maven.its.resolver-transport.native:dependency:1.0</artifactCoords>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/native/dependency/1.0/dependency-1.0.pom.sha1 b/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/native/dependency/1.0/dependency-1.0.pom.sha1
index f4443cd56..0d2f47205 100644
--- a/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/native/dependency/1.0/dependency-1.0.pom.sha1
+++ b/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/native/dependency/1.0/dependency-1.0.pom.sha1
@@ -1 +1,2 @@
-97641443fee307b6c3593080be865df89ace3d86
+ced6fe1ccb07d5362145f971fd6ed32ddff322e9
+
diff --git a/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/wagon/dependency/1.0/dependency-1.0.pom.sha1 b/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/wagon/dependency/1.0/dependency-1.0.pom.sha1
index f4443cd56..ccf73b5e2 100644
--- a/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/wagon/dependency/1.0/dependency-1.0.pom.sha1
+++ b/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/wagon/dependency/1.0/dependency-1.0.pom.sha1
@@ -1 +1,2 @@
-97641443fee307b6c3593080be865df89ace3d86
+cd16a85341375c7f9dda5edd75dedb83e213e425
+
diff --git a/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/resolver/resolver-demo-maven-plugin/1.7.3/resolver-demo-maven-plugin-1.7.3.jar b/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/resolver/resolver-demo-maven-plugin/1.7.3/resolver-demo-maven-plugin-1.7.3.jar
new file mode 100644
index 0000000000000000000000000000000000000000..4da7b24737b71073a43496f71922d484bbe9a6cf
GIT binary patch
literal 11819
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
Xo}wfN4f8z*#^V><;~O%~_n-a;lb78`

literal 0
HcmV?d00001

diff --git a/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/resolver/resolver-demo-maven-plugin/1.7.3/resolver-demo-maven-plugin-1.7.3.jar.sha1 b/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/resolver/resolver-demo-maven-plugin/1.7.3/resolver-demo-maven-plugin-1.7.3.jar.sha1
new file mode 100644
index 000000000..b4aceb3db
--- /dev/null
+++ b/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/resolver/resolver-demo-maven-plugin/1.7.3/resolver-demo-maven-plugin-1.7.3.jar.sha1
@@ -0,0 +1 @@
+ed81d315b44e79187fe8ad71b7b2665ac9b95f08
diff --git a/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/resolver/resolver-demo-maven-plugin/1.7.3/resolver-demo-maven-plugin-1.7.3.pom b/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/resolver/resolver-demo-maven-plugin/1.7.3/resolver-demo-maven-plugin-1.7.3.pom
new file mode 100644
index 000000000..acc467896
--- /dev/null
+++ b/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/resolver/resolver-demo-maven-plugin/1.7.3/resolver-demo-maven-plugin-1.7.3.pom
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.apache.maven.resolver</groupId>
+  <artifactId>resolver-demo-maven-plugin</artifactId>
+  <version>1.7.3</version>
+  <packaging>maven-plugin</packaging>
+
+  <name>Maven Artifact Resolver Demo Maven Plugin 1.7.3</name>
+
+  <prerequisites>
+    <maven>3.8.5</maven>
+  </prerequisites>
+
+  <properties>
+    <mavenVersion>3.8.5</mavenVersion>
+    <resolverVersion>1.7.3</resolverVersion>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-plugin-api</artifactId>
+      <version>3.5.0</version>
+      <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.maven</groupId>
+          <artifactId>maven-model</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.maven</groupId>
+          <artifactId>maven-artifact</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.eclipse.sisu</groupId>
+          <artifactId>org.eclipse.sisu.plexus</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.resolver</groupId>
+      <artifactId>maven-resolver-api</artifactId>
+      <version>${resolverVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.resolver</groupId>
+      <artifactId>maven-resolver-spi</artifactId>
+      <version>${resolverVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.resolver</groupId>
+      <artifactId>maven-resolver-util</artifactId>
+      <version>${resolverVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.resolver</groupId>
+      <artifactId>maven-resolver-impl</artifactId>
+      <version>${resolverVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.resolver</groupId>
+      <artifactId>maven-resolver-connector-basic</artifactId>
+      <version>${resolverVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.7.5</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <!-- This is needed to prevent jar plugin to fail based on wrong automatic module name. -->
+          <archive combine.self="override" />
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <profiles>
+    <profile>
+      <id>run-its</id>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-invoker-plugin</artifactId>
+            <version>3.2.2</version>
+            <configuration>
+              <debug>false</debug>
+              <projectsDirectory>src/it</projectsDirectory>
+              <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
+              <pomIncludes>
+                <pomInclude>*/pom.xml</pomInclude>
+              </pomIncludes>
+              <preBuildHookScript>setup</preBuildHookScript>
+              <postBuildHookScript>verify</postBuildHookScript>
+              <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
+              <settingsFile>src/it/settings.xml</settingsFile>
+              <goals>
+                <goal>clean</goal>
+                <goal>validate</goal>
+              </goals>
+              <properties>
+                <!-- e.g. ensure that Java7 picks up TLSv1.2 when connecting with Central -->
+                <https.protocols>${https.protocols}</https.protocols>
+              </properties>
+            </configuration>
+            <executions>
+              <execution>
+                <id>integration-test</id>
+                <goals>
+                  <goal>install</goal>
+                  <goal>run</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+</project>
diff --git a/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/resolver/resolver-demo-maven-plugin/1.7.3/resolver-demo-maven-plugin-1.7.3.pom.sha1 b/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/resolver/resolver-demo-maven-plugin/1.7.3/resolver-demo-maven-plugin-1.7.3.pom.sha1
new file mode 100644
index 000000000..b4aceb3db
--- /dev/null
+++ b/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/resolver/resolver-demo-maven-plugin/1.7.3/resolver-demo-maven-plugin-1.7.3.pom.sha1
@@ -0,0 +1 @@
+ed81d315b44e79187fe8ad71b7b2665ac9b95f08
diff --git a/core-it-suite/src/test/resources/mng-7470-resolver-transport/settings-template.xml b/core-it-suite/src/test/resources/mng-7470-resolver-transport/settings-template.xml
index 58c6e14f8..ad1eed436 100644
--- a/core-it-suite/src/test/resources/mng-7470-resolver-transport/settings-template.xml
+++ b/core-it-suite/src/test/resources/mng-7470-resolver-transport/settings-template.xml
@@ -35,6 +35,18 @@ under the License.
           </snapshots>
         </repository>
       </repositories>
+      <pluginRepositories>
+        <pluginRepository>
+          <id>maven-core-it</id>
+          <url>http://localhost:@port@</url>
+          <releases>
+            <enabled>true</enabled>
+          </releases>
+          <snapshots>
+            <enabled>true</enabled>
+          </snapshots>
+        </pluginRepository>
+      </pluginRepositories>
     </profile>
   </profiles>
 </settings>
diff --git a/core-it-suite/src/test/resources/mng-7470-resolver-transport/wagon/pom.xml b/core-it-suite/src/test/resources/mng-7470-resolver-transport/wagon/pom.xml
index ced327b9e..89aeca174 100644
--- a/core-it-suite/src/test/resources/mng-7470-resolver-transport/wagon/pom.xml
+++ b/core-it-suite/src/test/resources/mng-7470-resolver-transport/wagon/pom.xml
@@ -32,11 +32,25 @@ under the License.
     Verify that Maven transport Wagon works.
   </description>
 
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.maven.its.resolver-transport.wagon</groupId>
-      <artifactId>dependency</artifactId>
-      <version>1.0</version>
-    </dependency>
-  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.resolver</groupId>
+        <artifactId>resolver-demo-maven-plugin</artifactId>
+        <version>1.7.3</version>
+        <executions>
+          <execution>
+            <id>resolve</id>
+            <phase>validate</phase>
+            <goals>
+              <goal>resolve-artifact</goal>
+            </goals>
+            <configuration>
+              <artifactCoords>org.apache.maven.its.resolver-transport.wagon:dependency:1.0</artifactCoords>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 </project>

From 6d2435a411c54b1d475d41fb39331fa10bf7865a Mon Sep 17 00:00:00 2001
From: Tamas Cservenak <tamas@cservenak.net>
Date: Wed, 11 May 2022 12:05:23 +0200
Subject: [PATCH 06/14] Collaps two test projects into one, they are same

---
 .../MavenITmng7470ResolverTransportTest.java  |   4 +-
 .../native/pom.xml                            |  56 ------------------
 .../{wagon => project}/pom.xml                |  10 ++--
 .../dependency/1.0/dependency-1.0.jar         | Bin
 .../dependency/1.0/dependency-1.0.jar.sha1    |   0
 .../dependency/1.0/dependency-1.0.pom         |   6 +-
 .../dependency/1.0/dependency-1.0.pom.sha1    |   1 +
 .../native/dependency/1.0/dependency-1.0.pom  |  34 -----------
 .../dependency/1.0/dependency-1.0.pom.sha1    |   2 -
 .../wagon/dependency/1.0/dependency-1.0.jar   | Bin 2045 -> 0 bytes
 .../dependency/1.0/dependency-1.0.jar.sha1    |   1 -
 .../dependency/1.0/dependency-1.0.pom.sha1    |   2 -
 12 files changed, 11 insertions(+), 105 deletions(-)
 delete mode 100644 core-it-suite/src/test/resources/mng-7470-resolver-transport/native/pom.xml
 rename core-it-suite/src/test/resources/mng-7470-resolver-transport/{wagon => project}/pom.xml (85%)
 rename core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/{native => }/dependency/1.0/dependency-1.0.jar (100%)
 rename core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/{native => }/dependency/1.0/dependency-1.0.jar.sha1 (100%)
 rename core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/{wagon => }/dependency/1.0/dependency-1.0.pom (84%)
 create mode 100644 core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/dependency/1.0/dependency-1.0.pom.sha1
 delete mode 100644 core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/native/dependency/1.0/dependency-1.0.pom
 delete mode 100644 core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/native/dependency/1.0/dependency-1.0.pom.sha1
 delete mode 100644 core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/wagon/dependency/1.0/dependency-1.0.jar
 delete mode 100644 core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/wagon/dependency/1.0/dependency-1.0.jar.sha1
 delete mode 100644 core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/wagon/dependency/1.0/dependency-1.0.pom.sha1

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 e81bf02e1..43dcba08a 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
@@ -34,7 +34,7 @@ public void testResolverTransportWagon()
             properties.put( "@port@", Integer.toString( server.port() ) );
             verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", properties );
 
-            verifier = newVerifier( new File( testDir, "wagon" ).getAbsolutePath() );
+            verifier = newVerifier( new File( testDir, "project" ).getAbsolutePath() );
             verifier.deleteDirectory( "target" );
             verifier.deleteArtifacts( "org.apache.maven.its.resolver-transport" );
             verifier.addCliOption( "-X" );
@@ -72,7 +72,7 @@ public void testResolverTransportNative()
             properties.put( "@port@", Integer.toString( server.port() ) );
             verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", properties );
 
-            verifier = newVerifier( new File( testDir, "native" ).getAbsolutePath() );
+            verifier = newVerifier( new File( testDir, "project" ).getAbsolutePath() );
             verifier.deleteDirectory( "target" );
             verifier.deleteArtifacts( "org.apache.maven.its.resolver-transport" );
             verifier.addCliOption( "-X" );
diff --git a/core-it-suite/src/test/resources/mng-7470-resolver-transport/native/pom.xml b/core-it-suite/src/test/resources/mng-7470-resolver-transport/native/pom.xml
deleted file mode 100644
index a1bb0dae8..000000000
--- a/core-it-suite/src/test/resources/mng-7470-resolver-transport/native/pom.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project>
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>org.apache.maven.its.resolver-transport.native</groupId>
-  <artifactId>artifact</artifactId>
-  <version>0.1</version>
-  <packaging>jar</packaging>
-
-  <name>Maven Integration Test :: resolver-transport :: native</name>
-  <description>
-    Verify that Maven transport Native works.
-  </description>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.resolver</groupId>
-        <artifactId>resolver-demo-maven-plugin</artifactId>
-        <version>1.7.3</version>
-        <executions>
-          <execution>
-            <id>resolve</id>
-            <phase>validate</phase>
-            <goals>
-              <goal>resolve-artifact</goal>
-            </goals>
-            <configuration>
-              <artifactCoords>org.apache.maven.its.resolver-transport.native:dependency:1.0</artifactCoords>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/core-it-suite/src/test/resources/mng-7470-resolver-transport/wagon/pom.xml b/core-it-suite/src/test/resources/mng-7470-resolver-transport/project/pom.xml
similarity index 85%
rename from core-it-suite/src/test/resources/mng-7470-resolver-transport/wagon/pom.xml
rename to core-it-suite/src/test/resources/mng-7470-resolver-transport/project/pom.xml
index 89aeca174..9759c899b 100644
--- a/core-it-suite/src/test/resources/mng-7470-resolver-transport/wagon/pom.xml
+++ b/core-it-suite/src/test/resources/mng-7470-resolver-transport/project/pom.xml
@@ -22,14 +22,14 @@ under the License.
 <project>
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>org.apache.maven.its.resolver-transport.wagon</groupId>
-  <artifactId>artifact</artifactId>
+  <groupId>org.apache.maven.its.resolver-transport</groupId>
+  <artifactId>project</artifactId>
   <version>0.1</version>
   <packaging>jar</packaging>
 
-  <name>Maven Integration Test :: resolver-transport :: wagon</name>
+  <name>Maven Integration Test :: resolver-transport</name>
   <description>
-    Verify that Maven transport Wagon works.
+    Verify that Maven transport works.
   </description>
 
   <build>
@@ -46,7 +46,7 @@ under the License.
               <goal>resolve-artifact</goal>
             </goals>
             <configuration>
-              <artifactCoords>org.apache.maven.its.resolver-transport.wagon:dependency:1.0</artifactCoords>
+              <artifactCoords>org.apache.maven.its.resolver-transport:dependency:1.0</artifactCoords>
             </configuration>
           </execution>
         </executions>
diff --git a/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/native/dependency/1.0/dependency-1.0.jar b/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/dependency/1.0/dependency-1.0.jar
similarity index 100%
rename from core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/native/dependency/1.0/dependency-1.0.jar
rename to core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/dependency/1.0/dependency-1.0.jar
diff --git a/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/native/dependency/1.0/dependency-1.0.jar.sha1 b/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/dependency/1.0/dependency-1.0.jar.sha1
similarity index 100%
rename from core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/native/dependency/1.0/dependency-1.0.jar.sha1
rename to core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/dependency/1.0/dependency-1.0.jar.sha1
diff --git a/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/wagon/dependency/1.0/dependency-1.0.pom b/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/dependency/1.0/dependency-1.0.pom
similarity index 84%
rename from core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/wagon/dependency/1.0/dependency-1.0.pom
rename to core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/dependency/1.0/dependency-1.0.pom
index 14648107d..2a2c030d4 100644
--- a/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/wagon/dependency/1.0/dependency-1.0.pom
+++ b/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/dependency/1.0/dependency-1.0.pom
@@ -22,13 +22,13 @@ under the License.
 <project>
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.apache.maven.its.resolver-transport.wagon</groupId>
+    <groupId>org.apache.maven.its.resolver-transport</groupId>
     <artifactId>dependency</artifactId>
     <version>1.0</version>
     <packaging>jar</packaging>
 
-    <name>Maven Integration Test :: resolver-transport :: wagon</name>
+    <name>Maven Integration Test :: resolver-transport :: dependency</name>
     <description>
-        Dependency pulled with Wagon transport.
+        Dependency pulled with transport.
     </description>
 </project>
diff --git a/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/dependency/1.0/dependency-1.0.pom.sha1 b/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/dependency/1.0/dependency-1.0.pom.sha1
new file mode 100644
index 000000000..c37fcd4b7
--- /dev/null
+++ b/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/dependency/1.0/dependency-1.0.pom.sha1
@@ -0,0 +1 @@
+b58c041fe630e9248109e305c5d2d0c5fea978a3
diff --git a/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/native/dependency/1.0/dependency-1.0.pom b/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/native/dependency/1.0/dependency-1.0.pom
deleted file mode 100644
index 5003ebc80..000000000
--- a/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/native/dependency/1.0/dependency-1.0.pom
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project>
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>org.apache.maven.its.resolver-transport.native</groupId>
-    <artifactId>dependency</artifactId>
-    <version>1.0</version>
-    <packaging>jar</packaging>
-
-    <name>Maven Integration Test :: resolver-transport :: native</name>
-    <description>
-        Dependency pulled with native transport.
-    </description>
-</project>
diff --git a/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/native/dependency/1.0/dependency-1.0.pom.sha1 b/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/native/dependency/1.0/dependency-1.0.pom.sha1
deleted file mode 100644
index 0d2f47205..000000000
--- a/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/native/dependency/1.0/dependency-1.0.pom.sha1
+++ /dev/null
@@ -1,2 +0,0 @@
-ced6fe1ccb07d5362145f971fd6ed32ddff322e9
-
diff --git a/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/wagon/dependency/1.0/dependency-1.0.jar b/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/wagon/dependency/1.0/dependency-1.0.jar
deleted file mode 100644
index c7c00e8cce3c42d98a2cd36b37cee7d6e3a53168..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2045
zcmWIWW@h1H0D*H&qUK-*l;8x?zOEsTx}JV+`T<a791LfH%0d?_6{G>BYk*h;S(&e+
zpQoE^aEP9-+h^Z1r+vJ2^)B*y>uQ}lbAEG>!4=~NPm6TC&YjTl)^*}wf3hTOikS8R
zm5QBnx`TwhgMv%uYONKK;TD=~93)yJd^+eeP{zx+*z3R}PuG>IssfE7vFoSgOnAAh
zitQuYvpq3;Vi;iVVqiFf=6r6TyYh2V(u?v-3p`VhJOEO->f4fkA&d+R;!F?^ASrY#
zD9}sJNh~hT4Lt32I6%O5`+A$6+}zyS?ANQfW-aaRQfSg(5!EVv_-Y&P$7!?gOi*i@
zzm%I*ysklB)$fv%rb)NunVFWx>3Mbk_tj50&dKLHWkcSA#$|oH!n1E&+ORgUePM|n
zlVH5T6KnU{wnI~;cJhe2v%HIa#DC|-M1B=RQ+M8-Z$5i0`Prj$L_g_JK<N~j%86cw
zZcnV0Y>Qp>BZh_N?77Xx&(`0WX7k}qoJ{9|*J;%iPbO~Kx8zL1w-6!TyV(=pUC4Zp
zc`L=Sd0pc5Lvr6F*GPwZU9Ae5D6`d6CL&|u*?_n$PS2ikzhh4>m(UN`yWR86uado9
zD=y5~C3vb%LEBKWXs3VMEAI?8T_0o5bTg~d>s+K=tG<6Z-MI9frqq<1Ej=45{;+<V
zH`TXmY0s4nP8VmH39J*6(pYRHJU{ht$8U#q)Bd|8+8t0~IaxaCY`esYq}~bt60b%6
zXGcUAdTQfGPDZ(jWvO}aD8o#eQkaU7Vi30_N_h1Z6y;~7CYQkN<zQF`Oe*b$#qLSK
zq$17Cz@SN#{(}5my^7qN-k^h7hYfi4e%E%oxwUN9H-oO{zZax7AH1=4$HrN!yx$~P
zdmg{B|9sgcRY{Su&GY6h`L440)C=Pjy`589H}!v>Tzs|dQjp1ljukFtOpAQ|;^&o@
z_y$cnXZ`G1(#Pp{x9MhvPb{Cm%=_2A+xvbU3epLPR1abM969MnS8wl!u=GO<!~RQ5
zzmw#WaB<D|mv*Y++RyLwCoG*7u%~h3KI?v7iMa`lQ>0_V{U^P4`sVMpKH>!T;}04}
z&kxsG_w;RW_-JM4(x>%2JyAmT(1e^{k=~n9wn*}ZEoxbq+QSqxyXpRhlNlatlUlf@
zuuN6F!O*ktJfB3Q^>wbhM?!u2W4`pPT<@_<D{f-DJzLVPv|UW^4*Yuc?(WKk!Iq16
zgr8A~O8*ehe))ZikmZyGG4Xi|E{V-GYnGfM^Eb0#g4ndeBTRpmas6-an!K&=Uaf2k
zYv;4sLQd^=`*(9EEql9nhji2*-QB-G+~kKvG^9{k8y0gh9vDF>Kx{yCL;)kcAhoC@
zGqpIl%>S&nu9uFdZ=lDjkPp5(-e(^N@oD;o7U=kf8yJNcm~1vO+GJ!DT)@j0XkcVu
z@LUU8vYB2ne&VHnN?-Sb&&IRoJsXX73UzxKT^5?`-LQz&^=IVDld7PSijhf#8Fx_&
zbTJSJFuZjH(MSa^OdIy17o->jmNcpZNw_wof*9FiY=tCPJJ{m=Kqg8)LRgKh(1d6N
zS^WZ4BfJPjwi;W8M_8Q)EQsNbhh=}5_1Fslgyz|pnz4EV(;QHNfH3DWUULw|1I%66
z3kaBrOB#iNMFyIuklY0`4_aIx!U}tGMi{$?g;-+|i95iXl?`M9ClJ;Fy_v}h;sF5n
CIh%6;

diff --git a/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/wagon/dependency/1.0/dependency-1.0.jar.sha1 b/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/wagon/dependency/1.0/dependency-1.0.jar.sha1
deleted file mode 100644
index ad5066ce3..000000000
--- a/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/wagon/dependency/1.0/dependency-1.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b530516717ab5b3052fd3cdca860fc28574bd718
\ No newline at end of file
diff --git a/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/wagon/dependency/1.0/dependency-1.0.pom.sha1 b/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/wagon/dependency/1.0/dependency-1.0.pom.sha1
deleted file mode 100644
index ccf73b5e2..000000000
--- a/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/wagon/dependency/1.0/dependency-1.0.pom.sha1
+++ /dev/null
@@ -1,2 +0,0 @@
-cd16a85341375c7f9dda5edd75dedb83e213e425
-

From b07dd49477c26f57b072d243bd50f378df1a9da8 Mon Sep 17 00:00:00 2001
From: Tamas Cservenak <tamas@cservenak.net>
Date: Wed, 11 May 2022 12:26:31 +0200
Subject: [PATCH 07/14] Assert expected transport is used, that is logged as
 DEBUG

---
 .../MavenITmng7470ResolverTransportTest.java  | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

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 43dcba08a..9647f6a63 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
@@ -2,6 +2,7 @@
 
 import java.io.File;
 import java.util.HashMap;
+import java.util.List;
 
 import org.apache.maven.it.util.ResourceExtractor;
 
@@ -47,6 +48,8 @@ public void testResolverTransportWagon()
             // successfully resolved from it.
             verifier.executeGoal( "verify" );
             verifier.verifyErrorFreeLog();
+            // verify maven console output contains "[DEBUG] Using transporter WagonTransporter"
+            verifyLogHasLine( verifier, "[DEBUG] Using transporter WagonTransporter" );
             verifier.resetStreams();
         }
         finally
@@ -85,6 +88,8 @@ public void testResolverTransportNative()
             // successfully resolved from it.
             verifier.executeGoal( "verify" );
             verifier.verifyErrorFreeLog();
+            // verify maven console output contains "[DEBUG] Using transporter HttpTransporter"
+            verifyLogHasLine( verifier, "[DEBUG] Using transporter HttpTransporter" );
             verifier.resetStreams();
         }
         finally
@@ -92,4 +97,19 @@ public void testResolverTransportNative()
             server.stop();
         }
     }
+
+    public void verifyLogHasLine( final Verifier verifier, final String logline )
+            throws VerificationException
+    {
+        List<String> lines = verifier.loadFile( verifier.getBasedir(), verifier.getLogFileName(), false );
+
+        for ( String line : lines )
+        {
+            if ( !line.contains( logline ) )
+            {
+                return;
+            }
+        }
+        throw new VerificationException( "Expected snippet not present in log: " + logline );
+    }
 }

From 522f3d81631279e0773ed85fa7e4ad478cd1e697 Mon Sep 17 00:00:00 2001
From: Tamas Cservenak <tamas@cservenak.net>
Date: Wed, 11 May 2022 12:58:43 +0200
Subject: [PATCH 08/14] Separate logs, collapse test

---
 .../MavenITmng7470ResolverTransportTest.java  | 68 ++++++-------------
 1 file changed, 20 insertions(+), 48 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 9647f6a63..089e6defc 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
@@ -18,8 +18,7 @@ public MavenITmng7470ResolverTransportTest()
         super( "[3.9.0,)" );
     }
 
-    public void testResolverTransportWagon()
-            throws Exception
+    private void performTest( final String transport, final String logSnippet ) throws Exception
     {
         File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-7470-resolver-transport" );
 
@@ -36,20 +35,21 @@ public void testResolverTransportWagon()
             verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", properties );
 
             verifier = newVerifier( new File( testDir, "project" ).getAbsolutePath() );
+            verifier.setLogFileName( transport + "-transport.log" );
             verifier.deleteDirectory( "target" );
             verifier.deleteArtifacts( "org.apache.maven.its.resolver-transport" );
             verifier.addCliOption( "-X" );
             verifier.addCliOption("-s" );
             verifier.addCliOption( new File( testDir, "settings.xml" ).getAbsolutePath() );
             verifier.addCliOption( "-Pmaven-core-it-repo" );
-            verifier.addCliOption( "-Dmaven.resolver.transport=wagon" );
+            verifier.addCliOption( "-Dmaven.resolver.transport=" + transport );
             // Maven will fail if project dependencies cannot be resolved.
             // As dependency exists ONLY in HTTP repo, it MUST be reached using selected transport and
             // successfully resolved from it.
             verifier.executeGoal( "verify" );
             verifier.verifyErrorFreeLog();
-            // verify maven console output contains "[DEBUG] Using transporter WagonTransporter"
-            verifyLogHasLine( verifier, "[DEBUG] Using transporter WagonTransporter" );
+            // verify maven console output contains "[DEBUG] Using transporter XXXTransporter"
+            verifyLogHasLine( verifier, logSnippet );
             verifier.resetStreams();
         }
         finally
@@ -58,58 +58,30 @@ public void testResolverTransportWagon()
         }
     }
 
-    public void testResolverTransportNative()
-            throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-7470-resolver-transport" );
-
-        HttpServer server = HttpServer.builder()
-                .port( 0 )
-                .source( new File( testDir, "repo" ) )
-                .build();
-        server.start();
-        try
-        {
-            Verifier verifier = newVerifier( testDir.getAbsolutePath() );
-            HashMap<String, String> properties = new HashMap<>();
-            properties.put( "@port@", Integer.toString( server.port() ) );
-            verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", properties );
-
-            verifier = newVerifier( new File( testDir, "project" ).getAbsolutePath() );
-            verifier.deleteDirectory( "target" );
-            verifier.deleteArtifacts( "org.apache.maven.its.resolver-transport" );
-            verifier.addCliOption( "-X" );
-            verifier.addCliOption("-s" );
-            verifier.addCliOption( new File( testDir, "settings.xml" ).getAbsolutePath() );
-            verifier.addCliOption( "-Pmaven-core-it-repo" );
-            verifier.addCliOption( "-Dmaven.resolver.transport=native" );
-            // Maven will fail if project dependencies cannot be resolved.
-            // As dependency exists ONLY in HTTP repo, it MUST be reached using selected transport and
-            // successfully resolved from it.
-            verifier.executeGoal( "verify" );
-            verifier.verifyErrorFreeLog();
-            // verify maven console output contains "[DEBUG] Using transporter HttpTransporter"
-            verifyLogHasLine( verifier, "[DEBUG] Using transporter HttpTransporter" );
-            verifier.resetStreams();
-        }
-        finally
-        {
-            server.stop();
-        }
-    }
-
-    public void verifyLogHasLine( final Verifier verifier, final String logline )
+    private void verifyLogHasLine( final Verifier verifier, final String logSnippet )
             throws VerificationException
     {
         List<String> lines = verifier.loadFile( verifier.getBasedir(), verifier.getLogFileName(), false );
 
         for ( String line : lines )
         {
-            if ( !line.contains( logline ) )
+            if ( !line.contains( logSnippet ) )
             {
                 return;
             }
         }
-        throw new VerificationException( "Expected snippet not present in log: " + logline );
+        throw new VerificationException( "Expected snippet not present in log: " + logSnippet );
+    }
+
+    public void testResolverTransportWagon()
+            throws Exception
+    {
+        performTest( "wagon", "[DEBUG] Using transporter WagonTransporter" );
+    }
+
+    public void testResolverTransportNative()
+            throws Exception
+    {
+        performTest( "native", "[DEBUG] Using transporter HttpTransporter" );
     }
 }

From ce7d1ef819ab97c1fa5358b5ee5c2905f9cb7004 Mon Sep 17 00:00:00 2001
From: Tamas Cservenak <tamas@cservenak.net>
Date: Wed, 11 May 2022 13:08:14 +0200
Subject: [PATCH 09/14] Simplify POM for demo plugin

---
 .../resolver-demo-maven-plugin-1.7.3.pom      | 67 +++----------------
 .../resolver-demo-maven-plugin-1.7.3.pom.sha1 |  3 +-
 2 files changed, 12 insertions(+), 58 deletions(-)

diff --git a/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/resolver/resolver-demo-maven-plugin/1.7.3/resolver-demo-maven-plugin-1.7.3.pom b/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/resolver/resolver-demo-maven-plugin/1.7.3/resolver-demo-maven-plugin-1.7.3.pom
index acc467896..3c2d2ff16 100644
--- a/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/resolver/resolver-demo-maven-plugin/1.7.3/resolver-demo-maven-plugin-1.7.3.pom
+++ b/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/resolver/resolver-demo-maven-plugin/1.7.3/resolver-demo-maven-plugin-1.7.3.pom
@@ -30,7 +30,7 @@
   <name>Maven Artifact Resolver Demo Maven Plugin 1.7.3</name>
 
   <prerequisites>
-    <maven>3.8.5</maven>
+    <maven>${mavenVersion}</maven>
   </prerequisites>
 
   <properties>
@@ -42,7 +42,7 @@
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>3.5.0</version>
+      <version>${mavenVersion}</version>
       <scope>provided</scope>
       <exclusions>
         <exclusion>
@@ -63,7 +63,15 @@
       <groupId>org.apache.maven.resolver</groupId>
       <artifactId>maven-resolver-api</artifactId>
       <version>${resolverVersion}</version>
+      <scope>provided</scope>
     </dependency>
+
+    <!--
+    These dependencies BELOW are NOT USED by plugin,
+    but are here to mimic what other not quite nicely written plugins do:
+    they pull all resolver that are transitive dependencies of some maven
+    artifact they use
+    -->
     <dependency>
       <groupId>org.apache.maven.resolver</groupId>
       <artifactId>maven-resolver-spi</artifactId>
@@ -91,59 +99,4 @@
       <scope>provided</scope>
     </dependency>
   </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <configuration>
-          <!-- This is needed to prevent jar plugin to fail based on wrong automatic module name. -->
-          <archive combine.self="override" />
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <profiles>
-    <profile>
-      <id>run-its</id>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-invoker-plugin</artifactId>
-            <version>3.2.2</version>
-            <configuration>
-              <debug>false</debug>
-              <projectsDirectory>src/it</projectsDirectory>
-              <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
-              <pomIncludes>
-                <pomInclude>*/pom.xml</pomInclude>
-              </pomIncludes>
-              <preBuildHookScript>setup</preBuildHookScript>
-              <postBuildHookScript>verify</postBuildHookScript>
-              <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
-              <settingsFile>src/it/settings.xml</settingsFile>
-              <goals>
-                <goal>clean</goal>
-                <goal>validate</goal>
-              </goals>
-              <properties>
-                <!-- e.g. ensure that Java7 picks up TLSv1.2 when connecting with Central -->
-                <https.protocols>${https.protocols}</https.protocols>
-              </properties>
-            </configuration>
-            <executions>
-              <execution>
-                <id>integration-test</id>
-                <goals>
-                  <goal>install</goal>
-                  <goal>run</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
 </project>
diff --git a/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/resolver/resolver-demo-maven-plugin/1.7.3/resolver-demo-maven-plugin-1.7.3.pom.sha1 b/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/resolver/resolver-demo-maven-plugin/1.7.3/resolver-demo-maven-plugin-1.7.3.pom.sha1
index b4aceb3db..16cf77b8b 100644
--- a/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/resolver/resolver-demo-maven-plugin/1.7.3/resolver-demo-maven-plugin-1.7.3.pom.sha1
+++ b/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/resolver/resolver-demo-maven-plugin/1.7.3/resolver-demo-maven-plugin-1.7.3.pom.sha1
@@ -1 +1,2 @@
-ed81d315b44e79187fe8ad71b7b2665ac9b95f08
+2a2ae11ad8e4c90eb3d48f3621b5d20eafea3ae3
+

From e9b61ebc2138bd509b4f1aa8ab2e7995b275c965 Mon Sep 17 00:00:00 2001
From: Tamas Cservenak <tamas@cservenak.net>
Date: Wed, 11 May 2022 13:13:10 +0200
Subject: [PATCH 10/14] Fix log snippet verification

---
 .../apache/maven/it/MavenITmng7470ResolverTransportTest.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 089e6defc..92cb358df 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
@@ -65,7 +65,7 @@ private void verifyLogHasLine( final Verifier verifier, final String logSnippet
 
         for ( String line : lines )
         {
-            if ( !line.contains( logSnippet ) )
+            if ( line.contains( logSnippet ) )
             {
                 return;
             }

From 33b6194e3924e388946eeb7a591a55007e8e2bae Mon Sep 17 00:00:00 2001
From: Tamas Cservenak <tamas@cservenak.net>
Date: Wed, 11 May 2022 15:40:52 +0200
Subject: [PATCH 11/14] Apply PR comments

---
 .../apache/maven/it/MavenITmng7470ResolverTransportTest.java | 5 ++---
 1 file changed, 2 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 92cb358df..81d6b9a8a 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
@@ -39,7 +39,7 @@ private void performTest( final String transport, final String logSnippet ) thro
             verifier.deleteDirectory( "target" );
             verifier.deleteArtifacts( "org.apache.maven.its.resolver-transport" );
             verifier.addCliOption( "-X" );
-            verifier.addCliOption("-s" );
+            verifier.addCliOption( "-s" );
             verifier.addCliOption( new File( testDir, "settings.xml" ).getAbsolutePath() );
             verifier.addCliOption( "-Pmaven-core-it-repo" );
             verifier.addCliOption( "-Dmaven.resolver.transport=" + transport );
@@ -62,7 +62,6 @@ private void verifyLogHasLine( final Verifier verifier, final String logSnippet
             throws VerificationException
     {
         List<String> lines = verifier.loadFile( verifier.getBasedir(), verifier.getLogFileName(), false );
-
         for ( String line : lines )
         {
             if ( line.contains( logSnippet ) )
@@ -70,7 +69,7 @@ private void verifyLogHasLine( final Verifier verifier, final String logSnippet
                 return;
             }
         }
-        throw new VerificationException( "Expected snippet not present in log: " + logSnippet );
+        throw new VerificationException( "Expected snippet present in log: " + logSnippet );
     }
 
     public void testResolverTransportWagon()

From 197420266ada40379c14e9778e6bef201e7a3e94 Mon Sep 17 00:00:00 2001
From: Tamas Cservenak <tamas@cservenak.net>
Date: Wed, 11 May 2022 19:17:34 +0200
Subject: [PATCH 12/14] Drop custom method, there is verifier method to use

---
 .../it/MavenITmng7470ResolverTransportTest.java | 17 +----------------
 1 file changed, 1 insertion(+), 16 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 81d6b9a8a..55782a4f9 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
@@ -2,7 +2,6 @@
 
 import java.io.File;
 import java.util.HashMap;
-import java.util.List;
 
 import org.apache.maven.it.util.ResourceExtractor;
 
@@ -49,7 +48,7 @@ private void performTest( final String transport, final String logSnippet ) thro
             verifier.executeGoal( "verify" );
             verifier.verifyErrorFreeLog();
             // verify maven console output contains "[DEBUG] Using transporter XXXTransporter"
-            verifyLogHasLine( verifier, logSnippet );
+            verifier.verifyTextInLog( logSnippet );
             verifier.resetStreams();
         }
         finally
@@ -58,20 +57,6 @@ private void performTest( final String transport, final String logSnippet ) thro
         }
     }
 
-    private void verifyLogHasLine( final Verifier verifier, final String logSnippet )
-            throws VerificationException
-    {
-        List<String> lines = verifier.loadFile( verifier.getBasedir(), verifier.getLogFileName(), false );
-        for ( String line : lines )
-        {
-            if ( line.contains( logSnippet ) )
-            {
-                return;
-            }
-        }
-        throw new VerificationException( "Expected snippet present in log: " + logSnippet );
-    }
-
     public void testResolverTransportWagon()
             throws Exception
     {

From ea5595ad0a556de515dd589c4b012e1cb819cc7e Mon Sep 17 00:00:00 2001
From: Michael Osipov <michaelo@apache.org>
Date: Wed, 11 May 2022 20:42:12 +0200
Subject: [PATCH 13/14] Make text files in repo portable

---
 .../resources/mng-7470-resolver-transport/repo/.gitattributes  | 3 +++
 .../resolver-transport/dependency/1.0/dependency-1.0.pom.sha1  | 2 +-
 .../1.7.3/resolver-demo-maven-plugin-1.7.3.jar.sha1            | 2 +-
 .../1.7.3/resolver-demo-maven-plugin-1.7.3.pom.sha1            | 3 +--
 4 files changed, 6 insertions(+), 4 deletions(-)
 create mode 100644 core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/.gitattributes

diff --git a/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/.gitattributes b/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/.gitattributes
new file mode 100644
index 000000000..e3bce59d1
--- /dev/null
+++ b/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/.gitattributes
@@ -0,0 +1,3 @@
+*.pom    text eol=lf
+maven-metadata.xml    text eol=lf
+
diff --git a/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/dependency/1.0/dependency-1.0.pom.sha1 b/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/dependency/1.0/dependency-1.0.pom.sha1
index c37fcd4b7..39318fa3a 100644
--- a/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/dependency/1.0/dependency-1.0.pom.sha1
+++ b/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/dependency/1.0/dependency-1.0.pom.sha1
@@ -1 +1 @@
-b58c041fe630e9248109e305c5d2d0c5fea978a3
+b58c041fe630e9248109e305c5d2d0c5fea978a3
\ No newline at end of file
diff --git a/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/resolver/resolver-demo-maven-plugin/1.7.3/resolver-demo-maven-plugin-1.7.3.jar.sha1 b/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/resolver/resolver-demo-maven-plugin/1.7.3/resolver-demo-maven-plugin-1.7.3.jar.sha1
index b4aceb3db..644d46369 100644
--- a/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/resolver/resolver-demo-maven-plugin/1.7.3/resolver-demo-maven-plugin-1.7.3.jar.sha1
+++ b/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/resolver/resolver-demo-maven-plugin/1.7.3/resolver-demo-maven-plugin-1.7.3.jar.sha1
@@ -1 +1 @@
-ed81d315b44e79187fe8ad71b7b2665ac9b95f08
+ed81d315b44e79187fe8ad71b7b2665ac9b95f08
\ No newline at end of file
diff --git a/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/resolver/resolver-demo-maven-plugin/1.7.3/resolver-demo-maven-plugin-1.7.3.pom.sha1 b/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/resolver/resolver-demo-maven-plugin/1.7.3/resolver-demo-maven-plugin-1.7.3.pom.sha1
index 16cf77b8b..54520c0e6 100644
--- a/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/resolver/resolver-demo-maven-plugin/1.7.3/resolver-demo-maven-plugin-1.7.3.pom.sha1
+++ b/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/resolver/resolver-demo-maven-plugin/1.7.3/resolver-demo-maven-plugin-1.7.3.pom.sha1
@@ -1,2 +1 @@
-2a2ae11ad8e4c90eb3d48f3621b5d20eafea3ae3
-
+2a2ae11ad8e4c90eb3d48f3621b5d20eafea3ae3
\ No newline at end of file

From 210fc379278535574110960f1a5058769367fc9c Mon Sep 17 00:00:00 2001
From: Michael Osipov <michaelo@apache.org>
Date: Wed, 11 May 2022 21:45:02 +0200
Subject: [PATCH 14/14] Align test to other tests with Jetty

---
 .../java/org/apache/maven/it/HttpServer.java  | 11 +++
 .../MavenITmng7470ResolverTransportTest.java  | 78 ++++++++++++-------
 .../{ => project}/settings-template.xml       |  0
 3 files changed, 62 insertions(+), 27 deletions(-)
 rename core-it-suite/src/test/resources/mng-7470-resolver-transport/{ => project}/settings-template.xml (100%)

diff --git a/core-it-suite/src/test/java/org/apache/maven/it/HttpServer.java b/core-it-suite/src/test/java/org/apache/maven/it/HttpServer.java
index 8d87dd54a..ba25cb4f8 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/HttpServer.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/HttpServer.java
@@ -60,12 +60,23 @@ public void start()
         // server.join();
     }
 
+	public boolean isFailed()
+    {
+        return server.isFailed();
+    }
+
     public void stop()
         throws Exception
     {
         server.stop();
     }
 
+    public void join()
+        throws Exception
+    {
+        server.join();
+    }
+
     public int port()
     {
         return ( (NetworkConnector) server.getConnectors()[0] ).getLocalPort();
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 55782a4f9..68b82b53d 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
@@ -2,6 +2,7 @@
 
 import java.io.File;
 import java.util.HashMap;
+import java.util.Map;
 
 import org.apache.maven.it.util.ResourceExtractor;
 
@@ -12,51 +13,74 @@
 public class MavenITmng7470ResolverTransportTest
         extends AbstractMavenIntegrationTestCase
 {
+    private File testDir;
+
+    private File projectDir;
+
+    private HttpServer server;
+
+    private int port;
+
     public MavenITmng7470ResolverTransportTest()
     {
         super( "[3.9.0,)" );
     }
 
-    private void performTest( final String transport, final String logSnippet ) throws Exception
+    @Override
+    protected void setUp()
+        throws Exception
     {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-7470-resolver-transport" );
+        testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-7470-resolver-transport" );
+        projectDir = new File( testDir, "project" );
 
-        HttpServer server = HttpServer.builder()
+        server = HttpServer.builder()
                 .port( 0 )
                 .source( new File( testDir, "repo" ) )
                 .build();
         server.start();
-        try
+        if ( server.isFailed() )
         {
-            Verifier verifier = newVerifier( testDir.getAbsolutePath() );
-            HashMap<String, String> properties = new HashMap<>();
-            properties.put( "@port@", Integer.toString( server.port() ) );
-            verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", properties );
-
-            verifier = newVerifier( new File( testDir, "project" ).getAbsolutePath() );
-            verifier.setLogFileName( transport + "-transport.log" );
-            verifier.deleteDirectory( "target" );
-            verifier.deleteArtifacts( "org.apache.maven.its.resolver-transport" );
-            verifier.addCliOption( "-X" );
-            verifier.addCliOption( "-s" );
-            verifier.addCliOption( new File( testDir, "settings.xml" ).getAbsolutePath() );
-            verifier.addCliOption( "-Pmaven-core-it-repo" );
-            verifier.addCliOption( "-Dmaven.resolver.transport=" + transport );
-            // Maven will fail if project dependencies cannot be resolved.
-            // As dependency exists ONLY in HTTP repo, it MUST be reached using selected transport and
-            // successfully resolved from it.
-            verifier.executeGoal( "verify" );
-            verifier.verifyErrorFreeLog();
-            // verify maven console output contains "[DEBUG] Using transporter XXXTransporter"
-            verifier.verifyTextInLog( logSnippet );
-            verifier.resetStreams();
+            fail( "Couldn't bind the server socket to a free port!" );
         }
-        finally
+        port = server.port();
+        System.out.println( "Bound server socket to the port " + port );
+    }
+
+    @Override
+    protected void tearDown()
+        throws Exception
+    {
+        if ( server != null )
         {
             server.stop();
+            server.join();
         }
     }
 
+    private void performTest( final String transport, final String logSnippet ) throws Exception
+    {
+        Verifier verifier = newVerifier( projectDir.getAbsolutePath() );
+        Map<String, String> properties = new HashMap<>();
+        properties.put( "@port@", Integer.toString( port ) );
+        verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", properties );
+        verifier.setLogFileName( transport + "-transport.log" );
+        verifier.deleteDirectory( "target" );
+        verifier.deleteArtifacts( "org.apache.maven.its.resolver-transport" );
+        verifier.addCliOption( "-X" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( new File( projectDir, "settings.xml" ).getAbsolutePath() );
+        verifier.addCliOption( "-Pmaven-core-it-repo" );
+        verifier.addCliOption( "-Dmaven.resolver.transport=" + transport );
+        // Maven will fail if project dependencies cannot be resolved.
+        // As dependency exists ONLY in HTTP repo, it MUST be reached using selected transport and
+        // successfully resolved from it.
+        verifier.executeGoal( "verify" );
+        verifier.verifyErrorFreeLog();
+        // verify maven console output contains "[DEBUG] Using transporter XXXTransporter"
+        verifier.verifyTextInLog( logSnippet );
+        verifier.resetStreams();
+    }
+
     public void testResolverTransportWagon()
             throws Exception
     {
diff --git a/core-it-suite/src/test/resources/mng-7470-resolver-transport/settings-template.xml b/core-it-suite/src/test/resources/mng-7470-resolver-transport/project/settings-template.xml
similarity index 100%
rename from core-it-suite/src/test/resources/mng-7470-resolver-transport/settings-template.xml
rename to core-it-suite/src/test/resources/mng-7470-resolver-transport/project/settings-template.xml