Author: rfscholte Date: Fri Jul 29 18:53:58 2011 New Revision: 1152339 URL: http://svn.apache.org/viewvc?rev=1152339&view=rev Log: Fix MECLIPSE-597: Workspace dependencies not resolved for SNAPSHOT dependencies (artifact has a different version from that in dependency management)
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java?rev=1152339&r1=1152338&r2=1152339&view=diff ============================================================================== --- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java (original) +++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java Fri Jul 29 18:53:58 2011 @@ -1876,7 +1876,7 @@ public class EclipsePlugin && workspaceArtefact.getGroupId().equals( artifact.getGroupId() ) && workspaceArtefact.getArtifactId().equals( artifact.getArtifactId() ) ) { - if ( workspaceArtefact.getVersion().equals( artifact.getVersion() ) ) + if ( workspaceArtefact.getVersion().equals( artifact.getBaseVersion() ) ) { return workspaceArtefact.getEclipseProjectName(); } @@ -2008,7 +2008,7 @@ public class EclipsePlugin if ( workspaceArtefact.getGroupId().equals( artifact.getGroupId() ) && workspaceArtefact.getArtifactId().equals( artifact.getArtifactId() ) ) { - if ( workspaceArtefact.getVersion().equals( artifact.getVersion() ) ) + if ( workspaceArtefact.getVersion().equals( artifact.getBaseVersion() ) ) { workspaceArtefact.setAddedToClasspath( true ); getLog().debug( "Using workspace project: " + workspaceArtefact.getEclipseProjectName() ); @@ -2020,7 +2020,7 @@ public class EclipsePlugin "Artifact " + artifact.getId() + " already available as a workspace project, but with different version. Expected: " - + artifact.getVersion() + ", found: " + workspaceArtefact.getVersion() ); + + artifact.getBaseVersion() + ", found: " + workspaceArtefact.getVersion() ); } } }