From: Robert Varga <robert.varga@pantheon.tech>
Date: Wed, 2 Jan 2019 10:41:51 +0000 (+0100)
Subject: Remove duplicate BC provider jars
X-Git-Tag: v4.0.8~34
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=bb299b31b7bfcfb3915ca2c9bbd9e595b2e92ffc;p=odlparent.git

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 96ce20347..823c49f95 100644
--- 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 89b88c63d..bc9468a61 100644
--- 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>