update to latest model-converter

git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@499670 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-converter/pom.xml b/archiva-converter/pom.xml
index 7eabccb9ee2ed49985c8ab24f4cee8f4bbe69387..d123cdcf99bcb284f46c0321f2026c8bfa4f747d 100644 (file)
--- 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 9134c3cdfc9f0353aebd58624cfc8bfb8563cebd..1615b66636d56f08e4a5e2262f587e68116cd4b3 100644 (file)
--- 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 46eacaf2eb26ce6a209bf6072dc4e80d033e874a..94307d8638abeca2eb99aad7c4a7c405216816c0 100644 (file)
--- 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 e076649320ecd40dd3ead4f8b5bf028bd23c6a24..25f4e76d0cc625625f0b10a9a92c92c4839b3788 100644 (file)
--- 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 29ba92771d3973f4871cab887ad6071ab92112ff..9f8b63e16c07686ceefb001e9601021d46f38a93 100644 (file)
--- 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 253ef346656612f8ff1edbc1dc054e1698f77987..0180549f0f3ec81a3a6060f87323abdd4409cd36 100644 (file)
--- 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 988467b9debddbc84f4d805e3323e9543b5615be..732301583104f774a38dc6796d885582f8072596 100644 (file)
--- 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>