Bug 9228: Package bcprov-ext-jdk15on jar

Bouncycastle is hotwired as the default JCE provider in ODL
since it has greater capabilities than those provided with
the default Oracle and OpenJDK JCE implementations.  This
change adds an overlooked and missing jar to the existing
provider infra.

Change-Id: I82baae9af5dcacea2f675b0e9f25837c85670362
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>

diff --git a/karaf/opendaylight-karaf-resources/pom.xml b/karaf/opendaylight-karaf-resources/pom.xml
index 8b612652c03defb129a6ffc1e20c4a36aa81bb5f..c6ae2bf940dfda99a54ee1a39ab9a1be61639312 100644 (file)
--- a/karaf/opendaylight-karaf-resources/pom.xml
+++ b/karaf/opendaylight-karaf-resources/pom.xml
@@ -60,6 +60,13 @@
                     <outputDirectory>target/classes/lib/ext</outputDirectory>
                     <destFileName>bcprov-jdk15on-${bouncycastle.version}.jar</destFileName>
                 </artifactItem>
+                <artifactItem>
+                    <groupId>org.bouncycastle</groupId>
+                    <artifactId>bcprov-ext-jdk15on</artifactId>
+                    <version>${bouncycastle.version}</version>
+                    <outputDirectory>target/classes/lib/ext</outputDirectory>
+                    <destFileName>bcprov-ext-jdk15on-${bouncycastle.version}.jar</destFileName>
+                </artifactItem>
                 <artifactItem>
                     <groupId>org.bouncycastle</groupId>
                     <artifactId>bcpkix-jdk15on</artifactId>

diff --git a/karaf/opendaylight-karaf4-resources/pom.xml b/karaf/opendaylight-karaf4-resources/pom.xml
index 3e1683488510a2ff5623040bc86ad5cafbc4fb80..67a9d150a1f9ad35328e2517341ee6bafccf5265 100644 (file)
--- a/karaf/opendaylight-karaf4-resources/pom.xml
+++ b/karaf/opendaylight-karaf4-resources/pom.xml
@@ -48,6 +48,13 @@
                     <outputDirectory>target/classes/lib/ext</outputDirectory>
                     <destFileName>bcprov-jdk15on-${bouncycastle.version}.jar</destFileName>
                 </artifactItem>
+                <artifactItem>
+                    <groupId>org.bouncycastle</groupId>
+                    <artifactId>bcprov-ext-jdk15on</artifactId>
+                    <version>${bouncycastle.version}</version>
+                    <outputDirectory>target/classes/lib/ext</outputDirectory>
+                    <destFileName>bcprov-ext-jdk15on-${bouncycastle.version}.jar</destFileName>
+                </artifactItem>
                 <artifactItem>
                     <groupId>org.bouncycastle</groupId>
                     <artifactId>bcpkix-jdk15on</artifactId>

diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index eaeab4e81f51e8e4629ad6f65bae51a300caff86..fbfd0becb73ccb3f30538d22306df20443450abd 100644 (file)
--- a/odlparent/pom.xml
+++ b/odlparent/pom.xml
@@ -864,6 +864,11 @@
         <artifactId>bcprov-jdk15on</artifactId>
         <version>${bouncycastle.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.bouncycastle</groupId>
+        <artifactId>bcprov-ext-jdk15on</artifactId>
+        <version>${bouncycastle.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.codehaus.enunciate</groupId>
         <artifactId>enunciate-core-annotations</artifactId>