summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrett Porter <brett@apache.org>2007-01-25 05:39:21 +0000
committerBrett Porter <brett@apache.org>2007-01-25 05:39:21 +0000
commit099806c9c97f49a4871a9bc2d45dafdb17c584b3 (patch)
tree21673967144279bfee4c238ce13a2ff82e357b33
parent599250aad1a82b49ee7987bcfd85cf53c69f8ae2 (diff)
downloadarchiva-099806c9c97f49a4871a9bc2d45dafdb17c584b3.tar.gz
archiva-099806c9c97f49a4871a9bc2d45dafdb17c584b3.zip
update to latest model-converter
git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@499670 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--archiva-converter/pom.xml2
-rw-r--r--archiva-converter/src/test/expected-files/converted-v3-snapshot.pom6
-rw-r--r--archiva-converter/src/test/expected-files/converted-v3-timestamped-snapshot.pom6
-rw-r--r--archiva-converter/src/test/expected-files/converted-v3-warnings.pom6
-rw-r--r--archiva-converter/src/test/expected-files/converted-v3.pom6
-rw-r--r--archiva-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.pom8
-rw-r--r--pom.xml6
7 files changed, 35 insertions, 5 deletions
diff --git a/archiva-converter/pom.xml b/archiva-converter/pom.xml
index 7eabccb9e..d123cdcf9 100644
--- a/archiva-converter/pom.xml
+++ b/archiva-converter/pom.xml
@@ -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>
diff --git a/archiva-converter/src/test/expected-files/converted-v3-snapshot.pom b/archiva-converter/src/test/expected-files/converted-v3-snapshot.pom
index 9134c3cdf..1615b6663 100644
--- a/archiva-converter/src/test/expected-files/converted-v3-snapshot.pom
+++ b/archiva-converter/src/test/expected-files/converted-v3-snapshot.pom
@@ -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>
diff --git a/archiva-converter/src/test/expected-files/converted-v3-timestamped-snapshot.pom b/archiva-converter/src/test/expected-files/converted-v3-timestamped-snapshot.pom
index 46eacaf2e..94307d863 100644
--- a/archiva-converter/src/test/expected-files/converted-v3-timestamped-snapshot.pom
+++ b/archiva-converter/src/test/expected-files/converted-v3-timestamped-snapshot.pom
@@ -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>
diff --git a/archiva-converter/src/test/expected-files/converted-v3-warnings.pom b/archiva-converter/src/test/expected-files/converted-v3-warnings.pom
index e07664932..25f4e76d0 100644
--- a/archiva-converter/src/test/expected-files/converted-v3-warnings.pom
+++ b/archiva-converter/src/test/expected-files/converted-v3-warnings.pom
@@ -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>
diff --git a/archiva-converter/src/test/expected-files/converted-v3.pom b/archiva-converter/src/test/expected-files/converted-v3.pom
index 29ba92771..9f8b63e16 100644
--- a/archiva-converter/src/test/expected-files/converted-v3.pom
+++ b/archiva-converter/src/test/expected-files/converted-v3.pom
@@ -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>
diff --git a/archiva-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.pom b/archiva-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.pom
index 253ef3466..0180549f0 100644
--- a/archiva-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.pom
+++ b/archiva-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.pom
@@ -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>
diff --git a/pom.xml b/pom.xml
index 988467b9d..732301583 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>