Merge branch '2.0' into JENKINS-33759-misc

jenkinsci · Mar 28, 2016 · 8c2cc70 · 8c2cc70
2 parents d2eb07d + 6219c8f
commit 8c2cc70
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 6 deletions.
diff --git a/.mvn/jvm.config b/.mvn/jvm.config
@@ -0,0 +1 @@
+-Xmx800m
diff --git a/changelog.html b/changelog.html
@@ -24,7 +24,7 @@
 <!--[if IE]>
 <style type="text/css">div.rate-offset { bottom: 0.2em !important; left: 5em !important; }</style>
 <![endif]-->
-  <script type="text/javascript" src="/rate/rate.js"></script>
+  <script type="text/javascript" src="https://jenkins-ci.org/rate/rate.js"></script>
 </head>
 <body>
 <div align="right">Legend:
@@ -33,6 +33,7 @@
         <img src="/images/bug2.gif" alt="major bug">major bug fix     <img src="/images/bug.gif" alt="bug">bug fix
     </span><span style="visibility:hidden">xxxxx</span>
 </div>
+<div id="head"></div>
 
 <div id="ratings" style="display:none; font-size:120%;
      border:1px solid black; background-color:#eee; padding:0.5em; margin-bottom:1em">
@@ -58,6 +59,31 @@
   <li class=>
 </ul>
 </div><!--=TRUNK-END=-->
+<h3><a name=v1.655>What's new in 1.655</a> (2016/03/27)</h3>
+<ul class=image>
+  <li class="major bug">
+    Downgrade Stapler to 1.239 to fix remote API issues.
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-33546">issue 33546</a>, 
+    <a href="https://issues.jenkins-ci.org/browse/JENKINS-33605">issue 33605</a>)
+  <li class="major bug">
+    Plugin filters were failing to be removed and blocking restart.
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-33681">issue 33681</a>)
+  <li class="bug">
+    Do not hardcode <tt>.bat</tt> extension for Maven on Windows.
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-33693">issue 33693</a>)
+  <li class="rfe">
+    Reduce log level of <tt>UncaughtExceptionHandler</tt> message on startup.
+    (<a href="https://github.com/jenkinsci/jenkins/pull/2171">pull 2171</a>)
+  <li class="rfe">
+    Make list of build causes immutable.
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-33467">issue 33467</a>)
+  <li class="rfe">
+    Developer API: Add <tt>Fingerprint.getXStream()</tt>.
+    (<a href="https://github.com/jenkinsci/jenkins/pull/2163">pull 2163</a>)
+  <li class="rfe">
+    Core Development:  Add the <tt>.mvn</tt> directory and set default <tt>-Xmx</tt> value.
+    (<a href="https://github.com/jenkinsci/jenkins/pull/2162">pull 2162</a>)
+</ul>
 <h3><a name=v1.654>What's new in 1.654</a> (2016/03/21)</h3>
 <ul class=image>
   <li class="bug">

diff --git a/core/pom.xml b/core/pom.xml
@@ -39,7 +39,7 @@ THE SOFTWARE.
 
   <properties>
     <staplerFork>true</staplerFork>
-    <stapler.version>1.240</stapler.version>
+    <stapler.version>1.239</stapler.version>
     <spring.version>2.5.6.SEC03</spring.version>
     <groovy.version>2.4.6</groovy.version>
   </properties>

diff --git a/core/src/main/java/hudson/init/impl/InstallUncaughtExceptionHandler.java b/core/src/main/java/hudson/init/impl/InstallUncaughtExceptionHandler.java
@@ -42,7 +42,7 @@ public void reportException(Throwable e, ServletContext context, HttpServletRequ
         });
         try {
             Thread.setDefaultUncaughtExceptionHandler(new DefaultUncaughtExceptionHandler());
-            DefaultUncaughtExceptionHandler.LOGGER.log(Level.INFO, "Succesfully installed a global UncaughtExceptionHandler."); 
+            DefaultUncaughtExceptionHandler.LOGGER.log(Level.FINE, "Successfully installed a global UncaughtExceptionHandler.");
         }
         catch (SecurityException ex) {
             DefaultUncaughtExceptionHandler.LOGGER.log(Level.SEVERE, 

diff --git a/core/src/main/java/hudson/model/Fingerprint.java b/core/src/main/java/hudson/model/Fingerprint.java
@@ -1469,7 +1469,19 @@ public void run() {
         return res[0];
     }
 
-    private static final XStream XSTREAM = new XStream2();
+    private static final XStream2 XSTREAM = new XStream2();
+
+    /**
+     * Provides the XStream instance this class is using for serialization.
+     *
+     * @return the XStream instance
+     * @since FIXME
+     */
+    @Nonnull
+    public static XStream2 getXStream() {
+        return XSTREAM;
+    }
+
     static {
         XSTREAM.alias("fingerprint",Fingerprint.class);
         XSTREAM.alias("range",Range.class);

diff --git a/core/src/main/java/jenkins/install/SetupWizard.java b/core/src/main/java/jenkins/install/SetupWizard.java
@@ -113,7 +113,7 @@ public SetupWizard(Jenkins j) throws IOException, InterruptedException {
                 + "*************************************************************" + ls
                 + "*************************************************************" + ls
                 + ls
-                + "Jenkins initial setup is required. An admin user has been created and"
+                + "Jenkins initial setup is required. An admin user has been created and "
                 + "a password generated." + ls
                 + "Please use the following password to proceed to installation:" + ls
                 + ls

diff --git a/core/src/main/resources/hudson/tools/label.jelly b/core/src/main/resources/hudson/tools/label.jelly
@@ -25,7 +25,7 @@ THE SOFTWARE.
 <j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form" xmlns:st="jelly:stapler">
     <st:documentation>
         Puts the input field for allowing an user to limit this installer to a certain label.
-        Meant to be used from config.jelly of ToolInstaller subypes. 
+        Meant to be used from config.jelly of ToolInstaller subtypes. 
     </st:documentation>
     <f:entry title="${%Label}" field="label" help="/help/tools/help-label.html">
         <!-- TODO could use Hudson.getLabels and make a combo box -->