From: Olivier Lamy <olamy@apache.org>
Date: Wed, 25 Jan 2012 08:39:03 +0000 (+0000)
Subject: fix stage-repository-merge unit tests
X-Git-Tag: archiva-1.4-M3~1471
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=291c161228baa1241e56cedaa1abc9bdb2f8aa3f;p=archiva.git

fix stage-repository-merge unit tests

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

diff --git a/archiva-modules/plugins/stage-repository-merge/pom.xml b/archiva-modules/plugins/stage-repository-merge/pom.xml
index 6532835c4..ac01469ec 100644
--- a/archiva-modules/plugins/stage-repository-merge/pom.xml
+++ b/archiva-modules/plugins/stage-repository-merge/pom.xml
@@ -70,6 +70,17 @@
       <artifactId>slf4j-log4j12</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.maven.wagon</groupId>
+      <artifactId>wagon-http</artifactId>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
   </dependencies>
   <build>
     <plugins>