[brooklyn-dist] branch master updated: use latest bouncycastle - jdk18on

[heneveld]

This is an automated email from the ASF dual-hosted git repository.

heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-dist.git


The following commit(s) were added to refs/heads/master by this push:
     new d5d6f18  use latest bouncycastle - jdk18on
d5d6f18 is described below

commit d5d6f18185e9c679457ff95660d41d24f027ab54
Author: Alex Heneveld <a...@cloudsoft.io>
AuthorDate: Wed Dec 7 17:31:52 2022 +0000

    use latest bouncycastle - jdk18on
---
 .../resources/etc/org.apache.karaf.features.xml                  | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git 
a/karaf/features/src/main/filtered-resources/resources/etc/org.apache.karaf.features.xml
 
b/karaf/features/src/main/filtered-resources/resources/etc/org.apache.karaf.features.xml
index 1c857e0..b3dd335 100644
--- 
a/karaf/features/src/main/filtered-resources/resources/etc/org.apache.karaf.features.xml
+++ 
b/karaf/features/src/main/filtered-resources/resources/etc/org.apache.karaf.features.xml
@@ -67,12 +67,14 @@
 
         <!-- For crypto, both the karaf ssh feature and jclouds use lower 
versions than we want;
              (some lower versions may have CVEs, and in any case it is 
preferable to have one version where compatible) -->
+        <bundle 
originalUri="mvn:org.bouncycastle/bcutil-jdk15on/[1.51,${bouncycastle.version}]"
+            
replacement="mvn:org.bouncycastle/bcutil-jdk18on/${bouncycastle.version}" />
         <bundle 
originalUri="mvn:org.bouncycastle/bcprov-jdk15on/[1.51,${bouncycastle.version}]"
-            
replacement="mvn:org.bouncycastle/bcprov-jdk15on/${bouncycastle.version}" />
+            
replacement="mvn:org.bouncycastle/bcprov-jdk18on/${bouncycastle.version}" />
         <bundle 
originalUri="mvn:org.bouncycastle/bcprov-ext-jdk15on/[1.51,${bouncycastle.version}]"
-            
replacement="mvn:org.bouncycastle/bcprov-ext-jdk15on/${bouncycastle.version}" />
+            
replacement="mvn:org.bouncycastle/bcprov-jdk18on/${bouncycastle.version}" />
         <bundle 
originalUri="mvn:org.bouncycastle/bcpkix-jdk15on/[1.51,${bouncycastle.version}]"
-            
replacement="mvn:org.bouncycastle/bcpkix-jdk15on/${bouncycastle.version}" />
+            
replacement="mvn:org.bouncycastle/bcpkix-jdk18on/${bouncycastle.version}" />
         <!-- now we wrap these so blacklist entirely -->
 <!--        <bundle 
originalUri="mvn:net.i2p.crypto/eddsa/[0.1.0,${eddsa.version}]"-->
 <!--            replacement="mvn:net.i2p.crypto/eddsa/${eddsa.version}" />-->
@@ -199,6 +201,7 @@
     </bundleReplacements>
 
     <blacklistedBundles>
+        
<bundle>mvn:org.bouncycastle/bcutil-jdk15on/[1.51,${bouncycastle.version})</bundle>
         
<bundle>mvn:org.bouncycastle/bcprov-jdk15on/[1.51,${bouncycastle.version})</bundle>
         
<bundle>mvn:org.bouncycastle/bcprov-ext-jdk15on/[1.51,${bouncycastle.version})</bundle>
         
<bundle>mvn:org.bouncycastle/bcpkix-jdk15on/[1.51,${bouncycastle.version})</bundle>