You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by br...@apache.org on 2005/07/19 23:19:27 UTC
svn commit: r219777 - in /maven/components/trunk/maven-artifact/src:
main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java
test/java/org/apache/maven/artifact/versioning/DefaultArtifactVersionTest.java
Author: brett
Date: Tue Jul 19 14:19:26 2005
New Revision: 219777
URL: http://svn.apache.org/viewcvs?rev=219777&view=rev
Log:
PR: MNG-505
if a version doesn't match the format, revert to string comparison
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=219777&r1=219776&r2=219777&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 Tue Jul 19 14:19:26 2005
@@ -186,14 +186,24 @@
else
{
StringTokenizer tok = new StringTokenizer( part1, "." );
- majorVersion = Integer.valueOf( tok.nextToken() );
- if ( tok.hasMoreTokens() )
+ try
{
- minorVersion = Integer.valueOf( tok.nextToken() );
+ majorVersion = Integer.valueOf( tok.nextToken() );
+ if ( tok.hasMoreTokens() )
+ {
+ minorVersion = Integer.valueOf( tok.nextToken() );
+ }
+ if ( tok.hasMoreTokens() )
+ {
+ incrementalVersion = Integer.valueOf( tok.nextToken() );
+ }
}
- if ( tok.hasMoreTokens() )
+ catch ( NumberFormatException e )
{
- incrementalVersion = Integer.valueOf( tok.nextToken() );
+ // qualifier is the whole version, including "-"
+ qualifier = version;
+ majorVersion = null;
+ minorVersion = null;
}
}
}
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=219777&r1=219776&r2=219777&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 Tue Jul 19 14:19:26 2005
@@ -84,6 +84,20 @@
assertEquals( "check incremental version", 0, version.getIncrementalVersion() );
assertEquals( "check build number", 0, version.getBuildNumber() );
assertEquals( "check qualifier", "RELEASE", version.getQualifier() );
+
+ version = new DefaultArtifactVersion( "1.0.1b" );
+ assertEquals( "check major version", 0, version.getMajorVersion() );
+ assertEquals( "check minor version", 0, version.getMinorVersion() );
+ assertEquals( "check incremental version", 0, version.getIncrementalVersion() );
+ assertEquals( "check build number", 0, version.getBuildNumber() );
+ assertEquals( "check qualifier", "1.0.1b", version.getQualifier() );
+
+ version = new DefaultArtifactVersion( "1.0RC2" );
+ assertEquals( "check major version", 0, version.getMajorVersion() );
+ assertEquals( "check minor version", 0, version.getMinorVersion() );
+ assertEquals( "check incremental version", 0, version.getIncrementalVersion() );
+ assertEquals( "check build number", 0, version.getBuildNumber() );
+ assertEquals( "check qualifier", "1.0RC2", version.getQualifier() );
}
public void testVersionComparing()
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org