The Unified and Autonomous Development Platform
feat: Able to use system proxy setting when set up connections (#1812)
Robin Shene217bf7ac8e2
diff --git a/pom.xml b/pom.xmlindex d410b5b604..7705f809cd 100644--- a/pom.xml+++ b/pom.xml@@ -630,8 +630,8 @@</repository></repositories><properties>- <commons.version>2.8.9</commons.version>- <agent.version>1.10.13</agent.version>+ <commons.version>2.8.10</commons.version>+ <agent.version>1.10.14</agent.version><slf4j.version>2.0.9</slf4j.version><logback.version>1.4.14</logback.version><antlr.version>4.7.2</antlr.version>diff --git a/server-core/src/main/java/io/onedev/server/OneDev.java b/server-core/src/main/java/io/onedev/server/OneDev.javaindex 7516f34b53..fcff7a4a55 100644--- a/server-core/src/main/java/io/onedev/server/OneDev.java+++ b/server-core/src/main/java/io/onedev/server/OneDev.java@@ -8,7 +8,6 @@ import io.onedev.commons.loader.AppLoader;import io.onedev.commons.loader.ManagedSerializedForm;import io.onedev.commons.utils.FileUtils;import io.onedev.commons.utils.TarUtils;-import io.onedev.k8shelper.KubernetesHelper;import io.onedev.server.cluster.ClusterManager;import io.onedev.server.data.DataManager;import io.onedev.server.entitymanager.SettingManager;@@ -25,10 +24,10 @@ import io.onedev.server.persistence.SessionFactoryManager;import io.onedev.server.persistence.SessionManager;import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.security.SecurityUtils;+import io.onedev.server.taskschedule.TaskScheduler;import io.onedev.server.util.UrlUtils;import io.onedev.server.util.init.InitStage;import io.onedev.server.util.init.ManualConfig;-import io.onedev.server.taskschedule.TaskScheduler;import org.apache.wicket.request.Url;import org.eclipse.jgit.util.FS.FileStoreAttributes;import org.slf4j.Logger;@@ -54,6 +53,7 @@ import java.util.Set;import java.util.concurrent.ExecutorService;import static io.onedev.k8shelper.KubernetesHelper.BEARER;+import static io.onedev.k8shelper.KubernetesHelper.checkStatus;import static io.onedev.server.persistence.PersistenceUtils.callWithTransaction;import static javax.ws.rs.core.HttpHeaders.AUTHORIZATION;@@ -215,7 +215,7 @@ public class OneDev extends AbstractPlugin implements Serializable, Runnable {BEARER + " " + clusterManager.getCredential());try (Response response = builder.get()) {- KubernetesHelper.checkStatus(response);+ checkStatus(response);try (InputStream is = response.readEntity(InputStream.class)) {TarUtils.untar(is, getAssetsDir(), false);} catch (IOException e) {