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

README.md

 [![][ButlerImage]][website] 
 
 # About
-In a nutshell, Jenkins CI is the leading open-source continuous integration server. Built with Java, it provides over 1000 plugins to support building and testing virtually any project.
+In a nutshell, Jenkins is the leading open-source automation server. 
+Built with Java, it provides over 1000 plugins to support automating virtually anything, 
+so that humans can actually spend their time doing things machines cannot.
 
 # Downloads
 Non-source downloads such as WAR files and several Linux packages can be found on our [Mirrors].
 
 # Source
-Our latest and greatest source of Jenkins CI can be found on [GitHub]. Fork us!
+Our latest and greatest source of Jenkins can be found on [GitHub]. Fork us!
 
 # Contributing to Jenkins
 Follow [contributing](CONTRIBUTING.md) file.
 
 # News and Website
-All information about Jenkins CI can be found on our [website]. Follow us on Twitter [@jenkinsci].
+All information about Jenkins can be found on our [website]. Follow us on Twitter [@jenkinsci].
 
 # License
 Jenkins is **licensed** under the **[MIT License]**. The terms of the license are as follows:

changelog.html

@@ -55,7 +55,9 @@ Upcoming changes</a>
 <!-- Record your changes in the trunk here. -->
 <div id="trunk" style="display:none"><!--=TRUNK-BEGIN=-->
 <ul class=image>
-  <li class=>
+  <li class="rfe">
+    Allow the changing the directory used for the extraction of plugin archives via the <code>--pluginroot</code> CLI option (also controllable via the <code>hudson.PluginManager.workDir</code> system property / context parameter. Also document the <code>--webroot</code> CLI parameter in <code>java -jar jenkins.war --help</code>
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-32765">issue 32765</a>)
 </ul>
 </div><!--=TRUNK-END=-->
 <h3><a name=v1.648>What's new in 1.648</a> (2016/02/17)</h3>

core/src/main/java/hudson/ExtensionFinder.java

@@ -175,7 +175,7 @@ public abstract class ExtensionFinder implements ExtensionPoint {
      * from here.
      *
      * <p>
-     * See http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6459208 for how to force a class initialization.
+     * See https://bugs.openjdk.java.net/browse/JDK-4993813 for how to force a class initialization.
      * Also see http://kohsuke.org/2010/09/01/deadlock-that-you-cant-avoid/ for how class initialization
      * can results in a dead lock.
      */
@@ -668,8 +668,7 @@ public abstract class ExtensionFinder implements ExtensionPoint {
                         extType = ((Method)e).getReturnType();
                     } else
                         throw new AssertionError();
-                    // according to http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6459208
-                    // this appears to be the only way to force a class initialization
+                    // according to JDK-4993813 this is the only way to force class initialization
                     Class.forName(extType.getName(),true,extType.getClassLoader());
                 } catch (Exception | LinkageError e) {
                     LOGGER.log(logLevel(item), "Failed to scout "+item.className(), e);

core/src/main/java/hudson/util/jna/InitializationErrorInvocationHandler.java

@@ -12,7 +12,6 @@ import java.lang.reflect.Proxy;
  *
  * @author Kohsuke Kawaguchi
  * @since 1.487
- * @see <a href="http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=7199848">Related bug report against JDK</a>
  */
 public class InitializationErrorInvocationHandler implements InvocationHandler {
     private final Throwable cause;

war/pom.xml

@@ -47,7 +47,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.jenkins-ci</groupId>
       <artifactId>executable-war</artifactId>
-      <version>1.30</version>
+      <version>1.32</version>
       <scope>provided</scope>
     </dependency>
     <dependency>