Author: brett
Date: Wed Jan 24 21:39:21 2007
New Revision: 499670
URL: http://svn.apache.org/viewvc?view=rev&rev=499670
Log:
update to latest model-converter
Modified:
maven/archiva/trunk/archiva-converter/pom.xml
maven/archiva/trunk/archiva-converter/src/test/expected-files/converted-v3-snapshot.pom
maven/archiva/trunk/archiva-converter/src/test/expected-files/converted-v3-timestamped-snapshot.pom
maven/archiva/trunk/archiva-converter/src/test/expected-files/converted-v3-warnings.pom
maven/archiva/trunk/archiva-converter/src/test/expected-files/converted-v3.pom
maven/archiva/trunk/archiva-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.pom
maven/archiva/trunk/pom.xml
Modified: maven/archiva/trunk/archiva-converter/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-converter/pom.xml?view=diff&rev=499670&r1=499669&r2=499670
==============================================================================
--- maven/archiva/trunk/archiva-converter/pom.xml (original)
+++ maven/archiva/trunk/archiva-converter/pom.xml Wed Jan 24 21:39:21 2007
@@ -42,7 +42,7 @@
<artifactId>maven-artifact</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.maven</groupId>
+ <groupId>org.apache.maven.shared</groupId>
<artifactId>maven-model-converter</artifactId>
</dependency>
<dependency>
Modified:
maven/archiva/trunk/archiva-converter/src/test/expected-files/converted-v3-snapshot.pom
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-converter/src/test/expected-files/converted-v3-snapshot.pom?view=diff&rev=499670&r1=499669&r2=499670
==============================================================================
---
maven/archiva/trunk/archiva-converter/src/test/expected-files/converted-v3-snapshot.pom
(original)
+++
maven/archiva/trunk/archiva-converter/src/test/expected-files/converted-v3-snapshot.pom
Wed Jan 24 21:39:21 2007
@@ -18,5 +18,11 @@
<version>version</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
Modified:
maven/archiva/trunk/archiva-converter/src/test/expected-files/converted-v3-timestamped-snapshot.pom
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-converter/src/test/expected-files/converted-v3-timestamped-snapshot.pom?view=diff&rev=499670&r1=499669&r2=499670
==============================================================================
---
maven/archiva/trunk/archiva-converter/src/test/expected-files/converted-v3-timestamped-snapshot.pom
(original)
+++
maven/archiva/trunk/archiva-converter/src/test/expected-files/converted-v3-timestamped-snapshot.pom
Wed Jan 24 21:39:21 2007
@@ -18,5 +18,11 @@
<version>version</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
Modified:
maven/archiva/trunk/archiva-converter/src/test/expected-files/converted-v3-warnings.pom
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-converter/src/test/expected-files/converted-v3-warnings.pom?view=diff&rev=499670&r1=499669&r2=499670
==============================================================================
---
maven/archiva/trunk/archiva-converter/src/test/expected-files/converted-v3-warnings.pom
(original)
+++
maven/archiva/trunk/archiva-converter/src/test/expected-files/converted-v3-warnings.pom
Wed Jan 24 21:39:21 2007
@@ -18,5 +18,11 @@
<version>version</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
Modified:
maven/archiva/trunk/archiva-converter/src/test/expected-files/converted-v3.pom
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-converter/src/test/expected-files/converted-v3.pom?view=diff&rev=499670&r1=499669&r2=499670
==============================================================================
---
maven/archiva/trunk/archiva-converter/src/test/expected-files/converted-v3.pom
(original)
+++
maven/archiva/trunk/archiva-converter/src/test/expected-files/converted-v3.pom
Wed Jan 24 21:39:21 2007
@@ -18,5 +18,11 @@
<version>version</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
Modified:
maven/archiva/trunk/archiva-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.pom
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.pom?view=diff&rev=499670&r1=499669&r2=499670
==============================================================================
---
maven/archiva/trunk/archiva-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.pom
(original)
+++
maven/archiva/trunk/archiva-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.pom
Wed Jan 24 21:39:21 2007
@@ -18,5 +18,11 @@
<version>version</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: maven/archiva/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/pom.xml?view=diff&rev=499670&r1=499669&r2=499670
==============================================================================
--- maven/archiva/trunk/pom.xml (original)
+++ maven/archiva/trunk/pom.xml Wed Jan 24 21:39:21 2007
@@ -225,9 +225,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.maven</groupId>
+ <groupId>org.apache.maven.shared</groupId>
<artifactId>maven-model-converter</artifactId>
- <version>2.0.4</version>
+ <version>2.0.5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
@@ -558,7 +558,7 @@
</pluginRepository>
</pluginRepositories>
<properties>
- <maven.version>2.0.4</maven.version>
+ <maven.version>2.0.5-maestro-1.2-SNAPSHOT</maven.version>
<wagon.version>1.0-beta-2</wagon.version>
<plexus-security.version>1.0-alpha-10-SNAPSHOT</plexus-security.version>
</properties>