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/09/11 10:14:26 UTC
svn commit: r280094 - in
/maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform:
AbstractVersionTransformation.java SnapshotTransformation.java
Author: brett
Date: Sun Sep 11 01:14:20 2005
New Revision: 280094
URL: http://svn.apache.org/viewcvs?rev=280094&view=rev
Log:
don't assign base version to early, or legacy metadata is not checked
Modified:
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java
Modified: maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java?rev=280094&r1=280093&r2=280094&view=diff
==============================================================================
--- maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java (original)
+++ maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java Sun Sep 11 01:14:20 2005
@@ -130,7 +130,7 @@
version = resolveLegacyVersion( artifact, localRepository, remoteRepositories );
if ( version == null )
{
- version = artifact.getVersion();
+ version = artifact.getBaseVersion();
}
}
Modified: maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java?rev=280094&r1=280093&r2=280094&view=diff
==============================================================================
--- maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java (original)
+++ maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java Sun Sep 11 01:14:20 2005
@@ -105,21 +105,14 @@
protected String constructVersion( Versioning versioning, String baseVersion )
{
- String version = baseVersion;
+ String version = null;
Snapshot snapshot = versioning.getSnapshot();
if ( snapshot != null )
{
if ( snapshot.getTimestamp() != null && snapshot.getBuildNumber() > 0 )
{
String newVersion = snapshot.getTimestamp() + "-" + snapshot.getBuildNumber();
- if ( version != null )
- {
- version = StringUtils.replace( version, "SNAPSHOT", newVersion );
- }
- else
- {
- version = newVersion;
- }
+ version = StringUtils.replace( baseVersion, "SNAPSHOT", newVersion );
}
}
return version;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org