This is an automated email from the ASF dual-hosted git repository.
cstamas pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-resolver.git
The following commit(s) were added to refs/heads/master by this push:
new bde965b0 Rollback #746 with comments (#1509)
bde965b0 is described below
commit bde965b03a5e76b5a5f5fbe5b88ed2556beb729c
Author: Tamas Cservenak <[email protected]>
AuthorDate: Thu Jun 26 15:10:35 2025 +0200
Rollback #746 with comments (#1509)
Also the added UTs made no sense from retrospective, as they used HTTP
remote repo with HTTPS proxy, something Maven would never do.
Rolls back #746 but leaves traces and some context.
Ref https://github.com/apache/maven/issues/2519
---
.../test/util/http/HttpTransporterTest.java | 36 ----------------------
.../aether/transport/apache/ApacheTransporter.java | 6 +++-
.../aether/transport/jdk/JdkTransporter.java | 2 ++
.../aether/transport/jdk/JdkTransporterTest.java | 12 +-------
.../transport/jetty/JettyTransporterTest.java | 10 ------
5 files changed, 8 insertions(+), 58 deletions(-)
diff --git
a/maven-resolver-test-http/src/main/java/org/eclipse/aether/internal/test/util/http/HttpTransporterTest.java
b/maven-resolver-test-http/src/main/java/org/eclipse/aether/internal/test/util/http/HttpTransporterTest.java
index 6710e43a..029bd019 100644
---
a/maven-resolver-test-http/src/main/java/org/eclipse/aether/internal/test/util/http/HttpTransporterTest.java
+++
b/maven-resolver-test-http/src/main/java/org/eclipse/aether/internal/test/util/http/HttpTransporterTest.java
@@ -465,27 +465,6 @@ public class HttpTransporterTest {
assertEquals(task.getDataString(),
listener.getBaos().toString(StandardCharsets.UTF_8));
}
- @Test
- protected void testGet_ProxyAuthenticatedHttps() throws Exception {
- httpServer.addSslConnector();
- httpServer.setProxyAuthentication("testuser", "testpass");
- Authentication auth = new AuthenticationBuilder()
- .addUsername("testuser")
- .addPassword("testpass")
- .build();
- proxy = new Proxy(Proxy.TYPE_HTTPS, httpServer.getHost(),
httpServer.getHttpsPort(), auth);
- newTransporter("http://bad.localhost:1/";);
- RecordingTransportListener listener = new RecordingTransportListener();
- GetTask task = new
GetTask(URI.create("repo/file.txt")).setListener(listener);
- transporter.get(task);
- assertEquals("test", task.getDataString());
- assertEquals(0L, listener.getDataOffset());
- assertEquals(4L, listener.getDataLength());
- assertEquals(1, listener.getStartedCount());
- assertTrue(listener.getProgressedCount() > 0, "Count: " +
listener.getProgressedCount());
- assertEquals(task.getDataString(),
listener.getBaos().toString(StandardCharsets.UTF_8));
- }
-
@Test
protected void testGet_ProxyUnauthenticated() throws Exception {
httpServer.setProxyAuthentication("testuser", "testpass");
@@ -1264,21 +1243,6 @@ public class HttpTransporterTest {
}
}
- @Test
- public void testProxyType() throws Exception {
- httpServer.addSslConnector();
- proxy = new Proxy(Proxy.TYPE_HTTPS, httpServer.getHost(),
httpServer.getHttpsPort(), null);
- newTransporter("http://bad.localhost:1/";);
- try {
- transporter.get(new GetTask(URI.create("foo/file.txt")));
- } catch (HttpTransporterException e) {
- assertEquals(404, e.getStatusCode());
- assertEquals(
- "http://bad.localhost:1/foo/file.txt";,
- httpServer.getLogEntries().get(0).getPath());
- }
- }
-
@Test
protected void testAuthSchemeReuse() throws Exception {
httpServer.setAuthentication("testuser", "testpass");
diff --git
a/maven-resolver-transport-apache/src/main/java/org/eclipse/aether/transport/apache/ApacheTransporter.java
b/maven-resolver-transport-apache/src/main/java/org/eclipse/aether/transport/apache/ApacheTransporter.java
index e3159a0b..77776a43 100644
---
a/maven-resolver-transport-apache/src/main/java/org/eclipse/aether/transport/apache/ApacheTransporter.java
+++
b/maven-resolver-transport-apache/src/main/java/org/eclipse/aether/transport/apache/ApacheTransporter.java
@@ -392,7 +392,11 @@ final class ApacheTransporter extends AbstractTransporter
implements HttpTranspo
private static HttpHost toHost(Proxy proxy) {
HttpHost host = null;
if (proxy != null) {
- host = new HttpHost(proxy.getHost(), proxy.getPort(),
proxy.getType());
+ // in Maven, the proxy.protocol is used for proxy matching against
remote repository protocol; no TLS proxy
+ // support
+ // https://github.com/apache/maven/issues/2519
+ // https://github.com/apache/maven-resolver/issues/745
+ host = new HttpHost(proxy.getHost(), proxy.getPort());
}
return host;
}
diff --git
a/maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk-11/src/main/java/org/eclipse/aether/transport/jdk/JdkTransporter.java
b/maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk-11/src/main/java/org/eclipse/aether/transport/jdk/JdkTransporter.java
index 1e4132e9..c55ff555 100644
---
a/maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk-11/src/main/java/org/eclipse/aether/transport/jdk/JdkTransporter.java
+++
b/maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk-11/src/main/java/org/eclipse/aether/transport/jdk/JdkTransporter.java
@@ -104,6 +104,8 @@ import static
org.eclipse.aether.transport.jdk.JdkTransporterConfigurationKeys.D
* <ul>
* <li>Does not support {@link ConfigurationProperties#REQUEST_TIMEOUT},
see <a href="https://bugs.openjdk.org/browse/JDK-8258397";>JDK-8258397</a></li>
* </ul>
+ * <p>
+ * Related: <a
href="https://dev.to/kdrakon/httpclient-can-t-connect-to-a-tls-proxy-118a";>No
TLS proxy supported</a>.
*
* @since 2.0.0
*/
diff --git
a/maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk-11/src/test/java/org/eclipse/aether/transport/jdk/JdkTransporterTest.java
b/maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk-11/src/test/java/org/eclipse/aether/transport/jdk/JdkTransporterTest.java
index 8093868b..aaa16829 100644
---
a/maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk-11/src/test/java/org/eclipse/aether/transport/jdk/JdkTransporterTest.java
+++
b/maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk-11/src/test/java/org/eclipse/aether/transport/jdk/JdkTransporterTest.java
@@ -35,6 +35,7 @@ import static org.junit.jupiter.api.Assertions.fail;
/**
* JDK Transporter UT.
+ * Related: <a
href="https://dev.to/kdrakon/httpclient-can-t-connect-to-a-tls-proxy-118a";>No
TLS proxy supported</a>.
*/
class JdkTransporterTest extends HttpTransporterTest {
@@ -88,17 +89,6 @@ class JdkTransporterTest extends HttpTransporterTest {
@Test
protected void testRequestTimeout() throws Exception {}
- // https://dev.to/kdrakon/httpclient-can-t-connect-to-a-tls-proxy-118a
- @Override
- @Disabled
- @Test
- protected void testGet_ProxyAuthenticatedHttps() {}
-
- @Override
- @Disabled
- @Test
- public void testProxyType() {}
-
public JdkTransporterTest() {
super(() -> new JdkTransporterFactory(standardChecksumExtractor(), new
DefaultPathProcessor()));
}
diff --git
a/maven-resolver-transport-jetty/src/test/java/org/eclipse/aether/transport/jetty/JettyTransporterTest.java
b/maven-resolver-transport-jetty/src/test/java/org/eclipse/aether/transport/jetty/JettyTransporterTest.java
index 059fb00e..67b3c976 100644
---
a/maven-resolver-transport-jetty/src/test/java/org/eclipse/aether/transport/jetty/JettyTransporterTest.java
+++
b/maven-resolver-transport-jetty/src/test/java/org/eclipse/aether/transport/jetty/JettyTransporterTest.java
@@ -58,16 +58,6 @@ class JettyTransporterTest extends HttpTransporterTest {
@Test
protected void
testPut_Authenticated_ExpectContinueRejected_ExplicitlyConfiguredHeader() {}
- @Override
- @Disabled
- @Test
- protected void testGet_ProxyAuthenticatedHttps() {}
-
- @Override
- @Disabled
- @Test
- public void testProxyType() {}
-
public JettyTransporterTest() {
super(() -> new JettyTransporterFactory(standardChecksumExtractor(),
new TestPathProcessor()));
}
