merged back the RC branch

Conflicts:
	changelog.html

changelog.html

@@ -62,7 +62,7 @@ Upcoming changes</a>
 
 <!-- these changes are controlled by the release process. DO NOT MODIFY -->
 <div id="rc" style="display:none;"><!--=BEGIN=-->
-<h3><a name=v1.499>What's new in 1.499</a> <!--=DATE=--></h3>
+<h3><a name=v1.500>What's new in 1.500</a> <!--=DATE=--></h3>
 <ul class=image>
   <li class=bug>
     Since 1.494, when signing up as a new user in the private security realm the email address was left unconfigured and a stack trace printed.
@@ -77,6 +77,12 @@ Upcoming changes</a>
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-16244">issue 16244</a>)
 </ul>
 </div><!--=END=-->
+<h3><a name=v1.499>What's new in 1.499</a> (2013/01/13)</h3>
+<ul class=image>
+  <li class=bug>
+    Fixed <tt>NoClassDefFoundError: Base64</tt> with the <tt>-jnlpCredentials</tt> option.
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-9679">issue 9679</a>)
+</ul>
 <h3><a name=v1.498>What's new in 1.498</a> (2013/01/07)</h3>
 <ul class=image>
   <li class='major bug'>

cli/pom.xml

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

debian/debian/changelog

+jenkins (1.499) unstable; urgency=low
+
+  * See http://jenkins-ci.org/changelog for more details.
+
+ -- Kohsuke Kawaguchi <kk@kohsuke.org>  Sun, 13 Jan 2013 23:53:20 -0800
+
 jenkins (1.498) unstable; urgency=low
 
   * See http://jenkins-ci.org/changelog for more details.

maven-plugin/pom.xml

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

plugins/pom.xml

@@ -11,7 +11,7 @@
   <groupId>org.jenkins-ci.plugins</groupId>
   <artifactId>plugin</artifactId>
   <name>Jenkins plugin POM</name>
-  <version>1.499-SNAPSHOT</version>
+  <version>1.500-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.499-SNAPSHOT</version>
+        <version>1.500-SNAPSHOT</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
@@ -44,25 +44,25 @@
       <groupId>org.jenkins-ci.main</groupId>
       <artifactId>jenkins-war</artifactId>
       <type>war</type>
-      <version>1.499-SNAPSHOT</version>
+      <version>1.500-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.main</groupId>
       <artifactId>jenkins-core</artifactId>
-      <version>1.499-SNAPSHOT</version>
+      <version>1.500-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.main</groupId>
       <artifactId>jenkins-test-harness</artifactId>
-      <version>1.499-SNAPSHOT</version>
+      <version>1.500-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.main</groupId>
       <artifactId>ui-samples-plugin</artifactId>
-      <version>1.499-SNAPSHOT</version>
+      <version>1.500-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.499-SNAPSHOT</version>
+  <version>1.500-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Jenkins main module</name>
@@ -187,7 +187,7 @@ THE SOFTWARE.
       <dependency>
         <groupId>org.jenkins-ci.main</groupId>
         <artifactId>remoting</artifactId>
-        <version>2.20</version>
+        <version>2.21</version>
       </dependency>
 
       <dependency>

test/pom.xml

@@ -29,7 +29,7 @@ THE SOFTWARE.
   <parent>
     <artifactId>pom</artifactId>
     <groupId>org.jenkins-ci.main</groupId>
-    <version>1.499-SNAPSHOT</version>
+    <version>1.500-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.499-SNAPSHOT</version>
+    <version>1.500-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.499-SNAPSHOT</version>
+    <version>1.500-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>