svn commit: r419627 - /maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/MavenProject.java

[kenney]

Author: kenney
Date: Thu Jul  6 10:46:24 2006
New Revision: 419627

URL: http://svn.apache.org/viewvc?rev=419627&view=rev
Log:
PR: MNG-1245

Version not taken into account for reactor projects. 

Artifacts for reactor projects get replaced by a wrong version local repo 
artifact.

Merged revision 419624 from trunk to branch.

Modified:
    
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/MavenProject.java

Modified: 
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
URL: 
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/MavenProject.java?rev=419627&r1=419626&r2=419627&view=diff
==============================================================================
--- 
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
 (original)
+++ 
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
 Thu Jul  6 10:46:24 2006
@@ -471,7 +471,7 @@
                 if ( Artifact.SCOPE_COMPILE.equals( a.getScope() ) || 
Artifact.SCOPE_PROVIDED.equals( a.getScope() ) ||
                     Artifact.SCOPE_SYSTEM.equals( a.getScope() ) )
                 {
-                    String refId = getProjectReferenceId( a.getGroupId(), 
a.getArtifactId() );
+                    String refId = getProjectReferenceId( a.getGroupId(), 
a.getArtifactId(), a.getVersion() );
                     MavenProject project = (MavenProject) 
projectReferences.get( refId );
                     if ( project != null )
                     {
@@ -742,7 +742,7 @@
                 // TODO: let the scope handler deal with this
                 if ( Artifact.SCOPE_SYSTEM.equals( a.getScope() ) )
                 {
-                    String refId = getProjectReferenceId( a.getGroupId(), 
a.getArtifactId() );
+                    String refId = getProjectReferenceId( a.getGroupId(), 
a.getArtifactId(), a.getVersion() );
                     MavenProject project = (MavenProject) 
projectReferences.get( refId );
                     if ( project != null )
                     {
@@ -1550,12 +1550,12 @@
 
     public void addProjectReference( MavenProject project )
     {
-        projectReferences.put( getProjectReferenceId( project.getGroupId(), 
project.getArtifactId() ), project );
+        projectReferences.put( getProjectReferenceId( project.getGroupId(), 
project.getArtifactId(), project.getVersion() ), project );
     }
 
-    private static String getProjectReferenceId( String groupId, String 
artifactId )
+    private static String getProjectReferenceId( String groupId, String 
artifactId, String version )
     {
-        return groupId + ":" + artifactId;
+        return groupId + ":" + artifactId + ":" + version;
     }
 
     /**
@@ -1599,8 +1599,7 @@
     {
         if ( getProjectReferences() != null && 
!getProjectReferences().isEmpty() )
         {
-            // TODO: use MavenProject getProjectReferenceId
-            String refId = ArtifactUtils.versionlessKey( 
pluginArtifact.getGroupId(), pluginArtifact.getArtifactId() );
+            String refId = getProjectReferenceId( pluginArtifact.getGroupId(), 
pluginArtifact.getArtifactId(), pluginArtifact.getVersion() );
             MavenProject ref = (MavenProject) getProjectReferences().get( 
refId );
             if ( ref != null && ref.getArtifact() != null )
             {