Don't pull in two versions of bouncycastle
authorlajoie <lajoie@ab3bd59b-922f-494d-bb5f-6f0a3c29deca>
Wed, 19 Aug 2009 14:50:15 +0000 (14:50 +0000)
committerlajoie <lajoie@ab3bd59b-922f-494d-bb5f-6f0a3c29deca>
Wed, 19 Aug 2009 14:50:15 +0000 (14:50 +0000)
git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/branches/REL_2@2880 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

pom.xml
src/main/assembly/bin.xml
src/main/assembly/src.xml

diff --git a/pom.xml b/pom.xml
index 80ec167..abb4964 100644 (file)
--- a/pom.xml
+++ b/pom.xml
             <artifactId>ant-extensions</artifactId>
             <version>13Apr2008</version>
             <scope>runtime</scope>
             <artifactId>ant-extensions</artifactId>
             <version>13Apr2008</version>
             <scope>runtime</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.bouncycastle</groupId>
+                    <artifactId>bcprov-jdk14</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>edu.internet2.middleware</groupId>
         </dependency>
         <dependency>
             <groupId>edu.internet2.middleware</groupId>
index 9dadba5..0f502d2 100644 (file)
@@ -26,7 +26,6 @@
                 <include>org.apache.ant:*</include>
                 <include>ant-contrib:*</include>
                 <include>edu.internet2.middleware:ant-extensions:*</include>
                 <include>org.apache.ant:*</include>
                 <include>ant-contrib:*</include>
                 <include>edu.internet2.middleware:ant-extensions:*</include>
-                <include>org.bouncycastle:bcprov-jdk14:*</include>
             </includes>
         </dependencySet>
         <dependencySet>
             </includes>
         </dependencySet>
         <dependencySet>
index 1537a2a..30e0b3c 100644 (file)
@@ -26,7 +26,6 @@
                 <include>org.apache.ant:*</include>
                 <include>ant-contrib:*</include>
                 <include>edu.internet2.middleware:ant-extensions:*</include>
                 <include>org.apache.ant:*</include>
                 <include>ant-contrib:*</include>
                 <include>edu.internet2.middleware:ant-extensions:*</include>
-                <include>org.bouncycastle:bcprov-jdk14:*</include>
             </includes>
         </dependencySet>
         <dependencySet>
             </includes>
         </dependencySet>
         <dependencySet>