You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by og...@apache.org on 2008/12/02 22:16:52 UTC

svn commit: r722617 - in /maven/mercury/trunk/mercury-md/mercury-md-shared: pom.xml src/main/java/org/apache/maven/mercury/repository/metadata/MetadataBuilder.java

Author: ogusakov
Date: Tue Dec  2 13:16:52 2008
New Revision: 722617

URL: http://svn.apache.org/viewvc?rev=722617&view=rev
Log:
removed unnecessary dependency

Modified:
    maven/mercury/trunk/mercury-md/mercury-md-shared/pom.xml
    maven/mercury/trunk/mercury-md/mercury-md-shared/src/main/java/org/apache/maven/mercury/repository/metadata/MetadataBuilder.java

Modified: maven/mercury/trunk/mercury-md/mercury-md-shared/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-md/mercury-md-shared/pom.xml?rev=722617&r1=722616&r2=722617&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-md/mercury-md-shared/pom.xml (original)
+++ maven/mercury/trunk/mercury-md/mercury-md-shared/pom.xml Tue Dec  2 13:16:52 2008
@@ -56,15 +56,18 @@
   </build>
 
   <dependencies>
+  
+  <!-- 
     <dependency>
       <groupId>org.apache.maven.mercury</groupId>
       <artifactId>mercury-artifact</artifactId>
     </dependency>
-
+ -->
     <!--  
      | for some reason transitive does not work - have to copy deps from mercury-util 
      | but it works fine under m2eclipse 
      -->
+ 
     <dependency>
       <groupId>org.apache.maven.mercury</groupId>
       <artifactId>mercury-util</artifactId>
@@ -74,7 +77,7 @@
       <groupId>org.apache.maven.mercury</groupId>
       <artifactId>mercury-crypto-basic</artifactId>
     </dependency>
-    
+   
     <dependency>
       <groupId>commons-cli</groupId>
       <artifactId>commons-cli</artifactId>

Modified: maven/mercury/trunk/mercury-md/mercury-md-shared/src/main/java/org/apache/maven/mercury/repository/metadata/MetadataBuilder.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-md/mercury-md-shared/src/main/java/org/apache/maven/mercury/repository/metadata/MetadataBuilder.java?rev=722617&r1=722616&r2=722617&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-md/mercury-md-shared/src/main/java/org/apache/maven/mercury/repository/metadata/MetadataBuilder.java (original)
+++ maven/mercury/trunk/mercury-md/mercury-md-shared/src/main/java/org/apache/maven/mercury/repository/metadata/MetadataBuilder.java Tue Dec  2 13:16:52 2008
@@ -26,7 +26,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.maven.mercury.artifact.Artifact;
 import org.apache.maven.mercury.repository.metadata.io.xpp3.MetadataXpp3Reader;
 import org.apache.maven.mercury.repository.metadata.io.xpp3.MetadataXpp3Writer;
 import org.apache.maven.mercury.util.TimeUtil;
@@ -247,7 +246,7 @@
     String utc = TimeUtil.getUTCTimestamp();
     sn.setTimestamp( utc );
     
-    if( version.endsWith( Artifact.SNAPSHOT_VERSION ))
+    if( version.endsWith( "SNAPSHOT" ))
       return sn;
     
     String sbn = version.substring( version.lastIndexOf( '-' )+1 );