Author: ogusakov
Date: Fri Sep 19 11:07:36 2008
New Revision: 697169
URL: http://svn.apache.org/viewvc?rev=697169&view=rev
Log:
still adjusting versions
Modified:
maven/components/branches/2.2.0-M1-MNG-3759/maven-core-it-runner/pom.xml
maven/components/branches/2.2.0-M1-MNG-3759/maven-core/pom.xml
maven/components/branches/2.2.0-M1-MNG-3759/maven-reporting/maven-reporting-api/pom.xml
maven/components/branches/2.2.0-M1-MNG-3759/pom.xml
Modified:
maven/components/branches/2.2.0-M1-MNG-3759/maven-core-it-runner/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/2.2.0-M1-MNG-3759/maven-core-it-runner/pom.xml?rev=697169&r1=697168&r2=697169&view=diff
==============================================================================
--- maven/components/branches/2.2.0-M1-MNG-3759/maven-core-it-runner/pom.xml
(original)
+++ maven/components/branches/2.2.0-M1-MNG-3759/maven-core-it-runner/pom.xml
Fri Sep 19 11:07:36 2008
@@ -22,7 +22,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven</groupId>
- <version>2.1.0-M2-SNAPSHOT</version>
+ <version>2.2.0-M1-SNAPSHOT</version>
<artifactId>maven-core-it-runner</artifactId>
<name>Integration Test Executor</name>
Modified: maven/components/branches/2.2.0-M1-MNG-3759/maven-core/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/2.2.0-M1-MNG-3759/maven-core/pom.xml?rev=697169&r1=697168&r2=697169&view=diff
==============================================================================
--- maven/components/branches/2.2.0-M1-MNG-3759/maven-core/pom.xml (original)
+++ maven/components/branches/2.2.0-M1-MNG-3759/maven-core/pom.xml Fri Sep 19
11:07:36 2008
@@ -48,16 +48,25 @@
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-parameter-documenter</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-mercury</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+<!--
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-webdav-jackrabbit</artifactId>
<scope>runtime</scope>
</dependency>
+
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-http-lightweight</artifactId>
<scope>runtime</scope>
</dependency>
+ -->
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-api</artifactId>
Modified:
maven/components/branches/2.2.0-M1-MNG-3759/maven-reporting/maven-reporting-api/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/2.2.0-M1-MNG-3759/maven-reporting/maven-reporting-api/pom.xml?rev=697169&r1=697168&r2=697169&view=diff
==============================================================================
---
maven/components/branches/2.2.0-M1-MNG-3759/maven-reporting/maven-reporting-api/pom.xml
(original)
+++
maven/components/branches/2.2.0-M1-MNG-3759/maven-reporting/maven-reporting-api/pom.xml
Fri Sep 19 11:07:36 2008
@@ -23,7 +23,7 @@
<parent>
<artifactId>maven-reporting</artifactId>
<groupId>org.apache.maven.reporting</groupId>
- <version>2.1.0-M2-SNAPSHOT</version>
+ <version>2.2.0-M1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>maven-reporting-api</artifactId>
Modified: maven/components/branches/2.2.0-M1-MNG-3759/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/2.2.0-M1-MNG-3759/pom.xml?rev=697169&r1=697168&r2=697169&view=diff
==============================================================================
--- maven/components/branches/2.2.0-M1-MNG-3759/pom.xml (original)
+++ maven/components/branches/2.2.0-M1-MNG-3759/pom.xml Fri Sep 19 11:07:36 2008
@@ -273,8 +273,9 @@
</modules>
<properties>
- <mavenVersion>2.1.0-M2-SNAPSHOT</mavenVersion>
+ <mavenVersion>2.2.0-M1-SNAPSHOT</mavenVersion>
<wagonVersion>1.0-beta-4</wagonVersion>
+ <mercuryVersion>1.0.0-alpha-1-SNAPSHOT</mercuryVersion>
</properties>
<!--start-->
@@ -429,6 +430,13 @@
<artifactId>wagon-file</artifactId>
<version>${wagonVersion}</version>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-mercury</artifactId>
+ <version>${mercuryVersion}</version>
+ </dependency>
+<!--
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-webdav-jackrabbit</artifactId>
@@ -439,6 +447,7 @@
<artifactId>wagon-http-lightweight</artifactId>
<version>${wagonVersion}</version>
</dependency>
+ -->
<dependency>
<groupId>easymock</groupId>
<artifactId>easymock</artifactId>
