From 68eabb63ebf889168d5cb5defc662acb86dd739b Mon Sep 17 00:00:00 2001
From: dvrzalik <dvrzalik@71c3de6d-444a-0410-be80-ed276b4c234a>
Date: Tue, 26 Feb 2008 02:37:54 +0000
Subject: [PATCH] JobProperty.perform(...) enabled for Matrix and Maven
 projects.

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@7202 71c3de6d-444a-0410-be80-ed276b4c234a
---
 core/src/main/java/hudson/matrix/MatrixBuild.java      | 10 ++++++++++
 .../main/java/hudson/maven/MavenModuleSetBuild.java    |  1 +
 2 files changed, 11 insertions(+)

diff --git a/core/src/main/java/hudson/matrix/MatrixBuild.java b/core/src/main/java/hudson/matrix/MatrixBuild.java
index 5436585774..d605618191 100644
--- a/core/src/main/java/hudson/matrix/MatrixBuild.java
+++ b/core/src/main/java/hudson/matrix/MatrixBuild.java
@@ -81,6 +81,16 @@ public class MatrixBuild extends AbstractBuild<MatrixProject,MatrixBuild> {
                         aggregators.add(a);
                 }
             }
+	    
+	    //let properties do their job
+            for (JobProperty prop : p.getProperties().values()) {
+                if (prop instanceof MatrixAggregatable) {
+                    MatrixAggregatable ma = (MatrixAggregatable) prop;
+                    MatrixAggregator a = ma.createAggregator(MatrixBuild.this, launcher, listener);
+                    if(a!=null)
+                        aggregators.add(a);
+                }
+            }
 
             Collection<MatrixConfiguration> activeConfigurations = p.getActiveConfigurations();
             int n = getNumber();
diff --git a/core/src/main/java/hudson/maven/MavenModuleSetBuild.java b/core/src/main/java/hudson/maven/MavenModuleSetBuild.java
index a83555e86d..28a5ec180b 100644
--- a/core/src/main/java/hudson/maven/MavenModuleSetBuild.java
+++ b/core/src/main/java/hudson/maven/MavenModuleSetBuild.java
@@ -364,6 +364,7 @@ public final class MavenModuleSetBuild extends AbstractBuild<MavenModuleSet,Mave
                 b.save();
 
             performAllBuildStep(listener, project.getPublishers(),true);
+	    performAllBuildStep(listener, project.getProperties(),true);
         }
 
         @Override
-- 
GitLab