commit a11fda6a5c4972c1a76b70c2046b03bd6265bfc7
author Herve Boutemy <hboutemy@apache.org> Sun Apr 07 07:51:32 2013 +0000
committer Herve Boutemy <hboutemy@apache.org> Sun Apr 07 07:51:32 2013 +0000
tree 0a4155d24335c7456f91873e07cdd5f709c7e207
parent 5dc65041d04e1a7f8dd03f01050bfb97ba9eed09

keep reports execution order in line with XML configuration, ie reports are executed before reportSets

git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1465339 13f79535-47bb-0310-9956-ffa450edef68

src/main/java/org/apache/maven/reporting/exec/DefaultMavenReportExecutor.java

diff --git a/src/main/java/org/apache/maven/reporting/exec/DefaultMavenReportExecutor.java b/src/main/java/org/apache/maven/reporting/exec/DefaultMavenReportExecutor.java
index 14c841e..4f162cd 100644
--- a/src/main/java/org/apache/maven/reporting/exec/DefaultMavenReportExecutor.java
+++ b/src/main/java/org/apache/maven/reporting/exec/DefaultMavenReportExecutor.java
@@ -195,6 +195,11 @@
         }
         else
         {
+            for ( String report : reportPlugin.getReports() )
+            {
+                goalsWithConfiguration.add( new GoalWithConf( report, reportPlugin.getConfiguration() ) );
+            }
+
             for ( ReportSet reportSet : reportPlugin.getReportSets() )
             {
                 for ( String report : reportSet.getReports() )
@@ -202,11 +207,6 @@
                     goalsWithConfiguration.add( new GoalWithConf( report, reportSet.getConfiguration() ) );
                 }
             }
-
-            for ( String report : reportPlugin.getReports() )
-            {
-                goalsWithConfiguration.add( new GoalWithConf( report, reportPlugin.getConfiguration() ) );
-            }
         }
 
         List<MavenReportExecution> reports = new ArrayList<MavenReportExecution>();