svn commit: r439369 - in /maven/components/branches/maven-2.0.x: ./ maven-artifact-manager/ maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/ maven-artifact-manager/src/test/java/org/apache/maven/artifact/repository/ m...

[jd...@apache.org]

Author: jdcasey
Date: Fri Sep  1 09:22:13 2006
New Revision: 439369

URL: http://svn.apache.org/viewvc?rev=439369&view=rev
Log:
[MNG-2408] Merged from 439352 and 439362 on trunk.

Added:
    maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/repository/
      - copied from r439352, maven/components/trunk/maven-artifact-manager/src/test/java/org/apache/maven/artifact/repository/
    maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/repository/metadata/
      - copied from r439352, maven/components/trunk/maven-artifact-manager/src/test/java/org/apache/maven/artifact/repository/metadata/
    maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadataTest.java
      - copied unchanged from r439352, maven/components/trunk/maven-artifact-manager/src/test/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadataTest.java
    maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/testutils/
      - copied from r439352, maven/components/trunk/maven-artifact-manager/src/test/java/org/apache/maven/artifact/testutils/
    maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/testutils/MockManager.java
      - copied unchanged from r439352, maven/components/trunk/maven-artifact-manager/src/test/java/org/apache/maven/artifact/testutils/MockManager.java
    maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/testutils/TestFileManager.java
      - copied unchanged from r439352, maven/components/trunk/maven-artifact-manager/src/test/java/org/apache/maven/artifact/testutils/TestFileManager.java
Modified:
    maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml
    maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java
    maven/components/branches/maven-2.0.x/pom.xml

Modified: maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml?rev=439369&r1=439368&r2=439369&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml (original)
+++ maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml Fri Sep  1 09:22:13 2006
@@ -54,5 +54,25 @@
       <groupId>org.apache.maven.wagon</groupId>
       <artifactId>wagon-provider-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>easymock</groupId>
+      <artifactId>easymock</artifactId>
+      <version>1.2_Java1.3</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <configuration>
+            <excludes>
+              <exclude>**/testutils/**</exclude>
+            </excludes>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
 </project>

Modified: maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java?rev=439369&r1=439368&r2=439369&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java (original)
+++ maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java Fri Sep  1 09:22:13 2006
@@ -113,6 +113,14 @@
         {
             changed = metadata.merge( this.metadata );
         }
+        
+        // beware meta-versions!
+        String version = metadata.getVersion();
+        if ( version != null && ( Artifact.LATEST_VERSION.equals( version ) || Artifact.RELEASE_VERSION.equals( version ) ) )
+        {
+            // meta-versions are not valid <version/> values...don't write them.
+            changed = false;
+        }
 
         if ( changed )
         {

Modified: maven/components/branches/maven-2.0.x/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/pom.xml?rev=439369&r1=439368&r2=439369&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/pom.xml (original)
+++ maven/components/branches/maven-2.0.x/pom.xml Fri Sep  1 09:22:13 2006
@@ -140,6 +140,12 @@
         <artifactId>wagon-http-lightweight</artifactId>
         <version>1.0-alpha-6</version>
       </dependency>
+      <dependency>
+        <groupId>easymock</groupId>
+        <artifactId>easymock</artifactId>
+        <version>1.2_Java1.3</version>
+        <scope>test</scope>
+      </dependency>
     </dependencies>
   </dependencyManagement>
   <distributionManagement>