svn commit: r713429 - in /maven/components/trunk: maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelTransformerContext.java

[sisbell]

Author: sisbell
Date: Wed Nov 12 09:31:07 2008
New Revision: 713429

URL: http://svn.apache.org/viewvc?rev=713429&view=rev
Log:
Fix for IT 3827. On joins between model containers during the applying of 
plugin management, transform rule was reversing the plugin config element 
order. Now do a reverse sort prior to join, so elements end up in correct order.

Modified:
    
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java
    
maven/components/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelTransformerContext.java

Modified: 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java?rev=713429&r1=713428&r2=713429&view=diff
==============================================================================
--- 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java
 (original)
+++ 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java
 Wed Nov 12 09:31:07 2008
@@ -184,7 +184,9 @@
                 ModelContainerAction action = 
dependencyContainer.containerAction( managementContainer );
                 if ( action.equals( ModelContainerAction.JOIN ) || 
action.equals( ModelContainerAction.DELETE ) )
                 {
-                    source.join( dependencyContainer, managementContainer );
+                    ModelContainer reverseSortedContainer = new 
ArtifactModelContainerFactory().create(
+                        
ModelTransformerContext.sort(dependencyContainer.getProperties(), 
ProjectUri.Build.Plugins.Plugin.xUri) );
+                    source.join( reverseSortedContainer, managementContainer );
                 }
             }
         }

Modified: 
maven/components/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelTransformerContext.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelTransformerContext.java?rev=713429&r1=713428&r2=713429&view=diff
==============================================================================
--- 
maven/components/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelTransformerContext.java
 (original)
+++ 
maven/components/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelTransformerContext.java
 Wed Nov 12 09:31:07 2008
@@ -340,7 +340,7 @@
      * @param baseUri    the base URI of every model property
      * @return sorted list of model properties
      */
-    protected static List<ModelProperty> sort( List<ModelProperty> properties, 
String baseUri )
+    public static List<ModelProperty> sort( List<ModelProperty> properties, 
String baseUri )
     {
         if ( properties == null )
         {