Author: brett
Date: Mon Jul 18 04:59:56 2005
New Revision: 219475
URL: http://svn.apache.org/viewcvs?rev=219475&view=rev
Log:
additional rule about SNAPSHOTs
Modified:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java
maven/components/trunk/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/DefaultArtifactVersionTest.java
Modified:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java?rev=219475&r1=219474&r2=219475&view=diff
==============================================================================
---
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java
(original)
+++
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java
Mon Jul 18 04:59:56 2005
@@ -65,7 +65,22 @@
{
if ( otherVersion.qualifier != null )
{
- result = qualifier.compareTo( otherVersion.qualifier );
+ if ( qualifier.length() > otherVersion.qualifier.length()
&&
+ qualifier.startsWith( otherVersion.qualifier ) )
+ {
+ // here, the longer one that otherwise match is
considered older
+ result = -1;
+ }
+ else if ( qualifier.length() <
otherVersion.qualifier.length() &&
+ otherVersion.qualifier.startsWith( qualifier ) )
+ {
+ // here, the longer one that otherwise match is
considered older
+ result = 1;
+ }
+ else
+ {
+ result = qualifier.compareTo( otherVersion.qualifier );
+ }
}
else
{
Modified:
maven/components/trunk/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/DefaultArtifactVersionTest.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/DefaultArtifactVersionTest.java?rev=219475&r1=219474&r2=219475&view=diff
==============================================================================
---
maven/components/trunk/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/DefaultArtifactVersionTest.java
(original)
+++
maven/components/trunk/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/DefaultArtifactVersionTest.java
Mon Jul 18 04:59:56 2005
@@ -137,6 +137,18 @@
version = new DefaultArtifactVersion( "1.0-SNAPSHOT" );
assertTrue( version.compareTo( new DefaultArtifactVersion(
"1.0-beta-1" ) ) < 0 );
+ version = new DefaultArtifactVersion( "1.0-SNAPSHOT" );
+ assertTrue( version.compareTo( new DefaultArtifactVersion( "1.0" ) ) <
0 );
+
+ version = new DefaultArtifactVersion( "1.0" );
+ assertTrue( version.compareTo( new DefaultArtifactVersion(
"1.0-SNAPSHOT" ) ) > 0 );
+
+ version = new DefaultArtifactVersion( "1.0-alpha-1-SNAPSHOT" );
+ assertTrue( version.compareTo( new DefaultArtifactVersion(
"1.0-alpha-1" ) ) < 0 );
+
+ version = new DefaultArtifactVersion( "1.0-alpha-1" );
+ assertTrue( version.compareTo( new DefaultArtifactVersion(
"1.0-alpha-1-SNAPSHOT" ) ) > 0 );
+
version = new DefaultArtifactVersion( "1.0" );
assertTrue( version.compareTo( new DefaultArtifactVersion( "1.0-1" ) )
< 0 );
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
