[FIXED JENKINS-8658]

Recording the earlier changes and the integration of the new
executable-war.

changelog.html

@@ -43,6 +43,9 @@ Upcoming changes</a>
   <li class='major bug'>
     Fixed a master/slave communication problem that often manifests as "Not in GZIP format"
     (<a href="http://issues.jenkins-ci.org/browse/JENKINS-7745">issue 7745</a>)
+  <li class=bug>
+    When run as "java -jar jenkins.war", "~/.hudson" was still used as default.
+    (<a href="http://issues.jenkins-ci.org/browse/JENKINS-8658">issue 8658</a>)
 </ul>
 </div><!--=TRUNK-END=-->
 

war/pom.xml

@@ -109,7 +109,7 @@ THE SOFTWARE.
                 <mkdir dir="target/generated-resources" />
 
                 <!-- put executable war header -->
-                <resolveArtifact groupId="org.jvnet.hudson" artifactId="executable-war" version="1.18-SNAPSHOT" type="jar" property="executable-war.jar" />
+                <resolveArtifact groupId="org.jenkins-ci" artifactId="executable-war" version="1.18" type="jar" property="executable-war.jar" />
                 <unjar src="${executable-war.jar}" dest="target/generated-resources">
                   <patternset>
                     <include name="**/*.class" />