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

jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git


The following commit(s) were added to refs/heads/main by this push:
     new f5f407bbcc Use quarkus-bom managed bcprov-jdk18on instead of 
bcprov-ext-jdk18on
f5f407bbcc is described below

commit f5f407bbcc10ca39c87492b0a20b67bf0b727b5a
Author: James Netherton <[email protected]>
AuthorDate: Mon Sep 16 09:25:38 2024 +0100

    Use quarkus-bom managed bcprov-jdk18on instead of bcprov-ext-jdk18on
    
    Fixes #6159
---
 extensions-jvm/pulsar/runtime/pom.xml                         | 2 +-
 pom.xml                                                       | 1 -
 poms/bom/pom.xml                                              | 6 ------
 poms/bom/src/main/generated/flattened-full-pom.xml            | 5 -----
 poms/bom/src/main/generated/flattened-reduced-pom.xml         | 5 -----
 poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 5 -----
 6 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/extensions-jvm/pulsar/runtime/pom.xml 
b/extensions-jvm/pulsar/runtime/pom.xml
index 4919278950..a5856170e6 100644
--- a/extensions-jvm/pulsar/runtime/pom.xml
+++ b/extensions-jvm/pulsar/runtime/pom.xml
@@ -55,7 +55,7 @@
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
-            <artifactId>bcprov-ext-jdk18on</artifactId>
+            <artifactId>bcprov-jdk18on</artifactId>
         </dependency>
         <dependency>
             <groupId>org.eclipse.angus</groupId>
diff --git a/pom.xml b/pom.xml
index b6374edfa1..19d46a818d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,7 +83,6 @@
         
<azure-core-http-vertx.version>1.0.0-beta.20</azure-core-http-vertx.version> 
<!-- TODO: https://github.com/apache/camel-quarkus/issues/4181 -->
         
<cassandra-driver-test.version>3.7.1</cassandra-driver-test.version><!-- Keep 
in sync with testcontainers instead of Debezium bom -->
         <bouncycastle.version>1.78.1</bouncycastle.version><!-- @sync 
io.quarkus:quarkus-bom:${quarkus.version} dep:org.bouncycastle:bcprov-jdk18on 
-->
-        <bcprov-ext-jdk18on.version>1.78</bcprov-ext-jdk18on.version><!-- 
TODO: Remove this. Required as there is no 1.78.1 version released -->
         <brotli.version>0.1.2</brotli.version><!-- @sync 
org.apache.httpcomponents.client5:httpclient5-parent:${httpclient5.version} 
prop:brotli.version -->
         <caffeine.version>3.1.5</caffeine.version><!-- @sync 
io.quarkus:quarkus-bom:${quarkus.version} 
dep:com.github.ben-manes.caffeine:caffeine -->
         
<commons-beanutils.version>${commons-beanutils-version}</commons-beanutils.version>
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index 8840ed0021..8b52955808 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -7205,12 +7205,6 @@
                 <artifactId>bcpg-jdk18on</artifactId>
                 <version>${bouncycastle.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.bouncycastle</groupId>
-                <artifactId>bcprov-ext-jdk18on</artifactId>
-                <!-- TODO: Revert back to bouncycastle.version when a release 
is available -->
-                <version>${bcprov-ext-jdk18on.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.bouncycastle</groupId>
                 <artifactId>bcutil-jdk18on</artifactId>
diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml 
b/poms/bom/src/main/generated/flattened-full-pom.xml
index d8433e77d6..e8c05b5c0b 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -7127,11 +7127,6 @@
         <artifactId>bcpg-jdk18on</artifactId><!-- 
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
         <version>1.78.1</version><!-- 
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
       </dependency>
-      <dependency>
-        <groupId>org.bouncycastle</groupId><!-- 
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
-        <artifactId>bcprov-ext-jdk18on</artifactId><!-- 
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
-        <version>1.78</version><!-- 
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
-      </dependency>
       <dependency>
         <groupId>org.bouncycastle</groupId><!-- 
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
         <artifactId>bcutil-jdk18on</artifactId><!-- 
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml 
b/poms/bom/src/main/generated/flattened-reduced-pom.xml
index d622b17fa1..d0ea8583e9 100644
--- a/poms/bom/src/main/generated/flattened-reduced-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml
@@ -7072,11 +7072,6 @@
         <artifactId>bcpg-jdk18on</artifactId>
         <version>1.78.1</version>
       </dependency>
-      <dependency>
-        <groupId>org.bouncycastle</groupId>
-        <artifactId>bcprov-ext-jdk18on</artifactId>
-        <version>1.78</version>
-      </dependency>
       <dependency>
         <groupId>org.bouncycastle</groupId>
         <artifactId>bcutil-jdk18on</artifactId>
diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml 
b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
index df5c157ba7..0849425ea3 100644
--- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
@@ -7072,11 +7072,6 @@
         <artifactId>bcpg-jdk18on</artifactId><!-- 
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
         <version>1.78.1</version><!-- 
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
       </dependency>
-      <dependency>
-        <groupId>org.bouncycastle</groupId><!-- 
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
-        <artifactId>bcprov-ext-jdk18on</artifactId><!-- 
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
-        <version>1.78</version><!-- 
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
-      </dependency>
       <dependency>
         <groupId>org.bouncycastle</groupId><!-- 
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
         <artifactId>bcutil-jdk18on</artifactId><!-- 
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->

Reply via email to