update changelog for HUDSON-8395 and fix junit

changelog.html

@@ -46,6 +46,8 @@ Upcoming changes</a>
    (<a href="http://issues.hudson-ci.org/browse/HUDSON-8387">issue 8387</a>) 
   <li class=bug> NPE while parsing POMs
    (<a href="http://issues.hudson-ci.org/browse/HUDSON-8391">issue 8391</a>)   
+  <li class=bug> M2 POMs aren't parsed if there is a M3 control error like an invalid scope in a plugin dep.
+   (<a href="http://issues.hudson-ci.org/browse/HUDSON-8395">issue 8395</a>)    
 </ul>
 </div><!--=TRUNK-END=-->
 

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

@@ -483,4 +483,5 @@ public final class MavenModule extends AbstractMavenProject<MavenModule,MavenBui
     }
 
     private static final Logger LOGGER = Logger.getLogger(MavenModule.class.getName());
+    
 }

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

@@ -2,6 +2,7 @@
  * The MIT License
  * 
  * Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Jorg Heymans, Peter Hayes, Red Hat, Inc., Stephen Connolly, id:cactusman
+ * Olivier Lamy
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

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

@@ -31,7 +31,6 @@ import hudson.FilePath;
 import hudson.FilePath.FileCallable;
 import hudson.Launcher;
 import hudson.Util;
-import hudson.cli.VersionCommand;
 import hudson.maven.MavenBuild.ProxyImpl2;
 import hudson.maven.reporters.MavenFingerprinter;
 import hudson.maven.reporters.MavenMailer;

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

 package hudson.maven;
 
 import hudson.Launcher;
-import hudson.maven.reporters.MavenAbstractArtifactRecord;
 import hudson.model.BuildListener;
 import hudson.model.Result;
 import hudson.tasks.Maven.MavenInstallation;
@@ -9,7 +8,6 @@ import hudson.tasks.Maven.MavenInstallation;
 import java.io.File;
 import java.io.FilenameFilter;
 import java.io.IOException;
-import java.util.concurrent.Future;
 
 import org.apache.commons.io.FileUtils;
 import org.jvnet.hudson.test.Bug;
@@ -83,7 +81,8 @@ public class Maven3BuildTest extends HudsonTestCase {
         m.setGoals( "clean validate" );
         MavenModuleSetBuild mmsb =  m.scheduleBuild2( 0 ).get();
         assertBuildStatus( Result.FAILURE, mmsb );
-        assertTrue( mmsb.getProject().getModules() == null);
+        System.out.println("mmsb.getProject().getModules " + mmsb.getProject().getModules() );
+        assertTrue( mmsb.getProject().getModules().isEmpty());
     }