diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml
index 8eea04b9dd..43c991afc5 100644
--- a/maven-plugin/pom.xml
+++ b/maven-plugin/pom.xml
@@ -100,6 +100,11 @@ THE SOFTWARE.
               <groupId>xml-apis</groupId>
               <artifactId>xml-apis</artifactId>
             </exclusion>
+            <exclusion>
+              <!-- we bundle our own version below --> 
+              <groupId>org.apache.maven.wagon</groupId>
+              <artifactId>wagon-webdav</artifactId>
+            </exclusion>
           </exclusions>
         </dependency>
 
diff --git a/test/src/test/java/hudson/maven/RedeployPublisherTest.java b/test/src/test/java/hudson/maven/RedeployPublisherTest.java
index 5e9b77c04e..a46203a0c5 100644
--- a/test/src/test/java/hudson/maven/RedeployPublisherTest.java
+++ b/test/src/test/java/hudson/maven/RedeployPublisherTest.java
@@ -54,5 +54,18 @@ public class RedeployPublisherTest extends HudsonTestCase {
         System.out.println(repo);
     }
 
-
+//    /**
+//     * Makes sure that the webdav wagon component we bundle is compatible.
+//     */
+//    public void testWebDavDeployment() throws Exception {
+//        configureDefaultMaven();
+//        MavenModuleSet m2 = createMavenProject();
+//
+//        // a fake build
+//        m2.setScm(new SingleFileSCM("pom.xml",getClass().getResource("big-artifact.pom")));
+//        m2.getPublishersList().add(new RedeployPublisher("","dav:http://localhost/dav/",true));
+//
+//        MavenModuleSetBuild b = m2.scheduleBuild2(0).get();
+//        assertBuildStatus(Result.SUCCESS, b);
+//    }
 }