diff --git a/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java b/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java index 7d290a179a..6853ed2dd1 100644 --- a/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java @@ -50,6 +50,7 @@ import org.apache.maven.project.MavenProject; import org.apache.maven.project.ProjectBuildingException; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; +import org.apache.commons.io.FilenameUtils; import java.io.*; import java.util.*; @@ -164,7 +165,7 @@ public class MavenModuleSetBuild extends AbstractMavenBuild subsidiaries, String path) { for (MavenModule sub : subsidiaries) - if(path.startsWith(sub.getRelativePath())) + if(path.startsWith(FilenameUtils.normalize(sub.getRelativePath()))) return true; return false; } @@ -173,9 +174,10 @@ public class MavenModuleSetBuild extends AbstractMavenBuild= summedModuleDuration); } + @Bug(5357 + public void testIncrRelMultiModMaven() throws Exception { + configureDefaultMaven("apache-maven-2.2.1", MavenInstallation.MAVEN_21); + MavenModuleSet m = createMavenProject(); + m.setRootPOM("parent/pom.xml"); + m.getReporters().add(new TestReporter()); + m.setScm(new ExtractResourceWithChangesSCM(getClass().getResource("maven-multimod-rel-base.zip"), + getClass().getResource("maven-multimod-changes.zip"))); + + buildAndAssertSuccess(m); + + // Now run a second build with the changes. + m.setIncrementalBuild(true); + buildAndAssertSuccess(m); + + MavenModuleSetBuild pBuild = m.getLastBuild(); + ExtractChangeLogSet changeSet = (ExtractChangeLogSet) pBuild.getChangeSet(); + + assertFalse("ExtractChangeLogSet should not be empty.", changeSet.isEmptySet()); + + for (MavenBuild modBuild : pBuild.getModuleLastBuilds().values()) { + String parentModuleName = modBuild.getParent().getModuleName().toString(); + if (parentModuleName.equals("org.jvnet.hudson.main.test.multimod:moduleA")) { + assertEquals("moduleA should have Result.NOT_BUILT", Result.NOT_BUILT, modBuild.getResult()); + } + else if (parentModuleName.equals("org.jvnet.hudson.main.test.multimod:moduleB")) { + assertEquals("moduleB should have Result.SUCCESS", Result.SUCCESS, modBuild.getResult()); + } + else if (parentModuleName.equals("org.jvnet.hudson.main.test.multimod:moduleC")) { + assertEquals("moduleC should have Result.SUCCESS", Result.SUCCESS, modBuild.getResult()); + } + } + + long summedModuleDuration = 0; + for (MavenBuild modBuild : pBuild.getModuleLastBuilds().values()) { + summedModuleDuration += modBuild.getDuration(); + } + assertTrue("duration of moduleset build should be greater-equal than sum of the module builds", + pBuild.getDuration() >= summedModuleDuration); + } + /** * NPE in {@code getChangeSetFor(m)} in {@link MavenModuleSetBuild} when incremental build is * enabled and a new module is added. diff --git a/test/src/test/resources/hudson/maven/maven-multimod-rel-base.zip b/test/src/test/resources/hudson/maven/maven-multimod-rel-base.zip new file mode 100644 index 0000000000..912f30cc8c Binary files /dev/null and b/test/src/test/resources/hudson/maven/maven-multimod-rel-base.zip differ diff --git a/test/src/test/resources/hudson/maven/maven-multimod.zip b/test/src/test/resources/hudson/maven/maven-multimod.zip index 58615889d1..c5b5c9d285 100644 Binary files a/test/src/test/resources/hudson/maven/maven-multimod.zip and b/test/src/test/resources/hudson/maven/maven-multimod.zip differ