Merge branch 'master' into cron-hash-JENKINS-17311

changelog.html

@@ -64,6 +64,9 @@ Upcoming changes</a>
   <li class=rfe>
     Better report file deletion failures.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-17271">issue 17271</a>)
+  <li class=bug>
+    "Local to the workspace" repository locator does not work when building one module in isolation.
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-17331">issue 17331</a>)
   <li class=bug>
     Master node mode not correctly displayed in <code>/computer/(master)/configure</code>.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-17263">issue 17263</a>)

core/src/main/java/hudson/tasks/ArtifactArchiver.java

@@ -32,7 +32,6 @@ import hudson.model.AbstractProject;
 import hudson.model.BuildListener;
 import hudson.model.Result;
 import hudson.util.FormValidation;
-import hudson.util.TimeUnit2;
 import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.AncestorInPath;
@@ -123,7 +122,6 @@ public class ArtifactArchiver extends Recorder {
         File dir = build.getArtifactsDir();
         dir.mkdirs();
 
-        final long start = System.nanoTime();
         listener.getLogger().println(Messages.ArtifactArchiver_ARCHIVING_ARTIFACTS());
         try {
             FilePath ws = build.getWorkspace();
@@ -159,8 +157,6 @@ public class ArtifactArchiver extends Recorder {
             return true;
         }
 
-        // System.out.println("Took "+ TimeUnit2.NANOSECONDS.toMillis(System.nanoTime()-start));
-
         return true;
     }
 

maven-plugin/src/main/java/hudson/maven/MavenBuild.java

@@ -74,6 +74,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.logging.Logger;
+import javax.annotation.CheckForNull;
 
 import jenkins.mvn.SettingsProvider;
 
@@ -153,7 +154,7 @@ public class MavenBuild extends AbstractMavenBuild<MavenModule,MavenBuild> {
      *      is manually triggered.
      * @see #getModuleSetBuild()
      */
-    public MavenModuleSetBuild getParentBuild() {
+    public @CheckForNull MavenModuleSetBuild getParentBuild() {
         return getParent().getParent().getBuildByNumber(getNumber());
     }
 
@@ -174,7 +175,7 @@ public class MavenBuild extends AbstractMavenBuild<MavenModule,MavenBuild> {
      *      is manually removed.
      * @see #getParentBuild()
      */
-    public MavenModuleSetBuild getModuleSetBuild() {
+    public @CheckForNull MavenModuleSetBuild getModuleSetBuild() {
         return getParent().getParent().getNearestOldBuild(getNumber());
     }
 

maven-plugin/src/main/java/hudson/maven/local_repo/PerJobLocalRepositoryLocator.java

@@ -3,6 +3,8 @@ package hudson.maven.local_repo;
 import hudson.Extension;
 import hudson.FilePath;
 import hudson.maven.AbstractMavenBuild;
+import hudson.maven.MavenBuild;
+import hudson.maven.MavenModuleSetBuild;
 import org.kohsuke.stapler.DataBoundConstructor;
 
 /**
@@ -17,8 +19,17 @@ public class PerJobLocalRepositoryLocator extends LocalRepositoryLocator {
 
     @Override
     public FilePath locate(AbstractMavenBuild build) {
-        // XXX should this use ((MavenBuild) build).getParentBuild().getWorkspace() when instanceof MavenBuild?
-        return build.getWorkspace().child(".repository");
+        if (build instanceof MavenBuild) {
+            MavenModuleSetBuild parentBuild = ((MavenBuild) build).getModuleSetBuild();
+            if (parentBuild != null) {
+                build = parentBuild;
+            }
+        }
+        FilePath ws = build.getWorkspace();
+        if (ws == null) {
+            return null;
+        }
+        return ws.child(".repository");
     }
 
     @Extension

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

@@ -23,7 +23,7 @@
  */
 package hudson.maven;
 
-import hudson.maven.local_repo.PerExecutorLocalRepositoryLocator;
+import hudson.maven.local_repo.PerJobLocalRepositoryLocator;
 import hudson.model.AbstractProject;
 import hudson.model.Item;
 import hudson.model.Result;
@@ -75,8 +75,7 @@ public class MavenProjectTest extends HudsonTestCase {
         project.setScm(new ExtractResourceSCM(getClass().getResource(
                 scmResource)));
         project.setMaven(mi.getName());
-        // PerJobLocalRepositoryLocator does not work, since the repo for a module is distinct from that of the set
-        project.setLocalRepository(new PerExecutorLocalRepositoryLocator());
+        project.setLocalRepository(new PerJobLocalRepositoryLocator());
         return project;
     }
 

war/pom.xml

@@ -270,7 +270,6 @@ THE SOFTWARE.
                 <artifactItem>
                   <groupId>org.jenkins-ci.plugins</groupId>
                   <artifactId>ssh-slaves</artifactId>
-                  <!-- when upgrading may need to add credentials and ssh-credentials too: https://github.com/jenkinsci/ssh-slaves-plugin/commit/7f7031bdaae528baf8e4a1cf29a95849ef268c5c -->
                   <version>0.23</version>
                   <type>hpi</type>
                 </artifactItem>