svn commit: r1150944 - in /maven/shared/trunk/maven-reporting-exec: pom.xml src/main/java/org/apache/maven/reporting/exec/DefaultMavenReportExecutor.java src/test/java/org/apache/maven/reporting/exec/TestDefaultMavenReportExecutor.java

[hb...@apache.org]

Author: hboutemy
Date: Mon Jul 25 22:40:22 2011
New Revision: 1150944

URL: http://svn.apache.org/viewvc?rev=1150944&view=rev
Log:
[MSHARED-201] ensure reports order is preserved from pom

Modified:
    maven/shared/trunk/maven-reporting-exec/pom.xml
    maven/shared/trunk/maven-reporting-exec/src/main/java/org/apache/maven/reporting/exec/DefaultMavenReportExecutor.java
    maven/shared/trunk/maven-reporting-exec/src/test/java/org/apache/maven/reporting/exec/TestDefaultMavenReportExecutor.java

Modified: maven/shared/trunk/maven-reporting-exec/pom.xml
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-reporting-exec/pom.xml?rev=1150944&r1=1150943&r2=1150944&view=diff
==============================================================================
--- maven/shared/trunk/maven-reporting-exec/pom.xml (original)
+++ maven/shared/trunk/maven-reporting-exec/pom.xml Mon Jul 25 22:40:22 2011
@@ -29,7 +29,7 @@
 
   <groupId>org.apache.maven.reporting</groupId>
   <artifactId>maven-reporting-exec</artifactId>
-  <version>1.1-SNAPSHOT</version>
+  <version>1.0.1-SNAPSHOT</version>
 
   <name>Maven Reporting Executor</name>
   <description>Classes to manage report plugin executions with Maven 3.</description>
@@ -130,7 +130,7 @@
     <dependency>
       <groupId>org.apache.maven.wagon</groupId>
       <artifactId>wagon-http-lightweight</artifactId>
-      <version>1.0-beta-6</version>
+      <version>1.0</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>

Modified: maven/shared/trunk/maven-reporting-exec/src/main/java/org/apache/maven/reporting/exec/DefaultMavenReportExecutor.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-reporting-exec/src/main/java/org/apache/maven/reporting/exec/DefaultMavenReportExecutor.java?rev=1150944&r1=1150943&r2=1150944&view=diff
==============================================================================
--- maven/shared/trunk/maven-reporting-exec/src/main/java/org/apache/maven/reporting/exec/DefaultMavenReportExecutor.java (original)
+++ maven/shared/trunk/maven-reporting-exec/src/main/java/org/apache/maven/reporting/exec/DefaultMavenReportExecutor.java Mon Jul 25 22:40:22 2011
@@ -22,6 +22,7 @@ package org.apache.maven.reporting.exec;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -189,7 +190,7 @@ public class DefaultMavenReportExecutor
         PluginDescriptor pluginDescriptor =
             mavenPluginManager.getPluginDescriptor( plugin, remoteRepositories, session.getRepositorySession() );
 
-        Map<String, PlexusConfiguration> goalsWithConfiguration = new TreeMap<String, PlexusConfiguration>();
+        Map<String, PlexusConfiguration> goalsWithConfiguration = new LinkedHashMap<String, PlexusConfiguration>();
 
         if ( reportPlugin.getReportSets().isEmpty() && reportPlugin.getReports().isEmpty() )
         {

Modified: maven/shared/trunk/maven-reporting-exec/src/test/java/org/apache/maven/reporting/exec/TestDefaultMavenReportExecutor.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-reporting-exec/src/test/java/org/apache/maven/reporting/exec/TestDefaultMavenReportExecutor.java?rev=1150944&r1=1150943&r2=1150944&view=diff
==============================================================================
--- maven/shared/trunk/maven-reporting-exec/src/test/java/org/apache/maven/reporting/exec/TestDefaultMavenReportExecutor.java (original)
+++ maven/shared/trunk/maven-reporting-exec/src/test/java/org/apache/maven/reporting/exec/TestDefaultMavenReportExecutor.java Mon Jul 25 22:40:22 2011
@@ -101,8 +101,8 @@ public class TestDefaultMavenReportExecu
             reportPlugin.setVersion( "2.7" );
 
             ReportSet reportSet = new ReportSet();
-            reportSet.getReports().add( "javadoc" );
             reportSet.getReports().add( "test-javadoc" );
+            reportSet.getReports().add( "javadoc" );
             reportPlugin.getReportSets().add( reportSet );
 
             List<ReportPlugin> reportPlugins = Lists.newArrayList( reportPlugin );
@@ -116,8 +116,8 @@ public class TestDefaultMavenReportExecu
 
             assertNotNull( mavenReportExecutions );
             assertEquals( 2, mavenReportExecutions.size() );
-            assertEquals( "apidocs/index", mavenReportExecutions.get( 0 ).getMavenReport().getOutputName() );
-            assertEquals( "testapidocs/index", mavenReportExecutions.get( 1 ).getMavenReport().getOutputName() );
+            assertEquals( "testapidocs/index", mavenReportExecutions.get( 0 ).getMavenReport().getOutputName() );
+            assertEquals( "apidocs/index", mavenReportExecutions.get( 1 ).getMavenReport().getOutputName() );
         }
         finally
         {