From 8c3adee287a86cdb58be6865a7ef160475164b5e Mon Sep 17 00:00:00 2001 From: Michael Keppler Date: Sun, 24 Dec 2023 12:25:56 +0100 Subject: [PATCH] Make Tycho work behind https proxy If a proxy is specified with the https procotol in the settings.xml, Tycho fails downloading artifacts from any URL that uses that proxy, because it wrongly configures a SOCKS transport in such cases. Fixes #1935, #2709, #2533. (cherry picked from commit d64b98fa2441f900aab156ad11c521bc5b35ef40) --- .../java/org/eclipse/tycho/p2maven/helper/ProxyHelper.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/p2-maven-plugin/src/main/java/org/eclipse/tycho/p2maven/helper/ProxyHelper.java b/p2-maven-plugin/src/main/java/org/eclipse/tycho/p2maven/helper/ProxyHelper.java index 7003d0f19a..51bc155dab 100644 --- a/p2-maven-plugin/src/main/java/org/eclipse/tycho/p2maven/helper/ProxyHelper.java +++ b/p2-maven-plugin/src/main/java/org/eclipse/tycho/p2maven/helper/ProxyHelper.java @@ -70,6 +70,9 @@ private static Type convertType(String type) { if (org.eclipse.aether.repository.Proxy.TYPE_HTTP.equalsIgnoreCase(type)) { return Type.HTTP; } + if (org.eclipse.aether.repository.Proxy.TYPE_HTTPS.equalsIgnoreCase(type)) { + return Type.HTTP; + } return Type.SOCKS; }