merged back the RC branch

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

changelog.html

@@ -89,7 +89,10 @@ 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.520>What's new in 1.520</a> <!--=DATE=--></h3>
+<h3><a name=v1.521>What's new in 1.521</a> <!--=DATE=--></h3>
+<!--=RC-CHANGES=-->
+</div><!--=END=-->
+<h3><a name=v1.520>What's new in 1.520</a> (2013/06/25)</h3>
 <ul class=image>
   <li class=bug>
     Slave launch thread should have the background activity credential.
@@ -147,7 +150,6 @@ Upcoming changes</a>
     100% CPU pegging in <tt>Deflator.deflateBytes</tt>
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-14362">issue 14362</a>)
 </ul>
-</div><!--=END=-->
 <h3><a name=v1.519>What's new in 1.519</a> (2013/06/17)</h3>
 <ul class=image>
   <li class='major bug'>

debian/debian/changelog

+jenkins (1.520) unstable; urgency=low
+
+  * See http://jenkins-ci.org/changelog for more details.
+
+ -- Kohsuke Kawaguchi <kk@kohsuke.org>  Tue, 25 Jun 2013 23:25:50 -0700
+
 jenkins (1.519) unstable; urgency=low
 
   * See http://jenkins-ci.org/changelog for more details.

test/src/test/java/hudson/maven/MavenProjectTest.java

@@ -23,6 +23,7 @@
  */
 package hudson.maven;
 
+import hudson.maven.local_repo.DefaultLocalRepositoryLocator;
 import hudson.maven.local_repo.PerJobLocalRepositoryLocator;
 import hudson.model.AbstractProject;
 import hudson.model.Item;
@@ -151,6 +152,7 @@ public class MavenProjectTest extends HudsonTestCase {
     @Bug(6779)
     public void testDeleteSetBuildDeletesModuleBuilds() throws Exception {
         MavenModuleSet project = createProject("maven-multimod.zip");
+        project.setLocalRepository(new DefaultLocalRepositoryLocator());
         project.setGoals("install");
         buildAndAssertSuccess(project);
         buildAndAssertSuccess(project.getModule("org.jvnet.hudson.main.test.multimod:moduleB"));