You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2008/03/05 23:18:16 UTC
svn commit: r634058 - in
/maven/components/branches/maven-2.0.x/maven-artifact/src:
main/java/org/apache/maven/artifact/DefaultArtifact.java
test/java/org/apache/maven/artifact/DefaultArtifactTest.java
Author: brett
Date: Wed Mar 5 14:18:13 2008
New Revision: 634058
URL: http://svn.apache.org/viewvc?rev=634058&view=rev
Log:
[MNG-3440] roll back -r634051:634043 - no need to put this on the branch at this stage in case it has unseen side effects
Modified:
maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
maven/components/branches/maven-2.0.x/maven-artifact/src/test/java/org/apache/maven/artifact/DefaultArtifactTest.java
Modified: maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java?rev=634058&r1=634057&r2=634058&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java (original)
+++ maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java Wed Mar 5 14:18:13 2008
@@ -26,7 +26,6 @@
import org.apache.maven.artifact.versioning.ArtifactVersion;
import org.apache.maven.artifact.versioning.OverConstrainedVersionException;
import org.apache.maven.artifact.versioning.VersionRange;
-import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
import org.codehaus.plexus.util.StringUtils;
import java.io.File;
@@ -429,8 +428,7 @@
if ( result == 0 )
{
// We don't consider the version range in the comparison, just the resolved version
- result = new DefaultArtifactVersion( version ).compareTo(
- new DefaultArtifactVersion( a.getVersion() ) );
+ result = version.compareTo( a.getVersion() );
}
}
}
Modified: maven/components/branches/maven-2.0.x/maven-artifact/src/test/java/org/apache/maven/artifact/DefaultArtifactTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact/src/test/java/org/apache/maven/artifact/DefaultArtifactTest.java?rev=634058&r1=634057&r2=634058&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-artifact/src/test/java/org/apache/maven/artifact/DefaultArtifactTest.java (original)
+++ maven/components/branches/maven-2.0.x/maven-artifact/src/test/java/org/apache/maven/artifact/DefaultArtifactTest.java Wed Mar 5 14:18:13 2008
@@ -113,19 +113,4 @@
assertEquals( groupId + ":" + artifactId + ":" + type + ":" + classifier + ":" + version, artifact.toString() );
}
- public void testComparisonByVersion()
- {
- Artifact artifact1 = new DefaultArtifact( groupId, artifactId, VersionRange.createFromVersion( "5.0" ), scope,
- type, classifier, artifactHandler );
- Artifact artifact2 = new DefaultArtifact( groupId, artifactId, VersionRange.createFromVersion( "12.0" ), scope,
- type, classifier, artifactHandler );
-
- assertTrue( artifact1.compareTo( artifact2 ) < 0 );
- assertTrue( artifact2.compareTo( artifact1 ) > 0 );
-
- Artifact artifact = new DefaultArtifact( groupId, artifactId, VersionRange.createFromVersion( "5.0" ), scope,
- type, classifier, artifactHandler );
- assertTrue( artifact.compareTo( artifact1 ) == 0 );
- assertTrue( artifact1.compareTo( artifact ) == 0 );
- }
}