diff --git a/core/src/main/java/hudson/EnvVars.java b/core/src/main/java/hudson/EnvVars.java index 3cb2afe340..56678ab7dc 100644 --- a/core/src/main/java/hudson/EnvVars.java +++ b/core/src/main/java/hudson/EnvVars.java @@ -185,7 +185,7 @@ public class EnvVars extends TreeMap { * when we later kill the processes. */ public static EnvVars createCookie() { - return new EnvVars("HUDSON_COOKIE", UUID.randomUUID().toString()); + return new EnvVars("JENKINS_COOKIE", UUID.randomUUID().toString()); } /** diff --git a/core/src/main/java/hudson/slaves/CommandLauncher.java b/core/src/main/java/hudson/slaves/CommandLauncher.java index 5384592d9d..c0c8230fc2 100644 --- a/core/src/main/java/hudson/slaves/CommandLauncher.java +++ b/core/src/main/java/hudson/slaves/CommandLauncher.java @@ -101,7 +101,8 @@ public class CommandLauncher extends ComputerLauncher { {// system defined variables String rootUrl = Hudson.getInstance().getRootUrl(); if (rootUrl!=null) { - pb.environment().put("HUDSON_URL", rootUrl); + pb.environment().put("HUDSON_URL", rootUrl); // for backward compatibility + pb.environment().put("JENKINS_URL", rootUrl); pb.environment().put("SLAVEJAR_URL", rootUrl+"/jnlpJars/slave.jar"); } } diff --git a/core/src/main/java/hudson/tools/JDKInstaller.java b/core/src/main/java/hudson/tools/JDKInstaller.java index cdca2a34f5..5f28d78aa4 100644 --- a/core/src/main/java/hudson/tools/JDKInstaller.java +++ b/core/src/main/java/hudson/tools/JDKInstaller.java @@ -308,7 +308,9 @@ public class JDKInstaller extends ToolInstaller { IOUtils.copy(new RetryableHttpStream(src) { @Override protected HttpURLConnection connect() throws IOException { - return (HttpURLConnection) ProxyConfiguration.open(url); + HttpURLConnection con = (HttpURLConnection) ProxyConfiguration.open(url); + con.setReadTimeout(60*1000); // don't block forever, but don't let the slow client fail with false positives either + return con; } }, out); } finally { diff --git a/pom.xml b/pom.xml index 0f363f39c1..db368b6b33 100644 --- a/pom.xml +++ b/pom.xml @@ -242,9 +242,9 @@ THE SOFTWARE. Since some developers try to run hudson-dev:run from main, define it here so that at least the plugin resolves. This enables us to report a better error message. --> - org.jvnet.hudson.tools - maven-hudson-dev-plugin - 6.1.7 + org.jenkins-ci.tools + maven-jenkins-dev-plugin + 6.1.26-jenkins-1 - org.jvnet.hudson.tools - maven-hudson-dev-plugin - 6.1.7-hudson-1 + org.jenkins-ci.tools + maven-jenkins-dev-plugin + 6.1.26-jenkins-1 ${contextPath} + + manual ${port} @@ -152,10 +156,6 @@ THE SOFTWARE. ../core/src/main/resources true - - true default