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/03 08:16:52 UTC
svn commit: r722796 - in /maven/mercury/trunk:
mercury-maven/mercury-compare-mdo/pom.xml
mercury-md/mercury-md-shared/pom.xml
mercury-md/mercury-md-shared/src/main/java/org/apache/maven/mercury/repository/metadata/MetadataBuilder.java
Author: ogusakov
Date: Tue Dec 2 23:16:52 2008
New Revision: 722796
URL: http://svn.apache.org/viewvc?rev=722796&view=rev
Log:
fixed comparisson plugin to use new lang, returned back dependency on artifact to shared-md
Modified:
maven/mercury/trunk/mercury-maven/mercury-compare-mdo/pom.xml
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-maven/mercury-compare-mdo/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-maven/mercury-compare-mdo/pom.xml?rev=722796&r1=722795&r2=722796&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-maven/mercury-compare-mdo/pom.xml (original)
+++ maven/mercury/trunk/mercury-maven/mercury-compare-mdo/pom.xml Tue Dec 2 23:16:52 2008
@@ -39,21 +39,26 @@
</goals>
</execution>
</executions>
+
</plugin>
</plugins>
</build>
<dependencies>
+
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-lang</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-artifact</artifactId>
- <version>${project.version}</version>
</dependency>
<!-- for some reason transitive does not work - have to copy deps from mercury-util -->
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-util</artifactId>
- <version>${project.version}</version>
</dependency>
</dependencies>
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=722796&r1=722795&r2=722796&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 23:16:52 2008
@@ -57,12 +57,11 @@
<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
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=722796&r1=722795&r2=722796&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 23:16:52 2008
@@ -26,6 +26,7 @@
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;
@@ -246,7 +247,7 @@
String utc = TimeUtil.getUTCTimestamp();
sn.setTimestamp( utc );
- if( version.endsWith( "SNAPSHOT" ))
+ if( version.endsWith( Artifact.SNAPSHOT_VERSION ))
return sn;
String sbn = version.substring( version.lastIndexOf( '-' )+1 );