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 2009/01/30 18:37:21 UTC
svn commit: r739344 - in /maven/mercury/trunk: mercury-ant-tasks/pom.xml
pom.xml
Author: ogusakov
Date: Fri Jan 30 17:37:20 2009
New Revision: 739344
URL: http://svn.apache.org/viewvc?rev=739344&view=rev
Log:
ant tasks moved one level up
Modified:
maven/mercury/trunk/mercury-ant-tasks/pom.xml
maven/mercury/trunk/pom.xml
Modified: maven/mercury/trunk/mercury-ant-tasks/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant-tasks/pom.xml?rev=739344&r1=739343&r2=739344&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-ant-tasks/pom.xml (original)
+++ maven/mercury/trunk/mercury-ant-tasks/pom.xml Fri Jan 30 17:37:20 2009
@@ -112,20 +112,14 @@
<artifactId>jetty-util5</artifactId>
</dependency>
-
<!-- Maven dependencies -->
<dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-mercury</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>${maven.version}</version>
</dependency>
-
+
+ <!-- Test dependencies -->
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-transport-http</artifactId>
@@ -136,9 +130,16 @@
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant-testutil</artifactId>
- <version>1.7.1</version>
+ <version>${ant.version}</version>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
Modified: maven/mercury/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/pom.xml?rev=739344&r1=739343&r2=739344&view=diff
==============================================================================
--- maven/mercury/trunk/pom.xml (original)
+++ maven/mercury/trunk/pom.xml Fri Jan 30 17:37:20 2009
@@ -91,6 +91,9 @@
<sat4j.version>2.0.4</sat4j.version>
<ant.version>1.7.1</ant.version>
+ <!-- maven version: non-modules only !! Never use in Mercury modules!! -->
+ <maven.version>3.0-SNAPSHOT</maven.version>
+
<!-- mercury-wagon -->
<wagon.provider.api.version>1.0-beta-4</wagon.provider.api.version>