svn commit: r678083 - in /maven/sandbox/branches/SI_MAVEN_2_1_A/maven-project/src/main/java/org/apache/maven/project: DefaultMavenProjectBuilder.java builder/ArtifactModelContainerFactory.java builder/PomClassicTransformer.java

[sisbell]

Author: sisbell
Date: Fri Jul 18 17:34:35 2008
New Revision: 678083

URL: http://svn.apache.org/viewvc?rev=678083&view=rev
Log:
Fix: if a plugin in a child pom did not have a version, it would not join with 
parent plugin.

Modified:
    
maven/sandbox/branches/SI_MAVEN_2_1_A/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
    
maven/sandbox/branches/SI_MAVEN_2_1_A/maven-project/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java
    
maven/sandbox/branches/SI_MAVEN_2_1_A/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java

Modified: 
maven/sandbox/branches/SI_MAVEN_2_1_A/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL: 
http://svn.apache.org/viewvc/maven/sandbox/branches/SI_MAVEN_2_1_A/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=678083&r1=678082&r2=678083&view=diff
==============================================================================
--- 
maven/sandbox/branches/SI_MAVEN_2_1_A/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
 (original)
+++ 
maven/sandbox/branches/SI_MAVEN_2_1_A/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
 Fri Jul 18 17:34:35 2008
@@ -493,9 +493,6 @@
         {
             Model model = readModelFromLocalPath( "unknown", 
projectDescriptor, new PomArtifactResolver(config.getLocalRepository(),
                     buildArtifactRepositories( getSuperModel() ), 
artifactResolver) );
-            Parent parent = model.getParent();
-
-           //model.setParent(null);
             project = buildInternal(model,
                 config,
                 buildArtifactRepositories( getSuperModel() ),
@@ -503,9 +500,6 @@
                 STRICT_MODEL_PARSING,
                 true,
                 true );
-
-       //     project.getModel().setParent(parent);
-
         }
         return project;
     }

Modified: 
maven/sandbox/branches/SI_MAVEN_2_1_A/maven-project/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java
URL: 
http://svn.apache.org/viewvc/maven/sandbox/branches/SI_MAVEN_2_1_A/maven-project/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java?rev=678083&r1=678082&r2=678083&view=diff
==============================================================================
--- 
maven/sandbox/branches/SI_MAVEN_2_1_A/maven-project/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java
 (original)
+++ 
maven/sandbox/branches/SI_MAVEN_2_1_A/maven-project/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java
 Fri Jul 18 17:34:35 2008
@@ -88,7 +88,10 @@
             ArtifactModelContainer c = (ArtifactModelContainer) modelContainer;
             if (c.groupId.equals(groupId) && c.artifactId.equals(artifactId)) {
                 if (c.version == null) {
-                    return ModelContainerAction.NOP;
+                    if(version == null) {
+                        return ModelContainerAction.JOIN;
+                    }
+                    return ModelContainerAction.DELETE;//TODO Verify - 
PluginManagement Section may make versions equal
                 }
 
                 if(c.version.equals(version)) {

Modified: 
maven/sandbox/branches/SI_MAVEN_2_1_A/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java
URL: 
http://svn.apache.org/viewvc/maven/sandbox/branches/SI_MAVEN_2_1_A/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java?rev=678083&r1=678082&r2=678083&view=diff
==============================================================================
--- 
maven/sandbox/branches/SI_MAVEN_2_1_A/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java
 (original)
+++ 
maven/sandbox/branches/SI_MAVEN_2_1_A/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java
 Fri Jul 18 17:34:35 2008
@@ -28,7 +28,7 @@
                 
ProjectUri.Build.PluginManagement.Plugins.Plugin.Dependencies.Dependency.Exclusions.xUri,
                 
ProjectUri.Build.PluginManagement.Plugins.Plugin.Executions.xUri,
                 ProjectUri.Build.Plugins.xUri,
-                ProjectUri.Build.Plugins.Plugin.configuration,
+                //ProjectUri.Build.Plugins.Plugin.configuration,
                 ProjectUri.Build.Plugins.Plugin.Dependencies.xUri,
                 ProjectUri.Build.Plugins.Plugin.Executions.xUri,
                 ProjectUri.Build.Resources.xUri,
@@ -253,7 +253,8 @@
                    clearedProperties.add(mp);
                }
             }
-                       
+
+                      
             ModelProperty artifactId = getPropertyFor(ProjectUri.artifactId, 
tmp);
             if(artifactId != null) {
                 projectNames.add(0, artifactId.getValue());
@@ -262,6 +263,8 @@
             tmp.removeAll(clearedProperties);
             modelProperties.addAll(tmp);
 
+
+
             //Remove Parent Info
             /*
             for (ModelProperty mp : tmp) {