Merge branch 'master' of git://github.com/jenkinsci/jenkins

Conflicts:
	changelog.html

changelog.html

@@ -58,15 +58,19 @@ Upcoming changes</a>
   <li class=bug>
     Master labels disappear when system configuration is updated.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-23966">issue 23966</a>)
-  <li class=bug>
-    After recent Java security updates, Jenkins would not gracefully recover from a deleted <code>secrets/master.key</code>.
-    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-25937">issue 25937</a>)
 </ul>
 </div><!--=TRUNK-END=-->
 
 <!-- these changes are controlled by the release process. DO NOT MODIFY -->
 <div id="rc" style="display:none;"><!--=BEGIN=-->
-<h3><a name=v1.593>What's new in 1.593</a> <!--=DATE=--></h3>
+<h3><a name=v1.594>What's new in 1.594</a> <!--=DATE=--></h3>
+<ul class=image>
+  <li class=bug>
+    After recent Java security updates, Jenkins would not gracefully recover from a deleted <code>secrets/master.key</code>.
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-25937">issue 25937</a>)
+</ul>
+</div><!--=END=-->
+<h3><a name=v1.593>What's new in 1.593</a> (2014/12/07)</h3>
 <ul class=image>
   <li class=rfe>
     Dynamic Single/Multi line Build History layout.
@@ -75,7 +79,6 @@ Upcoming changes</a>
      <a href="https://issues.jenkins-ci.org/browse/JENKINS-24687">issue 24687</a>,
      <a href="https://issues.jenkins-ci.org/browse/JENKINS-24589">issue 24589</a>)
 </ul>
-</div><!--=END=-->
 <h3><a name=v1.593>What's new in 1.593</a> (2014/11/30)</h3>
 <ul class=image>
   <li class=rfe>

cli/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <artifactId>pom</artifactId>
     <groupId>org.jenkins-ci.main</groupId>
-    <version>1.594-SNAPSHOT</version>
+    <version>1.595-SNAPSHOT</version>
   </parent>
 
   <artifactId>cli</artifactId>

core/pom.xml

@@ -29,7 +29,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>pom</artifactId>
-    <version>1.594-SNAPSHOT</version>
+    <version>1.595-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

core/src/main/java/hudson/tools/JDKInstaller.java

@@ -234,13 +234,15 @@ public class JDKInstaller extends ToolInstaller {
                 - http://java.sun.com/j2se/1.5.0/sdksilent.html
                 - http://java.sun.com/j2se/1.4.2/docs/guide/plugin/developer_guide/silent.html
              */
-            String logFile = jdkBundle+".install.log";
 
             expectedLocation = expectedLocation.trim();
             if (expectedLocation.endsWith("\\")) {
                 // Prevent a trailing slash from escaping quotes
                 expectedLocation = expectedLocation.substring(0, expectedLocation.length() - 1);
             }
+            String logFile = new FilePath(launcher.getChannel(), expectedLocation).getParent().createTempFile("install", "log").getRemote();
+
+
             ArgumentListBuilder args = new ArgumentListBuilder();
             assert (new File(expectedLocation).exists()) : expectedLocation
                     + " must exist, otherwise /L will cause the installer to fail with error 1622";
@@ -248,20 +250,19 @@ public class JDKInstaller extends ToolInstaller {
                 // Installer uses InstallShield.
                 args.add("CMD.EXE", "/C");
 
+                // see http://docs.oracle.com/javase/1.5.0/docs/guide/deployment/deployment-guide/silent.html
                 // CMD.EXE /C must be followed by a single parameter (do not split it!)
                 args.add(jdkBundle + " /s /v\"/qn REBOOT=ReallySuppress INSTALLDIR=\\\""
-                        + expectedLocation + "\\\" /L \\\"" + expectedLocation
-                        + "\\jdk.exe.install.log\\\"\"");
+                        + expectedLocation + "\\\" /L \\\"" + logFile + "\\\"\"");
             } else {
                 // Installed uses Windows Installer (MSI)
                 args.add(jdkBundle, "/s");
 
                 // Create a private JRE by omitting "PublicjreFeature"
                 // @see http://docs.oracle.com/javase/7/docs/webnotes/install/windows/jdk-installation-windows.html#jdk-silent-installation
-                args.add("ADDLOCAL=\"ToolsFeature\"");
-
-                args.add("REBOOT=ReallySuppress", "INSTALLDIR=" + expectedLocation,
-                        "/L \\\"" + expectedLocation + "\\jdk.exe.install.log\\\"");
+                args.add("ADDLOCAL=\"ToolsFeature\"",
+                        "REBOOT=ReallySuppress", "INSTALLDIR=" + expectedLocation,
+                        "/L",  logFile);
             }
             int r = launcher.launch().cmds(args).stdout(out)
                     .pwd(new FilePath(launcher.getChannel(), expectedLocation)).join();
@@ -716,7 +717,7 @@ public class JDKInstaller extends ToolInstaller {
             if (value) {
                 return FormValidation.ok();
             } else {
-                return FormValidation.error(Messages.JDKInstaller_DescriptorImpl_doCheckAcceptLicense()); 
+                return FormValidation.error(Messages.JDKInstaller_DescriptorImpl_doCheckAcceptLicense());
             }
         }
 

debian/debian/changelog

+jenkins (1.593) unstable; urgency=low
+
+  * See http://jenkins-ci.org/changelog for more details.
+
+ -- Kohsuke Kawaguchi <kk@kohsuke.org>  Sun, 07 Dec 2014 21:02:37 -0800
+
 jenkins (1.592) unstable; urgency=low
 
   * See http://jenkins-ci.org/changelog for more details.

plugins/pom.xml

@@ -11,7 +11,7 @@
   <groupId>org.jenkins-ci.plugins</groupId>
   <artifactId>plugin</artifactId>
   <name>Jenkins plugin POM</name>
-  <version>1.594-SNAPSHOT</version>
+  <version>1.595-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <!--
@@ -40,19 +40,19 @@
       <groupId>org.jenkins-ci.main</groupId>
       <artifactId>jenkins-war</artifactId>
       <type>war</type>
-      <version>1.594-SNAPSHOT</version>
+      <version>1.595-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.main</groupId>
       <artifactId>jenkins-core</artifactId>
-      <version>1.594-SNAPSHOT</version>
+      <version>1.595-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.main</groupId>
       <artifactId>jenkins-test-harness</artifactId>
-      <version>1.594-SNAPSHOT</version>
+      <version>1.595-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <!--

pom.xml

@@ -33,7 +33,7 @@ THE SOFTWARE.
 
   <groupId>org.jenkins-ci.main</groupId>
   <artifactId>pom</artifactId>
-  <version>1.594-SNAPSHOT</version>
+  <version>1.595-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Jenkins main module</name>

test/pom.xml

@@ -29,7 +29,7 @@ THE SOFTWARE.
   <parent>
     <artifactId>pom</artifactId>
     <groupId>org.jenkins-ci.main</groupId>
-    <version>1.594-SNAPSHOT</version>
+    <version>1.595-SNAPSHOT</version>
   </parent>
   <groupId>org.jenkins-ci.main</groupId>
   <artifactId>jenkins-test-harness</artifactId>

war/pom.xml

@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>pom</artifactId>
-    <version>1.594-SNAPSHOT</version>
+    <version>1.595-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>