From d5b8cf4a28ea41caf84528656f9b931695cb3fb5 Mon Sep 17 00:00:00 2001
From: Christoph Kutzinski <kutzi@gmx.de>
Date: Thu, 2 Jun 2011 16:28:31 +0200
Subject: [PATCH] [FIXED JENKINS-9848] if POM parsing failed, do a full build
 next time (for incremental builds)

---
 changelog.html                                |  3 ++
 .../hudson/maven/MavenModuleSetBuild.java     | 29 +++++++++++++++----
 .../hudson/maven/NeedsFullBuildAction.java    | 24 +++++++++++++++
 3 files changed, 50 insertions(+), 6 deletions(-)
 create mode 100644 maven-plugin/src/main/java/hudson/maven/NeedsFullBuildAction.java

diff --git a/changelog.html b/changelog.html
index d57c2dec20..e1978fd4ce 100644
--- a/changelog.html
+++ b/changelog.html
@@ -59,6 +59,9 @@ Upcoming changes</a>
     Output correct version from java -jar jenkins.war --version (broken since 1.410)
   <li class=bug>
     Correct usage text from java -jar jenkins.war --help
+  <li class=bug>
+    Incremental maven jobs: if POM parsing failed, do a full build next time.
+    (<a href="http://issues.jenkins-ci.org/browse/JENKINS-9848">issue 9848</a>)
   <li class=rfe>
     CLI command page now lists all the available commands
     (<a href="http://issues.jenkins-ci.org/browse/JENKINS-9789">issue 9789</a>)
diff --git a/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java b/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java
index 32c11ab083..e780f88c61 100644
--- a/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java
+++ b/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java
@@ -374,7 +374,7 @@ public class MavenModuleSetBuild extends AbstractMavenBuild<MavenModuleSet,Maven
      * Gets the version of Maven used for build.
      *
      * @return
-     *      null if this build is done by earlier version of Hudson that didn't record this information
+     *      null if this build is done by earlier version of Jenkins that didn't record this information
      *      (this means the build was done by Maven2.x)
      */
     public String getMavenVersionUsed() {
@@ -407,7 +407,7 @@ public class MavenModuleSetBuild extends AbstractMavenBuild<MavenModuleSet,Maven
 
     /**
      * Computes the latest module builds that correspond to this build.
-     * (when indivudual modules are built, a new ModuleSetBuild is not created,
+     * (when individual modules are built, a new ModuleSetBuild is not created,
      *  but rather the new module build falls under the previous ModuleSetBuild)
      */
     public Map<MavenModule,MavenBuild> getModuleLastBuilds() {
@@ -672,6 +672,7 @@ public class MavenModuleSetBuild extends AbstractMavenBuild<MavenModuleSet,Maven
                         }
                         else
                         {
+                            LOGGER.info( "using maven 2 " + mavenVersion );
                             process =
                                 MavenBuild.mavenProcessCache.get( launcher.getChannel(), slistener,
                                                                   new MavenProcessFactory( project, launcher, envVars,getMavenOpts(listener),
@@ -680,11 +681,17 @@ public class MavenModuleSetBuild extends AbstractMavenBuild<MavenModuleSet,Maven
                         ArgumentListBuilder margs = new ArgumentListBuilder().add("-B").add("-f", pom.getRemote());
                         if(project.usesPrivateRepository())
                             margs.add("-Dmaven.repo.local="+getWorkspace().child(".repository"));
-                        // If incrementalBuild is set, and we're on Maven 2.1 or later, *and* there's at least one module
-                        // listed in changedModules, do the Maven incremental build commands - if there are no changed modules,
-                        // We're building everything anyway.
+                        
+                        // If incrementalBuild is set
+                        // and the previous build didn't specify that we need a full build
+                        // and we're on Maven 2.1 or later
+                        // and there's at least one module listed in changedModules,
+                        // then do the Maven incremental build commands.
+                        // If there are no changed modules, we're building everything anyway.
                         boolean maven2_1orLater = new ComparableVersion (mavenVersion).compareTo( new ComparableVersion ("2.1") ) >= 0;
-                        if (project.isIncrementalBuild() && maven2_1orLater && !changedModules.isEmpty()) {
+                        boolean needsFullBuild = getPreviousCompletedBuild() != null &&
+                            getPreviousCompletedBuild().getAction(NeedsFullBuildAction.class) != null;
+                        if (project.isIncrementalBuild() && !needsFullBuild && maven2_1orLater && !changedModules.isEmpty()) {
                             margs.add("-amd");
                             margs.add("-pl", Util.join(changedModules, ","));
                         }
@@ -816,12 +823,22 @@ public class MavenModuleSetBuild extends AbstractMavenBuild<MavenModuleSet,Maven
             try {
                 poms = getModuleRoot().act(new PomParser(listener, mvn, project, mavenVersion, envVars));
             } catch (IOException e) {
+                if (project.isIncrementalBuild()) {
+                    // If POM parsing failed we should do a full build next time.
+                    // Otherwise only the modules which have a SCM change for the next build might
+                    // be build next time.
+                    getActions().add(new NeedsFullBuildAction());
+                }
+                
                 if (e.getCause() instanceof AbortException)
                     throw (AbortException) e.getCause();
                 throw e;
             } catch (MavenExecutionException e) {
                 // Maven failed to parse POM
                 e.getCause().printStackTrace(listener.error(Messages.MavenModuleSetBuild_FailedToParsePom()));
+                if (project.isIncrementalBuild()) {
+                    getActions().add(new NeedsFullBuildAction());
+                }
                 throw new AbortException();
             }
 
diff --git a/maven-plugin/src/main/java/hudson/maven/NeedsFullBuildAction.java b/maven-plugin/src/main/java/hudson/maven/NeedsFullBuildAction.java
new file mode 100644
index 0000000000..1bd01c9c26
--- /dev/null
+++ b/maven-plugin/src/main/java/hudson/maven/NeedsFullBuildAction.java
@@ -0,0 +1,24 @@
+package hudson.maven;
+
+import hudson.model.Action;
+
+/**
+ * Action signalling that this {@link MavenModuleSet} needs a full build
+ * on the next run even if it's marked as an incremental build.
+ *  
+ * @author kutzi
+ */
+public class NeedsFullBuildAction implements Action {
+
+    public String getIconFileName() {
+        return null;
+    }
+
+    public String getDisplayName() {
+        return null;
+    }
+
+    public String getUrlName() {
+        return null;
+    }
+}
-- 
GitLab