From 3bf4b46b6b5e937db3edc9e061f74f0b3ff13729 Mon Sep 17 00:00:00 2001
From: kohsuke <kohsuke@71c3de6d-444a-0410-be80-ed276b4c234a>
Date: Tue, 5 Aug 2008 00:45:52 +0000
Subject: [PATCH] Improved the error detection of missing Maven configuration
 in the native m2 job.

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@11225 71c3de6d-444a-0410-be80-ed276b4c234a
---
 .../java/hudson/maven/MavenModuleSetBuild.java   |  9 ++++++++-
 .../hudson/model/UpdateCenter/main.jelly         | 16 ----------------
 2 files changed, 8 insertions(+), 17 deletions(-)
 delete mode 100644 core/src/main/resources/hudson/model/UpdateCenter/main.jelly

diff --git a/core/src/main/java/hudson/maven/MavenModuleSetBuild.java b/core/src/main/java/hudson/maven/MavenModuleSetBuild.java
index c0a0478d22..77917c6133 100644
--- a/core/src/main/java/hudson/maven/MavenModuleSetBuild.java
+++ b/core/src/main/java/hudson/maven/MavenModuleSetBuild.java
@@ -6,6 +6,7 @@ import hudson.FilePath.FileCallable;
 import hudson.Launcher;
 import hudson.Util;
 import hudson.tasks.BuildWrapper;
+import hudson.tasks.Maven;
 import hudson.tasks.Maven.MavenInstallation;
 import hudson.maven.MavenBuild.ProxyImpl2;
 import hudson.maven.reporters.MavenFingerprinter;
@@ -378,9 +379,15 @@ public final class MavenModuleSetBuild extends AbstractBuild<MavenModuleSet,Mave
 
         private void parsePoms(BuildListener listener, PrintStream logger) throws IOException, InterruptedException {
             logger.println("Parsing POMs");
+            MavenInstallation mvn = project.getMaven();
+            if(mvn==null) {
+                logger.println("A Maven configuration needs to be associated with this project. Please reconfigure this project");
+                throw new AbortException();
+            }
+
             List<PomInfo> poms;
             try {
-                poms = project.getModuleRoot().act(new PomParser(listener,project.getMaven(),project.getRootPOM(),project.getProfiles()));
+                poms = project.getModuleRoot().act(new PomParser(listener, mvn,project.getRootPOM(),project.getProfiles()));
             } catch (IOException e) {
                 if (e.getCause() instanceof AbortException)
                     throw (AbortException) e.getCause();
diff --git a/core/src/main/resources/hudson/model/UpdateCenter/main.jelly b/core/src/main/resources/hudson/model/UpdateCenter/main.jelly
deleted file mode 100644
index f26548acc8..0000000000
--- a/core/src/main/resources/hudson/model/UpdateCenter/main.jelly
+++ /dev/null
@@ -1,16 +0,0 @@
-<!--
-  If necessary, ask the client to fetch update-center data file for us.
-  This allows us to avoid proxy related configuration on the server,
-  and instead piggy-back on user connection.
-
-  This file is pulled into the layout.jelly
--->
-<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
-  <j:if test="${it.due or forcedUpdateCheck}">
-    <script>
-      updateCenter.postBackURL = "${rootURL}/updateCenter/postBack";
-      updateCenter.version = "${h.version}"; 
-      Behaviour.addLoadEvent(updateCenter.checkUpdates);
-    </script>
-  </j:if>
-</j:jelly>
\ No newline at end of file
-- 
GitLab