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

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

commit 76137c8c817f510e04ad99292ba346ca8f73ccc6
Author: James Netherton <jamesnether...@gmail.com>
AuthorDate: Mon Jun 21 14:18:02 2021 +0100

    Add temporary workaround for bouncycastle bcpg-jdk15on version misalignment
---
 pom.xml          | 2 ++
 poms/bom/pom.xml | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/pom.xml b/pom.xml
index 9c072a1..3f6b85b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,6 +61,8 @@
         <avro.version>1.10.2</avro.version><!-- @sync 
io.quarkus:quarkus-bom:${quarkus.version} dep:org.apache.avro:avro -->
         <aws-java-sdk.version>1.11.714</aws-java-sdk.version>
         <azure-sdk-bom.version>1.0.3</azure-sdk-bom.version><!-- Revert back 
to ${azure-sdk-bom-version} with Camel 3.11 see 
https://github.com/apache/camel/pull/5642 -->
+        <!-- TODO: Remove this for Quarkus 2.0.0.Final. In CR3 bouncycastle is 
not in sync between Quarkus & Camel -->
+        <bouncycastle.version>1.68</bouncycastle.version>
         
<commons-beanutils.version>${commons-beanutils-version}</commons-beanutils.version>
         <commons-cli.version>1.4</commons-cli.version><!-- keep in sync with 
Quarkus, via quarkus-bootstrap-core -->
         <commons-collections.version>3.2.2</commons-collections.version><!-- 
used by hbase, should be pretty stable as commons-collections are not developed 
actively anymore -->
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index 875c0d7..4c24a51 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -5952,6 +5952,11 @@
                 <version>${ahc.version}</version>
             </dependency>
             <dependency>
+                <groupId>org.bouncycastle</groupId>
+                <artifactId>bcpg-jdk15on</artifactId>
+                <version>${bouncycastle.version}</version>
+            </dependency>
+            <dependency>
                 <groupId>org.codehaus.groovy</groupId>
                 <artifactId>groovy</artifactId>
                 <version>${groovy.version}</version>

Reply via email to