Moved the maven version information to MavenModuleSetBuild.

maven-plugin/src/main/java/hudson/maven/MavenBuild.java

@@ -415,9 +415,8 @@ public class MavenBuild extends AbstractMavenBuild<MavenModule,MavenBuild> {
             return Channel.current().export(MavenBuildProxy.class,this);
         }
 
-        public MavenBuildInformation getMavenBuildInformation()
-        {
-            return new MavenBuildInformation( MavenBuild.this.getModuleSetBuild().getProject().getMavenVersionUsed());
+        public MavenBuildInformation getMavenBuildInformation() {
+            return new MavenBuildInformation( MavenBuild.this.getModuleSetBuild().getMavenVersionUsed());
         }
     }
 

maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java

@@ -180,8 +180,6 @@ public final class MavenModuleSet extends AbstractMavenProject<MavenModuleSet,Ma
      * If true, do not archive artifacts to the master.
      */
     private boolean archivingDisabled = false;
-    
-    private String mavenVersionUsed;
 
     /**
      * Reporters configured at {@link MavenModuleSet} level. Applies to all {@link MavenModule} builds.
@@ -636,15 +634,6 @@ public final class MavenModuleSet extends AbstractMavenProject<MavenModuleSet,Ma
         this.alternateSettings = alternateSettings;
         save();
     }
-    
-    public String getMavenVersionUsed() {
-        return mavenVersionUsed;
-    }
-
-    public void setMavenVersionUsed( String mavenVersionUsed ) throws IOException {
-        this.mavenVersionUsed = mavenVersionUsed;
-        save();
-    }    
 
     /**
      * If the list of configured goals contain the "-P" option,

maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java

@@ -117,6 +117,8 @@ public class MavenModuleSetBuild extends AbstractMavenBuild<MavenModuleSet,Maven
      */
     /*package*/ List<MavenReporter> projectActionReporters;
 
+    private String mavenVersionUsed;
+
     public MavenModuleSetBuild(MavenModuleSet job) throws IOException {
         super(job);
     }
@@ -301,6 +303,22 @@ public class MavenModuleSetBuild extends AbstractMavenBuild<MavenModuleSet,Maven
         return Math.round((double)overhead / moduleSetBuilds.size());
     }
 
+    /**
+     * 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
+     *      (this means the build was done by Maven2.x)
+     */
+    public String getMavenVersionUsed() {
+        return mavenVersionUsed;
+    }
+
+    public void setMavenVersionUsed( String mavenVersionUsed ) throws IOException {
+        this.mavenVersionUsed = mavenVersionUsed;
+        save();
+    }
+
     @Override
     public synchronized void delete() throws IOException {
         super.delete();
@@ -475,7 +493,7 @@ public class MavenModuleSetBuild extends AbstractMavenBuild<MavenModuleSet,Maven
                 
                 MavenBuildInformation mavenBuildInformation = new MavenBuildInformation( mavenVersion );
                 
-                project.setMavenVersionUsed( mavenVersion );
+                setMavenVersionUsed( mavenVersion );
                 
                 listener.getLogger().println("Found mavenVersion " + mavenVersion + " from file " + mavenInformation.getVersionResourcePath());
 

maven-plugin/src/main/java/hudson/maven/reporters/MavenArtifactRecord.java

@@ -112,7 +112,7 @@ public class MavenArtifactRecord extends MavenAbstractArtifactRecord<MavenBuild>
         
         ArtifactFactory factory = embedder.lookup(ArtifactFactory.class);
         PrintStream logger = listener.getLogger();
-        boolean maven3orLater = MavenUtil.maven3orLater( parent.getModuleSetBuild().getProject().getMavenVersionUsed());
+        boolean maven3orLater = MavenUtil.maven3orLater(parent.getModuleSetBuild().getMavenVersionUsed());
         if (!deploymentRepository.isUniqueVersion() && maven3orLater) {
             logger.println("uniqueVersion == false is not anymore supported in maven 3");
             ((WrappedArtifactRepository) deploymentRepository).setUniqueVersion( true );

test/src/test/java/hudson/maven/Maven3BuildTest.java

@@ -26,8 +26,8 @@ public class Maven3BuildTest extends HudsonTestCase {
         m.getReporters().add(new TestReporter());
         m.setScm(new ExtractResourceSCM(getClass().getResource("maven3-project.zip")));
         m.setGoals( "clean install" );
-        buildAndAssertSuccess(m);
-        assertTrue( MavenUtil.maven3orLater( m.getMavenVersionUsed() ) );
+        MavenModuleSetBuild b = buildAndAssertSuccess(m);
+        assertTrue( MavenUtil.maven3orLater( b.getMavenVersionUsed() ) );
     }
     
     public void testSimpleMaven3BuildRedeployPublisher() throws Exception {
@@ -41,8 +41,8 @@ public class Maven3BuildTest extends HudsonTestCase {
         m.getPublishersList().add(new RedeployPublisher("",repo.toURI().toString(),true, false));
         m.setScm(new ExtractResourceSCM(getClass().getResource("maven3-project.zip")));
         m.setGoals( "clean install" );
-        buildAndAssertSuccess(m);
-        assertTrue( MavenUtil.maven3orLater( m.getMavenVersionUsed() ) );
+        MavenModuleSetBuild b = buildAndAssertSuccess(m);
+        assertTrue( MavenUtil.maven3orLater( b.getMavenVersionUsed() ) );
         File artifactDir = new File(repo,"com/mycompany/app/my-app/1.7-SNAPSHOT/");
         String[] files = artifactDir.list( new FilenameFilter()
         {
@@ -64,8 +64,8 @@ public class Maven3BuildTest extends HudsonTestCase {
         m.getReporters().add(new TestReporter());
         m.setScm(new ExtractResourceSCM(getClass().getResource("maven3-project.zip")));
         m.setGoals( "clean site" );
-        buildAndAssertSuccess(m);
-        assertTrue( MavenUtil.maven3orLater( m.getMavenVersionUsed() ) );
+        MavenModuleSetBuild b = buildAndAssertSuccess(m);
+        assertTrue( MavenUtil.maven3orLater( b.getMavenVersionUsed() ) );
     }    
     
 

test/src/test/java/hudson/maven/RedeployPublisherTest.java

@@ -143,7 +143,7 @@ public class RedeployPublisherTest extends HudsonTestCase {
         MavenModuleSetBuild b = m3.scheduleBuild2(0).get();
         assertBuildStatus(Result.SUCCESS, b);
 
-        assertTrue( MavenUtil.maven3orLater( m3.getMavenVersionUsed() ) );
+        assertTrue( MavenUtil.maven3orLater( b.getMavenVersionUsed() ) );
         File artifactDir = new File(repo,"test/test/0.1-SNAPSHOT/");
         String[] files = artifactDir.list( new FilenameFilter()
         {
@@ -170,7 +170,7 @@ public class RedeployPublisherTest extends HudsonTestCase {
         MavenModuleSetBuild b = m3.scheduleBuild2(0).get();
         assertBuildStatus(Result.SUCCESS, b);
         
-        assertTrue( MavenUtil.maven3orLater( m3.getMavenVersionUsed() ) );
+        assertTrue( MavenUtil.maven3orLater( b.getMavenVersionUsed() ) );
         
         File artifactDir = new File(repo,"test/test/0.1-SNAPSHOT/");
         String[] files = artifactDir.list( new FilenameFilter()