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

changelog.html

@@ -55,16 +55,18 @@ Upcoming changes</a>
 <!-- Record your changes in the trunk here. -->
 <div id="trunk" style="display:none"><!--=TRUNK-BEGIN=-->
 <ul class=image>
-  <li class=bug>
-    Harmless but noisy exception running builds on some Windows systems in non-English locale.
-    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-15316">issue 15316</a>)
+  <li class=>
 </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.488>What's new in 1.488</a> <!--=DATE=--></h3>
-<!--=RC-CHANGES=-->
+<ul class=image>
+  <li class=bug>
+    Harmless but noisy exception running builds on some Windows systems in non-English locale.
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-15316">issue 15316</a>)
+</ul>
 </div><!--=END=-->
 <h3><a name=v1.487>What's new in 1.487</a> (2012/10/23)</h3>
 <ul class=image>

cli/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <artifactId>pom</artifactId>
     <groupId>org.jenkins-ci.main</groupId>
-    <version>1.488-SNAPSHOT</version>
+    <version>1.489-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.488-SNAPSHOT</version>
+    <version>1.489-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

maven-plugin/pom.xml

@@ -29,7 +29,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>pom</artifactId>
-    <version>1.488-SNAPSHOT</version>
+    <version>1.489-SNAPSHOT</version>
   </parent>
 
   <artifactId>maven-plugin</artifactId>

plugins/pom.xml

@@ -5,13 +5,13 @@
     <groupId>org.jenkins-ci</groupId>
     <artifactId>jenkins</artifactId>
     <version>1.29</version>
-    <relativePath/>
+    <relativePath />
   </parent>
 
   <groupId>org.jenkins-ci.plugins</groupId>
   <artifactId>plugin</artifactId>
   <name>Jenkins plugin POM</name>
-  <version>1.488-SNAPSHOT</version>
+  <version>1.489-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <!--
@@ -34,7 +34,7 @@
       <dependency><!-- if a plugin wants to depend on the maven plugin, choose the right version automatically -->
         <groupId>org.jenkins-ci.main</groupId>
         <artifactId>maven-plugin</artifactId>
-        <version>1.488-SNAPSHOT</version>
+        <version>1.489-SNAPSHOT</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
@@ -44,25 +44,25 @@
       <groupId>org.jenkins-ci.main</groupId>
       <artifactId>jenkins-war</artifactId>
       <type>war</type>
-      <version>1.488-SNAPSHOT</version>
+      <version>1.489-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.main</groupId>
       <artifactId>jenkins-core</artifactId>
-      <version>1.488-SNAPSHOT</version>
+      <version>1.489-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.main</groupId>
       <artifactId>jenkins-test-harness</artifactId>
-      <version>1.488-SNAPSHOT</version>
+      <version>1.489-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.main</groupId>
       <artifactId>ui-samples-plugin</artifactId>
-      <version>1.488-SNAPSHOT</version>
+      <version>1.489-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>

pom.xml

@@ -33,7 +33,7 @@ THE SOFTWARE.
 
   <groupId>org.jenkins-ci.main</groupId>
   <artifactId>pom</artifactId>
-  <version>1.488-SNAPSHOT</version>
+  <version>1.489-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.488-SNAPSHOT</version>
+    <version>1.489-SNAPSHOT</version>
   </parent>
   <groupId>org.jenkins-ci.main</groupId>
   <artifactId>jenkins-test-harness</artifactId>

ui-samples-plugin/pom.xml

@@ -29,7 +29,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>pom</artifactId>
-    <version>1.488-SNAPSHOT</version>
+    <version>1.489-SNAPSHOT</version>
   </parent>
 
   <artifactId>ui-samples-plugin</artifactId>

war/pom.xml

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