Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'master' into JENKINS-27289
  • Loading branch information
liorhson committed May 4, 2015
2 parents ae20c03 + cf59d93 commit 6428d15
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 10 deletions.
6 changes: 5 additions & 1 deletion changelog.html
Expand Up @@ -54,6 +54,11 @@

<!-- Record your changes in the trunk here. -->
<div id="trunk" style="display:none"><!--=TRUNK-BEGIN=-->
<ul class=image>
<li class=>
</ul>
</div><!--=TRUNK-END=-->
<h3><a name=v1.612>What's new in 1.612</a> (2015/05/03)</h3>
<ul class=image>
<li class=bug>
Handle AbortException publisher status in the same way as deprecated false boolean status
Expand Down Expand Up @@ -82,7 +87,6 @@
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>
Expand Down
2 changes: 1 addition & 1 deletion cli/pom.xml
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jenkins-ci.main</groupId>
<artifactId>pom</artifactId>
<version>1.612-SNAPSHOT</version>
<version>1.613-SNAPSHOT</version>
</parent>

<artifactId>cli</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion core/pom.xml
Expand Up @@ -29,7 +29,7 @@ THE SOFTWARE.
<parent>
<groupId>org.jenkins-ci.main</groupId>
<artifactId>pom</artifactId>
<version>1.612-SNAPSHOT</version>
<version>1.613-SNAPSHOT</version>
</parent>

<artifactId>jenkins-core</artifactId>
Expand Down
8 changes: 4 additions & 4 deletions plugins/pom.xml
Expand Up @@ -12,7 +12,7 @@
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<name>Jenkins plugin POM</name>
<version>1.612-SNAPSHOT</version>
<version>1.613-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.612-SNAPSHOT</version>
<version>1.613-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.main</groupId>
<artifactId>jenkins-core</artifactId>
<version>1.612-SNAPSHOT</version>
<version>1.613-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.main</groupId>
<artifactId>jenkins-test-harness</artifactId>
<version>1.612-SNAPSHOT</version>
<version>1.613-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<!--
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Expand Up @@ -33,7 +33,7 @@ THE SOFTWARE.

<groupId>org.jenkins-ci.main</groupId>
<artifactId>pom</artifactId>
<version>1.612-SNAPSHOT</version>
<version>1.613-SNAPSHOT</version>
<packaging>pom</packaging>

<name>Jenkins main module</name>
Expand Down
2 changes: 1 addition & 1 deletion test/pom.xml
Expand Up @@ -28,7 +28,7 @@ THE SOFTWARE.
<parent>
<groupId>org.jenkins-ci.main</groupId>
<artifactId>pom</artifactId>
<version>1.612-SNAPSHOT</version>
<version>1.613-SNAPSHOT</version>
</parent>

<artifactId>jenkins-test-harness</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion war/pom.xml
Expand Up @@ -28,7 +28,7 @@ THE SOFTWARE.
<parent>
<groupId>org.jenkins-ci.main</groupId>
<artifactId>pom</artifactId>
<version>1.612-SNAPSHOT</version>
<version>1.613-SNAPSHOT</version>
</parent>

<artifactId>jenkins-war</artifactId>
Expand Down

0 comments on commit 6428d15

Please sign in to comment.