Merge pull request #20 from MatthiasBechtold/JENKINS-13440

fixed JENKINS-13440
jenkinsci · Nov 28, 2015 · b0ce5ed · b0ce5ed
2 parents 2113a1f + d90a60c
commit b0ce5ed
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/src/main/java/hudson/ivy/IvyBuild.java b/src/main/java/hudson/ivy/IvyBuild.java
@@ -410,7 +410,8 @@ private class RunnerImpl extends AbstractRunner {
         @Override
         protected Lease decideWorkspace(Node n, WorkspaceList wsl) throws InterruptedException, IOException {
             String pathToModuleRoot = IvyBuild.this.getProject().getRelativePathToModuleRoot();
-            return wsl.allocate(getModuleSetBuild().getModuleRoot().child(pathToModuleRoot));
+            // 2015-11-25 Matthias Bechtold: changed base path to workspace folder - fixes JENKINS-13440
+            return wsl.allocate(getModuleSetBuild().getWorkspace().child(pathToModuleRoot));
         }
 
         @Override

diff --git a/src/main/java/hudson/ivy/IvyModuleSetBuild.java b/src/main/java/hudson/ivy/IvyModuleSetBuild.java
@@ -530,11 +530,13 @@ private void parseIvyDescriptorFiles(BuildListener listener, PrintStream logger,
             logger.println("Parsing Ivy Descriptor Files");
 
             List<IvyModuleInfo> ivyDescriptors;
-            try {
-            	IvyXmlParser parser = new IvyXmlParser(listener, project, settings, getModuleRoot().getRemote());
-            	if (getModuleRoot().getChannel() instanceof Channel)
-            		((Channel) getModuleRoot().getChannel()).preloadJar(parser, Ivy.class);
-                ivyDescriptors = getModuleRoot().act(parser);
+            // 2015-11-25 Matthias Bechtold: Parse all modules in workspace rather than the first module's folder - fixes JENKINS-13440
+            FilePath moduleRoot = getModuleRoots().length>1 ? getModuleRoot().getParent() : getModuleRoot();
+            try { 
+            	IvyXmlParser parser = new IvyXmlParser(listener, project, settings, moduleRoot.getRemote());
+            	if (moduleRoot.getChannel() instanceof Channel)
+            		((Channel) moduleRoot.getChannel()).preloadJar(parser, Ivy.class);
+                ivyDescriptors = moduleRoot.act(parser);
             } catch (IOException e) {
                 if (e.getCause() instanceof AbortException)
                     throw (AbortException) e.getCause();