Merge branch 'master' into extensionlist-listener

* master: Noting merge of JENKINS-28111 @jglick wants it this way Noting merge of JENKINS-28115 [FIXED JENKINS-28115] Division by zero in Executor.getProgress() [FIXED JENKINS-28111] JNLP slave JVM Options are inconsistently applied updated changelog for release [maven-release-plugin] prepare for next development iteration [maven-release-plugin] prepare release jenkins-1.611 remove ips profile Now that packaging is in https://github.com/jenkinsci/packaging and given that the ips packaging is stale, we should just drop this
jenkinsci · Apr 28, 2015 · 30ece5ffb20d354173cec3b6d7a2ea902a9eb681 · 30ece5f
2 parents a9f0392 + 9c9049e
commit 30ece5ffb20d354173cec3b6d7a2ea902a9eb681
diff --git a/changelog.html b/changelog.html
@@ -54,6 +54,17 @@
 
 <!-- Record your changes in the trunk here. -->
 <div id="trunk" style="display:none"><!--=TRUNK-BEGIN=-->
+<ul class=image>
+  <li class=bug>
+    Under rare conditions Executor.getProgress() can throw a Division by zero exception.
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-28115">issue 28115</a>)
+  <li class=bug>
+    The Run from the command line option for launching a JNLP slave should display the
+    configured JVM options.
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-28111">issue 28111</a>)
+</ul>
+</div><!--=TRUNK-END=-->
+<h3><a name=v1.611>What's new in 1.611</a> (2015/04/26)</h3>
 <ul class=image>
   <li class=bug>
     <code>Descriptor.getId</code> fix in 1.610 introduced a regression affecting at least the Copy Artifacts plugin.
@@ -73,7 +84,6 @@
     Correctly identify Channel listener onClose propagated exceptions
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-28062">issue 28062</a>
 </ul>
-</div><!--=TRUNK-END=-->
 <h3><a name=v1.610>What's new in 1.610</a> (2015/04/19)</h3>
 <ul class=image>
   <li class=bug>

diff --git a/cli/pom.xml b/cli/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>pom</artifactId>
-    <version>1.611-SNAPSHOT</version>
+    <version>1.612-SNAPSHOT</version>
   </parent>
 
   <artifactId>cli</artifactId>

diff --git a/core/pom.xml b/core/pom.xml
@@ -29,7 +29,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>pom</artifactId>
-    <version>1.611-SNAPSHOT</version>
+    <version>1.612-SNAPSHOT</version>
   </parent>
 
   <artifactId>jenkins-core</artifactId>

diff --git a/core/src/main/java/hudson/model/Executor.java b/core/src/main/java/hudson/model/Executor.java
@@ -642,7 +642,7 @@ public int getProgress() {
         } finally {
             lock.readLock().unlock();
         }
-        if (d < 0) {
+        if (d <= 0) {
             return -1;
         }
 

diff --git a/core/src/main/resources/hudson/slaves/JNLPLauncher/main.jelly b/core/src/main/resources/hudson/slaves/JNLPLauncher/main.jelly
@@ -57,7 +57,7 @@ THE SOFTWARE.
                 <p>
                   ${%Or if the slave is headless:}
                 </p>
-                <pre>java -jar <a href="${rootURL}/jnlpJars/slave.jar">slave.jar</a> -jnlpUrl ${h.inferHudsonURL(request)}${it.url}slave-agent.jnlp</pre>
+                <pre>java${it.launcher.vmargs == null ? '' : ' ' + it.launcher.vmargs} -jar <a href="${rootURL}/jnlpJars/slave.jar">slave.jar</a> -jnlpUrl ${h.inferHudsonURL(request)}${it.url}slave-agent.jnlp</pre>
               </li>
             </j:when>
             <j:otherwise>
@@ -66,7 +66,7 @@ THE SOFTWARE.
                   ${%Run from slave command line:}
                 </p>
                 <!-- TODO conceal secret w/ JS if possible -->
-                <pre>java -jar <a href="${rootURL}/jnlpJars/slave.jar">slave.jar</a> -jnlpUrl ${h.inferHudsonURL(request)}${it.url}slave-agent.jnlp -secret ${it.jnlpMac}</pre>
+                <pre>java${it.launcher.vmargs == null ? '' : ' ' + it.launcher.vmargs} -jar <a href="${rootURL}/jnlpJars/slave.jar">slave.jar</a> -jnlpUrl ${h.inferHudsonURL(request)}${it.url}slave-agent.jnlp -secret ${it.jnlpMac}</pre>
               </li>
             </j:otherwise>
           </j:choose>

diff --git a/ips/jenkins.xml b/ips/jenkins.xml
diff --git a/ips/proto.py b/ips/proto.py
diff --git a/ips/readme.txt b/ips/readme.txt
diff --git a/plugins/pom.xml b/plugins/pom.xml
@@ -12,7 +12,7 @@
   <groupId>org.jenkins-ci.plugins</groupId>
   <artifactId>plugin</artifactId>
   <name>Jenkins plugin POM</name>
-  <version>1.611-SNAPSHOT</version>
+  <version>1.612-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <!--
@@ -41,19 +41,19 @@
       <groupId>org.jenkins-ci.main</groupId>
       <artifactId>jenkins-war</artifactId>
       <type>war</type>
-      <version>1.611-SNAPSHOT</version>
+      <version>1.612-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.main</groupId>
       <artifactId>jenkins-core</artifactId>
-      <version>1.611-SNAPSHOT</version>
+      <version>1.612-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.main</groupId>
       <artifactId>jenkins-test-harness</artifactId>
-      <version>1.611-SNAPSHOT</version>
+      <version>1.612-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <!--

diff --git a/pom.xml b/pom.xml
@@ -33,7 +33,7 @@ THE SOFTWARE.
 
   <groupId>org.jenkins-ci.main</groupId>
   <artifactId>pom</artifactId>
-  <version>1.611-SNAPSHOT</version>
+  <version>1.612-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Jenkins main module</name>

diff --git a/test/pom.xml b/test/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>pom</artifactId>
-    <version>1.611-SNAPSHOT</version>
+    <version>1.612-SNAPSHOT</version>
   </parent>
 
   <artifactId>jenkins-test-harness</artifactId>

diff --git a/war/pom.xml b/war/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>pom</artifactId>
-    <version>1.611-SNAPSHOT</version>
+    <version>1.612-SNAPSHOT</version>
   </parent>
 
   <artifactId>jenkins-war</artifactId>
@@ -515,31 +515,6 @@ THE SOFTWARE.
   </build>
 
   <profiles>
-    <profile>
-      <!-- profile for creating Jenkins IPS package -->
-      <id>ips</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.jvnet.updatecenter2</groupId>
-            <artifactId>maven-makepkgs-plugin</artifactId>
-            <!-- version specified in grandparent pom -->
-            <executions>
-              <execution>
-                <goals>
-                  <goal>package</goal>
-                </goals>
-              </execution>
-            </executions>
-            <configuration>
-              <python>python2.5</python>
-              <proto>../ips/proto.py</proto>
-              <attach>false</attach>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
     <profile>
       <!-- sign war -->
       <id>sign</id>