diff --git a/core/src/main/java/hudson/maven/MavenModuleSetBuild.java b/core/src/main/java/hudson/maven/MavenModuleSetBuild.java index 4462d017c2..8f19b5b275 100644 --- a/core/src/main/java/hudson/maven/MavenModuleSetBuild.java +++ b/core/src/main/java/hudson/maven/MavenModuleSetBuild.java @@ -8,7 +8,6 @@ import hudson.model.BuildListener; import hudson.model.Hudson; import hudson.model.Result; import hudson.remoting.VirtualChannel; -import hudson.tasks.test.AbstractTestResultAction; import hudson.util.IOException2; import org.apache.maven.embedder.MavenEmbedderException; import org.apache.maven.project.MavenProject; @@ -24,8 +23,8 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.logging.Logger; import java.util.logging.Level; +import java.util.logging.Logger; /** * {@link Build} for {@link MavenModuleSet}. @@ -284,7 +283,7 @@ public final class MavenModuleSetBuild extends AbstractBuild relPath = new HashMap(); - MavenUtil.resolveModules(embedder,mp,getRootPath(),relPath); + MavenUtil.resolveModules(embedder,mp,getRootPath(),relPath,listener); List infos = new ArrayList(); toPomInfo(mp,null,relPath,infos); diff --git a/core/src/main/java/hudson/maven/MavenUtil.java b/core/src/main/java/hudson/maven/MavenUtil.java index ffe89527c6..3f87b28a23 100644 --- a/core/src/main/java/hudson/maven/MavenUtil.java +++ b/core/src/main/java/hudson/maven/MavenUtil.java @@ -1,6 +1,7 @@ package hudson.maven; import hudson.model.TaskListener; +import hudson.model.BuildListener; import org.apache.maven.embedder.MavenEmbedderException; import org.apache.maven.project.MavenProject; import org.apache.maven.project.ProjectBuildingException; @@ -55,8 +56,11 @@ public class MavenUtil { * Upon the completion of this method, this variable stores the relative path * from the root directory of the given {@link MavenProject} to the root directory * of each of the newly parsed {@link MavenProject}. + * + * @throws AbortException + * errors will be reported to the listener and the exception thrown. */ - public static void resolveModules(MavenEmbedder embedder, MavenProject project, String rel, Map relativePathInfo) throws ProjectBuildingException { + public static void resolveModules(MavenEmbedder embedder, MavenProject project, String rel, Map relativePathInfo, BuildListener listener) throws ProjectBuildingException, AbortException { File basedir = project.getFile().getParentFile(); relativePathInfo.put(project,rel); @@ -65,13 +69,17 @@ public class MavenUtil { for (String modulePath : (List) project.getModules()) { File moduleFile = new File(new File(basedir, modulePath),"pom.xml"); + if(!moduleFile.exists()) { + listener.getLogger().println(moduleFile+" is referenced from "+project.getFile()+" but it doesn't exist"); + throw new AbortException(); + } String relativePath = rel; if(relativePath.length()>0) relativePath+='/'; relativePath+=modulePath; MavenProject child = embedder.readProject(moduleFile); - resolveModules(embedder,child,relativePath,relativePathInfo); + resolveModules(embedder,child,relativePath,relativePathInfo,listener); modules.add(child); }