svn commit: r226813 - in /maven/components/trunk: maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/ maven-artifact/src/main/java/org/apache/maven/artifact/

[brett]

Author: brett
Date: Mon Aug  1 08:02:43 2005
New Revision: 226813

URL: http://svn.apache.org/viewcvs?rev=226813&view=rev
Log:
correctly align versions during mediation

Modified:
    
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java
    
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java
    
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java

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=226813&r1=226812&r2=226813&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
 Mon Aug  1 08:02:43 2005
@@ -75,7 +75,7 @@
 
             metadata.update();
 
-            artifact.setVersion( metadata.constructVersion() );
+            artifact.setResolvedVersion( metadata.constructVersion() );
 
             artifact.addMetadata( metadata );
         }

Modified: 
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java?rev=226813&r1=226812&r2=226813&view=diff
==============================================================================
--- 
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java
 (original)
+++ 
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java
 Mon Aug  1 08:02:43 2005
@@ -128,9 +128,10 @@
     void setArtifactId( String artifactId );
 
     boolean isSnapshot();
-    
+
     void setResolved( boolean resolved );
-    
+
     boolean isResolved();
 
+    void setResolvedVersion( String version );
 }

Modified: 
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java?rev=226813&r1=226812&r2=226813&view=diff
==============================================================================
--- 
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
 (original)
+++ 
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
 Mon Aug  1 08:02:43 2005
@@ -72,7 +72,7 @@
 
     private VersionRange versionRange;
 
-    private boolean resolved = false;
+    private boolean resolved;
 
     public DefaultArtifact( String groupId, String artifactId, VersionRange 
versionRange, String scope, String type,
                             String classifier, ArtifactHandler artifactHandler 
)
@@ -164,6 +164,7 @@
     public void setVersion( String version )
     {
         this.version = version;
+        this.baseVersion = version;
         this.versionRange = null;
     }
 
@@ -346,7 +347,7 @@
 
     public void updateVersion( String version, ArtifactRepository 
localRepository )
     {
-        setVersion( version );
+        setResolvedVersion( version );
         setFile( new File( localRepository.getBasedir(), 
localRepository.pathOf( this ) ) );
     }
 
@@ -401,17 +402,19 @@
 
         if ( versionRange != null && versionRange.getRecommendedVersion() != 
null )
         {
-            this.version = versionRange.getRecommendedVersion().toString();
+            selectVersion( versionRange.getRecommendedVersion().toString() );
         }
         else
         {
             this.version = null;
+            this.baseVersion = null;
         }
     }
 
     public void selectVersion( String version )
     {
         this.version = version;
+        this.baseVersion = version;
     }
 
     public void setGroupId( String groupId )
@@ -446,6 +449,12 @@
     public boolean isResolved()
     {
         return resolved;
+    }
+
+    public void setResolvedVersion( String version )
+    {
+        this.version = version;
+        // retain baseVersion
     }
 
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]