Conflicts:
	.idea/encodings.xml
	core/pom.xml
	pom.xml
	test/src/test/java/hudson/tasks/junit/CaseResultTest.java

Integrated the change

Bumping up dependencies to 1.3.1, with extra precaution to make
DiskFileItem non-serializable

(cherry picked from commit 261f4053)

(cherry picked from commit facfc178)

Conflicts:
	test/src/test/groovy/hudson/cli/BuildCommandTest.groovy
	test/src/test/groovy/hudson/matrix/MatrixProjectTest.groovy
	test/src/test/groovy/hudson/model/UpdateCenter2Test.groovy
	test/src/test/java/hudson/model/UpdateSiteTest.java
	test/src/test/java/hudson/tasks/FingerprinterTest.java
	test/src/test/java/hudson/tasks/junit/JUnitResultArchiverTest.java

[JENKINS-21984] Disabling cert check on updateDirectlyWithJson since the certificate is now expired, and it is no good to have a test which is known to start failing at a particular time in the future!
(cherry picked from commit 334ce1be)

The jenkins_main_trunk job has been retired, so for now just skip these tests when running on any Jenkins server.
(cherry picked from commit b7d4c6a4)

Conflicts:
	test/src/test/groovy/hudson/cli/BuildCommandTest.groovy

Conflicts:
	test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java
	test/src/main/java/org/jvnet/hudson/test/JenkinsRule.java
	test/src/test/groovy/hudson/model/AbstractProjectTest.groovy

For reasons TBD, sometimes CI tests fail with (1.565.x):
java.lang.InterruptedException: null
	at java.lang.Object.wait(Native Method)
	at java.lang.Object.wait(Object.java:503)
	at org.jvnet.hudson.reactor.Reactor.execute(Reactor.java:267)
	at jenkins.InitReactorRunner.run(InitReactorRunner.java:44)
	at jenkins.model.Jenkins.executeReactor(Jenkins.java:915)
	at jenkins.model.Jenkins.<init>(Jenkins.java:814)
	at hudson.model.Hudson.<init>(Hudson.java:82)
	at org.jvnet.hudson.test.JenkinsRule.newHudson(JenkinsRule.java:539)
	at org.jvnet.hudson.test.JenkinsRule.before(JenkinsRule.java:331)
	at org.jvnet.hudson.test.JenkinsRule$2.evaluate(JenkinsRule.java:479)
(cherry picked from commit 7bbf36b7)

Trying to make SocketTimeoutException’s (as originally noted in 3ec7e562) not turn into test errors. (Works only in JenkinsRule, not HudsonTestCase.) Still have no clue as to cause.

(cherry picked from commit 6fd76ea2)

Conflicts:
	test/src/main/java/org/jvnet/hudson/test/JenkinsRule.java

For example https://jenkins.ci.cloudbees.com/job/core/job/jenkins-core-validated-merge/38/testReport/lib.layout/LayoutTest/rejectedLinks/ failed with:
java.io.IOException: GET http://localhost:52099/jenkins/login failed
	at java.net.SocketInputStream.socketRead0(Native Method)
	at java.net.SocketInputStream.read(SocketInputStream.java:152)
	at java.net.SocketInputStream.read(SocketInputStream.java:122)
	at java.io.BufferedInputStream.fill(BufferedInputStream.java:235)
	at java.io.BufferedInputStream.read(BufferedInputStream.java:254)
	at org.apache.commons.httpclient.HttpParser.readRawLine(HttpParser.java:78)
	at org.apache.commons.httpclient.HttpParser.readLine(HttpParser.java:106)
	at org.apache.commons.httpclient.HttpConnection.readLine(HttpConnection.java:1116)
	at org.apache.commons.httpclient.MultiThreadedHttpConnectionManager$HttpConnectionAdapter.readLine(MultiThreadedHttpConnectionManager.java:1413)
	at org.apache.commons.httpclient.HttpMethodBase.readStatusLine(HttpMethodBase.java:1973)
	at org.apache.commons.httpclient.HttpMethodBase.readResponse(HttpMethodBase.java:1735)
	at org.apache.commons.httpclient.HttpMethodBase.execute(HttpMethodBase.java:1098)
	at org.apache.commons.httpclient.HttpMethodDirector.executeWithRetry(HttpMethodDirector.java:398)
	at org.apache.commons.httpclient.HttpMethodDirector.executeMethod(HttpMethodDirector.java:171)
	at org.apache.commons.httpclient.HttpClient.executeMethod(HttpClient.java:397)
	at org.apache.commons.httpclient.HttpClient.executeMethod(HttpClient.java:346)
	at com.gargoylesoftware.htmlunit.HttpWebConnection.getResponse(HttpWebConnection.java:101)
	at com.gargoylesoftware.htmlunit.WebClient.loadWebResponseFromWebConnection(WebClient.java:1456)
	at com.gargoylesoftware.htmlunit.WebClient.loadWebResponse(WebClient.java:1387)
	at com.gargoylesoftware.htmlunit.WebClient.getPage(WebClient.java:328)
	at com.gargoylesoftware.htmlunit.WebClient.getPage(WebClient.java:389)
	at com.gargoylesoftware.htmlunit.WebClient.getPage(WebClient.java:374)
	at org.jvnet.hudson.test.JenkinsRule$WebClient.goTo(JenkinsRule.java:1944)
	at org.jvnet.hudson.test.JenkinsRule$WebClient.goTo(JenkinsRule.java:1926)
	at lib.layout.LayoutTest.rejectedLinks(LayoutTest.java:44)
which makes little sense since the named IOException is actually thrown from HttpWebConnection.java:130.
Perhaps Surefire is not reporting the original cause correctly, conflating the wrapper’s message with the original stack trace.
As a temporary measure, printing the original stack trace to stderr if there is any.
(cherry picked from commit 3ec7e562)

Conflicts:
	test/src/main/java/org/jvnet/hudson/test/JenkinsRule.java

[JENKINS-10615] AbstractProjectTest.testWorkspaceLock frequently fails on jenkins.ci due to InterruptedException in HudsonTestCase.setUp.
Possibly because it is sorted after [JENKINS-15156] testGetBuildAfterGC and the test suite times out.

(cherry picked from commit 85e9e126)

[JENKINS-19192] Using JNR 3.0.1 which includes JNR-FFI 1.0.7; 1.0.6 has the backported fix for Guava #1505, the root cause.
So this upgrade ought to prevent a recurrence of the issue in case some other code refers to JNR from the CLI.
(As yet untested, and we do not especially want to send JNR over the CLI channel anyway for performance reasons.)

(cherry picked from commit 5e7b844b)

Conflicts:
	changelog.html

Stapler 1.218.1 was apparently never even deployed to the Maven repo, so let us just skip straight to 1.229 which has the fix and which we are using in the merged release branches anyway.

(cherry picked from commit 71600d8b)

Conflicts:
	.idea/compiler.xml
	core/pom.xml
	pom.xml
	war/pom.xml

(cherry picked from commit 9b53643c)

Conflicts:
	pom.xml

See https://github.com/jenkinsci/maven-plugin

(cherry picked from commit f98070d3)

Conflicts:
	maven-plugin/pom.xml
	maven-plugin/src/main/java/hudson/maven/AbstractMavenProcessFactory.java
	maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java
	maven-plugin/src/main/java/hudson/maven/MavenProcessFactory.java
	maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/configure-entries.jelly
	plugins/pom.xml
	pom.xml

Conflicts:
	core/src/main/java/hudson/model/AbstractItem.java
	core/src/main/java/hudson/security/ACL.java
	test/src/test/groovy/hudson/model/AbstractProjectTest.groovy