You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by og...@apache.org on 2008/09/25 20:50:23 UTC

svn commit: r699051 - /maven/components/branches/2.2.0-M1-MNG-3759/apache-maven/pom.xml

Author: ogusakov
Date: Thu Sep 25 11:50:22 2008
New Revision: 699051

URL: http://svn.apache.org/viewvc?rev=699051&view=rev
Log:
syncyng my version to try in Hudson

Modified:
    maven/components/branches/2.2.0-M1-MNG-3759/apache-maven/pom.xml

Modified: maven/components/branches/2.2.0-M1-MNG-3759/apache-maven/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/2.2.0-M1-MNG-3759/apache-maven/pom.xml?rev=699051&r1=699050&r2=699051&view=diff
==============================================================================
--- maven/components/branches/2.2.0-M1-MNG-3759/apache-maven/pom.xml (original)
+++ maven/components/branches/2.2.0-M1-MNG-3759/apache-maven/pom.xml Thu Sep 25 11:50:22 2008
@@ -68,18 +68,28 @@
                   <exclude>xml-apis:xml-apis</exclude>
                   <exclude>junit:junit</exclude>
                   <exclude>jmock:jmock</exclude>
+                   <!--
+                    |
+                    | Mercury
+                    | 
+                     -->                  
+                  <exclude>org.bouncycastle:bcprov-jdk15</exclude>
+                  <exclude>org.bouncycastle:bcpg-jdk15</exclude>
+                  <exclude>bouncycastle:bcprov-jdk15</exclude>
+                  <exclude>bouncycastle:bcpg-jdk15</exclude>
                 </excludes>
               </artifactSet>
               <relocations>
-                <!-- for jackrabbit webdav wagon -->
+                <!-- for jackrabbit webdav wagon 
                 <relocation>
                   <pattern>org.apache.jackrabbit</pattern>
                 </relocation>
                 <relocation>
                   <pattern>org.slf4j</pattern>
                 </relocation>
+-->
                 
-                <!-- For http/webdav wagons -->
+                <!-- For http/webdav wagons 
                 <relocation>
                   <pattern>org.apache.commons.httpclient</pattern>
                 </relocation>
@@ -89,7 +99,7 @@
                 <relocation>
                   <pattern>org.apache.commons.codec</pattern>
                 </relocation>
-
+-->
                 <!-- For jsch wagon -->
                 <relocation>
                   <pattern>com.jcraft</pattern>