Remove duplicate BC provider jars

bcprov-ext-jdk15on is a superset of bcprov-jdk15on, additionally
containing NTRU algorithm. Do not drop both jars into lib/ext,
reducing our distribution by ~4MB.

Change-Id: I66358840fb930d6dbf2d21fee1d1581deab7ad78
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/karaf/karaf4-parent/pom.xml b/karaf/karaf4-parent/pom.xml
index 96ce2034725e78f2c7ef261f2731072e1ab46050..823c49f9554a676487eb52f7270ad38f5f023fb2 100644 (file)
--- a/karaf/karaf4-parent/pom.xml
+++ b/karaf/karaf4-parent/pom.xml
@@ -85,10 +85,6 @@
             <!-- for https://bugs.opendaylight.org/show_bug.cgi?id=4290 -->
             <artifactId>org.osgi.service.event</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.bouncycastle</groupId>
-            <artifactId>bcprov-jdk15on</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcpkix-jdk15on</artifactId>

diff --git a/karaf/opendaylight-karaf-resources/pom.xml b/karaf/opendaylight-karaf-resources/pom.xml
index 89b88c63ddd8cdcf1e70be1bedf0d56ec3c89a79..bc9468a61289cc34b8b59df98b4e57510763a4f9 100644 (file)
--- a/karaf/opendaylight-karaf-resources/pom.xml
+++ b/karaf/opendaylight-karaf-resources/pom.xml
@@ -108,7 +108,6 @@
 # The following are added by opendaylight-karaf-resources
 mvn\:org.osgi/org.osgi.service.event/1.3.1 = 7
 mvn\:org.apache.felix/org.apache.felix.metatype/1.2.2 = 8
-mvn\:org.bouncycastle/bcprov-jdk15on/${bouncycastle.version} = 14
 mvn\:org.bouncycastle/bcpkix-jdk15on/${bouncycastle.version} = 14
 mvn\:org.bouncycastle/bcprov-ext-jdk15on/${bouncycastle.version} = 14
 mvn\:org.apache.aries.blueprint/org.apache.aries.blueprint.core.compatibility/1.0.0 = 14
@@ -135,13 +134,6 @@ mvn\:org.apache.aries.blueprint/org.apache.aries.blueprint.core.compatibility/1.
             <configuration>
               <artifactItems>
                 <!-- Needs to be copied to lib/ext in order to start bouncy provider for mina sshd -->
-                <artifactItem>
-                    <groupId>org.bouncycastle</groupId>
-                    <artifactId>bcprov-jdk15on</artifactId>
-                    <version>${bouncycastle.version}</version>
-                    <outputDirectory>target/classes/lib/ext</outputDirectory>
-                    <destFileName>bcprov-jdk15on-${bouncycastle.version}.jar</destFileName>
-                </artifactItem>
                 <artifactItem>
                     <groupId>org.bouncycastle</groupId>
                     <artifactId>bcprov-ext-jdk15on</artifactId>