JobProperty should be invoked for Maven2 builds as well.

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@7381 71c3de6d-444a-0410-be80-ed276b4c234a

core/src/main/java/hudson/maven/MavenModuleSetBuild.java

@@ -381,6 +381,7 @@ public final class MavenModuleSetBuild extends AbstractBuild<MavenModuleSet,Mave
             }
 
             performAllBuildStep(listener, project.getPublishers(),false);
+            performAllBuildStep(listener, project.getProperties(),false);
         }
     }
 

core/src/main/java/hudson/model/AbstractBuild.java

@@ -181,6 +181,9 @@ public abstract class AbstractBuild<P extends AbstractProject<P,R>,R extends Abs
             if(checkout(listener))
                 return Result.FAILURE;
 
+            if(!preBuild(listener,project.getProperties()))
+                return Result.FAILURE;
+
             Result result = doRun(listener);
             if(result!=null)
                 return result;  // abort here
@@ -273,6 +276,13 @@ public abstract class AbstractBuild<P extends AbstractProject<P,R>,R extends Abs
                     bs.perform(AbstractBuild.this, launcher, listener);
             }
         }
+
+        protected final boolean preBuild(BuildListener listener,Map<?,? extends BuildStep> steps) {
+            for( BuildStep bs : steps.values() )
+                if(!bs.prebuild(AbstractBuild.this,listener))
+                    return false;
+            return true;
+        }
     }
 
     /**

core/src/main/java/hudson/model/Build.java

@@ -103,8 +103,6 @@ public abstract class Build <P extends Project<P,B>,B extends Build<P,B>>
     
     protected class RunnerImpl extends AbstractRunner {
         protected Result doRun(BuildListener listener) throws Exception {
-            if(!preBuild(listener,project.getProperties()))
-                return Result.FAILURE;
             if(!preBuild(listener,project.getBuilders()))
                 return Result.FAILURE;
             if(!preBuild(listener,project.getPublishers()))
@@ -148,13 +146,6 @@ public abstract class Build <P extends Project<P,B>,B extends Build<P,B>>
                     return false;
             return true;
         }
-
-        private boolean preBuild(BuildListener listener,Map<?,? extends BuildStep> steps) {
-            for( BuildStep bs : steps.values() )
-                if(!bs.prebuild(Build.this,listener))
-                    return false;
-            return true;
-        }
     }
 
     private static final Logger LOGGER = Logger.getLogger(Build.class.getName());