Skip to content

Commit

Permalink
Merge branch 'master' into extensionlist-listener
Browse files Browse the repository at this point in the history 
* 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
  • Loading branch information
@tfennelly
tfennelly committed Apr 28, 2015
2 parents a9f0392 + 9c9049e commit 30ece5f
Show file tree
Hide file tree
Showing 12 changed files with 23 additions and 165 deletions.
12 changes: 11 additions & 1 deletion changelog.html
View file
Expand Up @@ -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.
Expand All @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion cli/pom.xml
View file
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion core/pom.xml
View file
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/hudson/model/Executor.java
View file
Expand Up @@ -642,7 +642,7 @@ public int getProgress() {
} finally {
lock.readLock().unlock();
}
if (d < 0) {
if (d <= 0) {
return -1;
}

Expand Down
4 changes: 2 additions & 2 deletions core/src/main/resources/hudson/slaves/JNLPLauncher/main.jelly
View file
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
67 changes: 0 additions & 67 deletions ips/jenkins.xml
View file

This file was deleted.

51 changes: 0 additions & 51 deletions ips/proto.py
View file

This file was deleted.

9 changes: 0 additions & 9 deletions ips/readme.txt
View file

This file was deleted.

8 changes: 4 additions & 4 deletions plugins/pom.xml
View file
Expand Up @@ -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>

<!--
Expand Down Expand Up @@ -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>
<!--
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion test/pom.xml
View file
Expand Up @@ -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>
Expand Down
27 changes: 1 addition & 26 deletions war/pom.xml
View file
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down

0 comments on commit 30ece5f

Please sign in to comment.