diff --git a/pom.xml b/pom.xml index 73e18b7..36c8fda 100644 --- a/pom.xml +++ b/pom.xml @@ -91,7 +91,7 @@ org.gitlab java-gitlab-api - 1.2.7 + 1.2.8 diff --git a/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/api/GitLabAPI.java b/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/api/GitLabAPI.java index 69611b7..48455d4 100644 --- a/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/api/GitLabAPI.java +++ b/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/api/GitLabAPI.java @@ -1,5 +1,7 @@ package argelbargel.jenkins.plugins.gitlab_branch_source.api; +import hudson.ProxyConfiguration; +import jenkins.model.Jenkins; import org.apache.commons.lang.StringUtils; import org.gitlab.api.GitlabAPI; import org.gitlab.api.http.Query; @@ -16,6 +18,7 @@ import java.io.IOException; import java.io.Serializable; import java.io.UnsupportedEncodingException; +import java.net.Proxy; import java.net.URL; import java.net.URLEncoder; import java.util.Arrays; @@ -34,6 +37,10 @@ public static GitLabAPI connect(String url, String token, boolean ignoreCertific try { GitlabAPI delegate = GitlabAPI.connect(url, token); delegate.ignoreCertificateErrors(ignoreCertificateErrors); + ProxyConfiguration proxy = Jenkins.getInstance().proxy; + if (proxy != null) { + delegate.proxy(proxy.createProxy(url)); + } return new GitLabAPI(delegate); } catch (Exception e) { throw new GitLabAPIException(e);