Bump Bouncy Castle to 1.71

https://www.bouncycastle.org/releasenotes.html

Also adjust artifacts to consume "jdk18on" instead of "jdk15on".

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

diff --git a/karaf/bcpkix-framework-ext/pom.xml b/karaf/bcpkix-framework-ext/pom.xml
index d6861e57ece6f891d9ce74d1bafb089a87690aad..c6265a0538e6403055cdaeeacab70fa274763c02 100644 (file)
--- a/karaf/bcpkix-framework-ext/pom.xml
+++ b/karaf/bcpkix-framework-ext/pom.xml
@@ -25,7 +25,7 @@
     <dependencies>
         <dependency>
             <groupId>org.bouncycastle</groupId>
-            <artifactId>bcpkix-jdk15on</artifactId>
+            <artifactId>bcpkix-jdk18on</artifactId>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -44,7 +44,7 @@
                         </goals>
                         <configuration>
                             <includes>**/MANIFEST.MF</includes>
-                            <includeArtifactIds>bcpkix-jdk15on</includeArtifactIds>
+                            <includeArtifactIds>bcpkix-jdk18on</includeArtifactIds>
                             <silent>true</silent>
                         </configuration>
                     </execution>

diff --git a/karaf/bcprov-framework-ext/pom.xml b/karaf/bcprov-framework-ext/pom.xml
index ed6e175e7d535750b9550acd57da9cd792adc049..3b5f1d722111ed6c564cdf99f06b3bbb34fc64e4 100644 (file)
--- a/karaf/bcprov-framework-ext/pom.xml
+++ b/karaf/bcprov-framework-ext/pom.xml
@@ -25,7 +25,7 @@
     <dependencies>
         <dependency>
             <groupId>org.bouncycastle</groupId>
-            <artifactId>bcprov-ext-jdk15on</artifactId>
+            <artifactId>bcprov-ext-jdk18on</artifactId>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -44,7 +44,7 @@
                         </goals>
                         <configuration>
                             <includes>**/MANIFEST.MF</includes>
-                            <includeArtifactIds>bcprov-ext-jdk15on</includeArtifactIds>
+                            <includeArtifactIds>bcprov-ext-jdk18on</includeArtifactIds>
                             <silent>true</silent>
                         </configuration>
                     </execution>

diff --git a/karaf/bcutil-framework-ext/pom.xml b/karaf/bcutil-framework-ext/pom.xml
index becac88f3fb4d751ec18c5bfbd841bfedbe52a21..08a6058b947acb0176f3e6555443788065def84b 100644 (file)
--- a/karaf/bcutil-framework-ext/pom.xml
+++ b/karaf/bcutil-framework-ext/pom.xml
@@ -25,7 +25,7 @@
     <dependencies>
         <dependency>
             <groupId>org.bouncycastle</groupId>
-            <artifactId>bcutil-jdk15on</artifactId>
+            <artifactId>bcutil-jdk18on</artifactId>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -44,7 +44,7 @@
                         </goals>
                         <configuration>
                             <includes>**/MANIFEST.MF</includes>
-                            <includeArtifactIds>bcutil-jdk15on</includeArtifactIds>
+                            <includeArtifactIds>bcutil-jdk18on</includeArtifactIds>
                             <silent>true</silent>
                         </configuration>
                     </execution>

diff --git a/karaf/karaf-dist-static/pom.xml b/karaf/karaf-dist-static/pom.xml
index 240adbd6dd6695f1fb7761878388a0111056959a..34e4bfb5020f76b4a2b7c674a8e502324f0be8bd 100644 (file)
--- a/karaf/karaf-dist-static/pom.xml
+++ b/karaf/karaf-dist-static/pom.xml
@@ -50,15 +50,15 @@
             </dependency>
             <dependency>
                 <groupId>org.bouncycastle</groupId>
-                <artifactId>bcpkix-jdk15on</artifactId>
+                <artifactId>bcpkix-jdk18on</artifactId>
             </dependency>
             <dependency>
                 <groupId>org.bouncycastle</groupId>
-                <artifactId>bcprov-jdk15on</artifactId>
+                <artifactId>bcprov-jdk18on</artifactId>
             </dependency>
             <dependency>
                 <groupId>org.bouncycastle</groupId>
-                <artifactId>bcutil-jdk15on</artifactId>
+                <artifactId>bcutil-jdk18on</artifactId>
             </dependency>
         </dependencies>
     </dependencyManagement>

diff --git a/karaf/opendaylight-karaf-resources/pom.xml b/karaf/opendaylight-karaf-resources/pom.xml
index bd0bcb5af2a88e17a3465cc59449b6fe6fd640ca..fa790b1195a318438b5e553291bd3dae5b8c5e04 100644 (file)
--- a/karaf/opendaylight-karaf-resources/pom.xml
+++ b/karaf/opendaylight-karaf-resources/pom.xml
@@ -176,24 +176,24 @@ mvn\:org.apache.aries.blueprint/org.apache.aries.blueprint.core.compatibility/1.
                 <!-- Needs to be copied to lib/boot in order have it accessible to Main class -->
                 <artifactItem>
                     <groupId>org.bouncycastle</groupId>
-                    <artifactId>bcprov-ext-jdk15on</artifactId>
+                    <artifactId>bcprov-ext-jdk18on</artifactId>
                     <version>${bouncycastle.version}</version>
                     <outputDirectory>target/classes/lib/boot</outputDirectory>
-                    <destFileName>bcprov-ext-jdk15on-${bouncycastle.version}.jar</destFileName>
+                    <destFileName>bcprov-ext-jdk18on-${bouncycastle.version}.jar</destFileName>
                 </artifactItem>
                 <artifactItem>
                     <groupId>org.bouncycastle</groupId>
-                    <artifactId>bcpkix-jdk15on</artifactId>
+                    <artifactId>bcpkix-jdk18on</artifactId>
                     <version>${bouncycastle.version}</version>
                     <outputDirectory>target/classes/lib/boot</outputDirectory>
-                    <destFileName>bcpkix-jdk15on-${bouncycastle.version}.jar</destFileName>
+                    <destFileName>bcpkix-jdk18on-${bouncycastle.version}.jar</destFileName>
                 </artifactItem>
                 <artifactItem>
                     <groupId>org.bouncycastle</groupId>
-                    <artifactId>bcutil-jdk15on</artifactId>
+                    <artifactId>bcutil-jdk18on</artifactId>
                     <version>${bouncycastle.version}</version>
                     <outputDirectory>target/classes/lib/boot</outputDirectory>
-                    <destFileName>bcutil-jdk15on-${bouncycastle.version}.jar</destFileName>
+                    <destFileName>bcutil-jdk18on-${bouncycastle.version}.jar</destFileName>
                 </artifactItem>
               </artifactItems>
               <silent>true</silent>

diff --git a/odlparent-dependency-check/pom.xml b/odlparent-dependency-check/pom.xml
index b2f4374d89974b2a691b1425a4812eaaaad50122..50121dd47f7f36db7444654ef00140b1b926dac7 100644 (file)
--- a/odlparent-dependency-check/pom.xml
+++ b/odlparent-dependency-check/pom.xml
@@ -201,19 +201,19 @@
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
-            <artifactId>bcpkix-jdk15on</artifactId>
+            <artifactId>bcpkix-jdk18on</artifactId>
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
-            <artifactId>bcprov-ext-jdk15on</artifactId>
+            <artifactId>bcprov-ext-jdk18on</artifactId>
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
-            <artifactId>bcprov-jdk15on</artifactId>
+            <artifactId>bcprov-jdk18on</artifactId>
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
-            <artifactId>bcutil-jdk15on</artifactId>
+            <artifactId>bcutil-jdk18on</artifactId>
         </dependency>
         <dependency>
             <groupId>org.checkerframework</groupId>

diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index 45afce7b0a3885fa2e8761137e37bc09f7c84a57..c4da019dec07499f8aedec9256c45c3766115125 100644 (file)
--- a/odlparent/pom.xml
+++ b/odlparent/pom.xml
@@ -42,7 +42,7 @@
 
     <!-- Supporting Libraries -->
     <!-- Only used internally -->
-    <bouncycastle.version>1.70</bouncycastle.version>
+    <bouncycastle.version>1.71</bouncycastle.version>
 
     <!-- JaCoCo configuration, by default tied to Sonar configuration, but can be overridden separately
          to allow projects to report Sonar values from the entire project. -->
@@ -453,22 +453,22 @@
       </dependency>
       <dependency>
         <groupId>org.bouncycastle</groupId>
-        <artifactId>bcpkix-jdk15on</artifactId>
+        <artifactId>bcpkix-jdk18on</artifactId>
         <version>${bouncycastle.version}</version>
       </dependency>
       <dependency>
         <groupId>org.bouncycastle</groupId>
-        <artifactId>bcprov-jdk15on</artifactId>
+        <artifactId>bcprov-jdk18on</artifactId>
         <version>${bouncycastle.version}</version>
       </dependency>
       <dependency>
         <groupId>org.bouncycastle</groupId>
-        <artifactId>bcprov-ext-jdk15on</artifactId>
+        <artifactId>bcprov-ext-jdk18on</artifactId>
         <version>${bouncycastle.version}</version>
       </dependency>
       <dependency>
         <groupId>org.bouncycastle</groupId>
-        <artifactId>bcutil-jdk15on</artifactId>
+        <artifactId>bcutil-jdk18on</artifactId>
         <version>${bouncycastle.version}</version>
       </dependency>
 

diff --git a/single-feature-parent/pom.xml b/single-feature-parent/pom.xml
index ccd581110676315ff72c98c4cb3223f676939637..3ca547e20821ff4a6ce70ed7ab4c5c87a5f32483 100644 (file)
--- a/single-feature-parent/pom.xml
+++ b/single-feature-parent/pom.xml
@@ -111,10 +111,10 @@
                         <excludedArtifactId>org.osgi.core</excludedArtifactId>
                         <excludedArtifactId>org.osgi.enterprise</excludedArtifactId>
                         <!-- Bouncy Castle -->
-                        <excludedArtifactId>bcprov-jdk15on</excludedArtifactId>
-                        <excludedArtifactId>bcprov-ext-jdk15on</excludedArtifactId>
-                        <excludedArtifactId>bcpkix-jdk15on</excludedArtifactId>
-                        <excludedArtifactId>bcutil-jdk15on</excludedArtifactId>
+                        <excludedArtifactId>bcprov-jdk18on</excludedArtifactId>
+                        <excludedArtifactId>bcprov-ext-jdk18on</excludedArtifactId>
+                        <excludedArtifactId>bcpkix-jdk18on</excludedArtifactId>
+                        <excludedArtifactId>bcutil-jdk18on</excludedArtifactId>
                         <!-- JAXB -->
                         <excludedArtifactId>jaxb-api</excludedArtifactId>
                         <excludedArtifactId>jaxb-runtime</excludedArtifactId>