You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2022/06/22 11:21:29 UTC

[camel] branch main updated: CAMEL-18122: Upgrade to bouncycastle 1.71 (#7848)

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

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


The following commit(s) were added to refs/heads/main by this push:
     new 246ec80ef13 CAMEL-18122: Upgrade to bouncycastle 1.71 (#7848)
246ec80ef13 is described below

commit 246ec80ef1367dd4d00df7af65964e94a7ef5d34
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Jun 22 13:21:23 2022 +0200

    CAMEL-18122: Upgrade to bouncycastle 1.71 (#7848)
    
    CAMEL-18122: Upgrade to bouncycastle 1.71
---
 camel-dependencies/pom.xml                               |  2 +-
 components/camel-as2/camel-as2-api/pom.xml               |  8 ++++----
 components/camel-asn1/pom.xml                            |  2 +-
 components/camel-asn1/src/main/docs/asn1-dataformat.adoc |  4 ++--
 components/camel-crypto/pom.xml                          |  4 ++--
 components/camel-fop/pom.xml                             |  4 ++--
 components/camel-ftp/pom.xml                             |  4 ++--
 components/camel-jsch/pom.xml                            |  4 ++--
 components/camel-pdf/pom.xml                             |  4 ++--
 components/camel-ssh/pom.xml                             |  4 ++--
 components/camel-ssh/src/main/docs/ssh-component.adoc    | 10 +++++-----
 components/camel-xmlsecurity/pom.xml                     |  2 +-
 parent/pom.xml                                           |  2 +-
 13 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 4045cd63636..00fe191ffb5 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -77,7 +77,7 @@
     <azure-storage-blob-version>12.16.1</azure-storage-blob-version>
     <azure-storage-datalake-version>12.9.1</azure-storage-datalake-version>
     <azure-storage-queue-version>12.12.2</azure-storage-queue-version>
-    <bouncycastle-version>1.70</bouncycastle-version>
+    <bouncycastle-version>1.71</bouncycastle-version>
     <box-java-sdk-version>2.58.0</box-java-sdk-version>
     <braintree-gateway-version>3.16.1</braintree-gateway-version>
     <brave-zipkin-version>5.13.3</brave-zipkin-version>
diff --git a/components/camel-as2/camel-as2-api/pom.xml b/components/camel-as2/camel-as2-api/pom.xml
index 2729e1356a5..246f1867982 100644
--- a/components/camel-as2/camel-as2-api/pom.xml
+++ b/components/camel-as2/camel-as2-api/pom.xml
@@ -45,22 +45,22 @@
 
         <dependency>
             <groupId>org.bouncycastle</groupId>
-            <artifactId>bcprov-debug-jdk15on</artifactId>
+            <artifactId>bcprov-debug-jdk18on</artifactId>
             <version>${bouncycastle-version}</version>
         </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>bcutil-jdk15on</artifactId>
+            <artifactId>bcutil-jdk18on</artifactId>
             <version>${bouncycastle-version}</version>
         </dependency>
 
diff --git a/components/camel-asn1/pom.xml b/components/camel-asn1/pom.xml
index 7c8189a20d9..4cf13d1174d 100644
--- a/components/camel-asn1/pom.xml
+++ b/components/camel-asn1/pom.xml
@@ -41,7 +41,7 @@
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
-            <artifactId>bcprov-jdk15on</artifactId>
+            <artifactId>bcprov-jdk18on</artifactId>
             <version>${bouncycastle-version}</version>
         </dependency>
         <dependency>
diff --git a/components/camel-asn1/src/main/docs/asn1-dataformat.adoc b/components/camel-asn1/src/main/docs/asn1-dataformat.adoc
index b51064c3497..43ca4149a52 100644
--- a/components/camel-asn1/src/main/docs/asn1-dataformat.adoc
+++ b/components/camel-asn1/src/main/docs/asn1-dataformat.adoc
@@ -10,7 +10,7 @@
 
 *Since Camel {since}*
 
-The ASN.1 Data Format Data Format [Intoduction to ASN.1](https://www.itu.int/en/ITU-T/asn1/Pages/introduction.aspx) is a Camel Frameworks's data format implementation based on Bouncy Castle's bcprov-jdk15on library and jASN.1's java compiler for the formal notation used for describing data transmitted by telecommunications protocols, regardless of language implementation and physical representation of these data, whatever the application, whether complex or very simple. Messages can be u [...]
+The ASN.1 Data Format Data Format [Intoduction to ASN.1](https://www.itu.int/en/ITU-T/asn1/Pages/introduction.aspx) is a Camel Frameworks's data format implementation based on Bouncy Castle's bcprov-jdk18on library and jASN.1's java compiler for the formal notation used for describing data transmitted by telecommunications protocols, regardless of language implementation and physical representation of these data, whatever the application, whether complex or very simple. Messages can be u [...]
 
 == ASN.1 Data Format Options
 
@@ -29,7 +29,7 @@ In this first example we unmarshal BER file payload to OutputStream and send it
 from("direct:unmarshal").unmarshal(asn1).to("mock:unmarshal");
 -----------------------------------------------------------------------
 
-In the second example we unmarshal BER file payload to byte array using Split EIP. The reason for applying Split EIP is that usually each BER file or (ASN.1 structured file) contains multiple records to process and Split EIP helps us to get each record in a file as byte arrays which is actually ASN1Primitive's instance (by the use of Bouncy Castle's ASN.1 support in bcprov-jdk15on library)
+In the second example we unmarshal BER file payload to byte array using Split EIP. The reason for applying Split EIP is that usually each BER file or (ASN.1 structured file) contains multiple records to process and Split EIP helps us to get each record in a file as byte arrays which is actually ASN1Primitive's instance (by the use of Bouncy Castle's ASN.1 support in bcprov-jdk18on library)
 Byte arrays then may be converted to ASN1Primitive by the help of public static method in (ASN1Primitive.fromByteArray)
 In such example, note that you need to set `usingIterator=true`
 
diff --git a/components/camel-crypto/pom.xml b/components/camel-crypto/pom.xml
index 5bf00b0a740..c1c6cb25ae7 100644
--- a/components/camel-crypto/pom.xml
+++ b/components/camel-crypto/pom.xml
@@ -42,12 +42,12 @@
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
-            <artifactId>bcpg-jdk15on</artifactId>
+            <artifactId>bcpg-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>
 
diff --git a/components/camel-fop/pom.xml b/components/camel-fop/pom.xml
index a15eb6fccbb..ccbf914c15e 100644
--- a/components/camel-fop/pom.xml
+++ b/components/camel-fop/pom.xml
@@ -70,13 +70,13 @@
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
-            <artifactId>bcprov-jdk15on</artifactId>
+            <artifactId>bcprov-jdk18on</artifactId>
             <version>${bouncycastle-version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
-            <artifactId>bcmail-jdk15on</artifactId>
+            <artifactId>bcmail-jdk18on</artifactId>
             <version>${bouncycastle-version}</version>
             <scope>test</scope>
         </dependency>
diff --git a/components/camel-ftp/pom.xml b/components/camel-ftp/pom.xml
index 2599fff83d7..0c3b62a0209 100644
--- a/components/camel-ftp/pom.xml
+++ b/components/camel-ftp/pom.xml
@@ -163,13 +163,13 @@
         <!-- needed for sftp server -->
         <dependency>
             <groupId>org.bouncycastle</groupId>
-            <artifactId>bcpg-jdk15on</artifactId>
+            <artifactId>bcpg-jdk18on</artifactId>
             <version>${bouncycastle-version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
-            <artifactId>bcpkix-jdk15on</artifactId>
+            <artifactId>bcpkix-jdk18on</artifactId>
             <version>${bouncycastle-version}</version>
             <scope>test</scope>
         </dependency>
diff --git a/components/camel-jsch/pom.xml b/components/camel-jsch/pom.xml
index 8494c2c39af..315c7fc6670 100644
--- a/components/camel-jsch/pom.xml
+++ b/components/camel-jsch/pom.xml
@@ -83,13 +83,13 @@
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
-            <artifactId>bcprov-jdk15on</artifactId>
+            <artifactId>bcprov-jdk18on</artifactId>
             <version>${bouncycastle-version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
-            <artifactId>bcpkix-jdk15on</artifactId>
+            <artifactId>bcpkix-jdk18on</artifactId>
             <version>${bouncycastle-version}</version>
             <scope>test</scope>
         </dependency>
diff --git a/components/camel-pdf/pom.xml b/components/camel-pdf/pom.xml
index 906db6916e0..4491690ccf7 100644
--- a/components/camel-pdf/pom.xml
+++ b/components/camel-pdf/pom.xml
@@ -55,12 +55,12 @@
         <!-- Encryption libraries required for PDFBox -->
         <dependency>
             <groupId>org.bouncycastle</groupId>
-            <artifactId>bcprov-jdk15on</artifactId>
+            <artifactId>bcprov-jdk18on</artifactId>
             <version>${bouncycastle-version}</version>
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
-            <artifactId>bcmail-jdk15on</artifactId>
+            <artifactId>bcmail-jdk18on</artifactId>
             <version>${bouncycastle-version}</version>
         </dependency>
         <dependency>
diff --git a/components/camel-ssh/pom.xml b/components/camel-ssh/pom.xml
index 71f6610c3b6..498db71d6d6 100644
--- a/components/camel-ssh/pom.xml
+++ b/components/camel-ssh/pom.xml
@@ -47,12 +47,12 @@
 
         <dependency>
             <groupId>org.bouncycastle</groupId>
-            <artifactId>bcpg-jdk15on</artifactId>
+            <artifactId>bcpg-jdk18on</artifactId>
             <version>${bouncycastle-version}</version>
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
-            <artifactId>bcpkix-jdk15on</artifactId>
+            <artifactId>bcpkix-jdk18on</artifactId>
             <version>${bouncycastle-version}</version>
         </dependency>
         <dependency>
diff --git a/components/camel-ssh/src/main/docs/ssh-component.adoc b/components/camel-ssh/src/main/docs/ssh-component.adoc
index 8ca8a42f507..17e15cfd07c 100644
--- a/components/camel-ssh/src/main/docs/ssh-component.adoc
+++ b/components/camel-ssh/src/main/docs/ssh-component.adoc
@@ -132,17 +132,17 @@ The component uses `sshd-core` library which is based on either `bouncycastle` o
 <dependency>
   <groupId>org.apache.sshd</groupId>
   <artifactId>sshd-core</artifactId>
-  <version>2.0.0</version>
+  <version>2.8.0</version>
 </dependency>
 <dependency>
   <groupId>org.bouncycastle</groupId>
-  <artifactId>bcpg-jdk15on</artifactId>
-  <version>1.65</version>
+  <artifactId>bcpg-jdk18on</artifactId>
+  <version>1.71</version>
 </dependency>
 <dependency>
   <groupId>org.bouncycastle</groupId>
-  <artifactId>bcpkix-jdk15on</artifactId>
-  <version>1.65</version>
+  <artifactId>bcpkix-jdk18on</artifactId>
+  <version>1.71</version>
 </dependency>
 -----------------------------------------
 
diff --git a/components/camel-xmlsecurity/pom.xml b/components/camel-xmlsecurity/pom.xml
index 27442f36f5e..1d6959157ea 100644
--- a/components/camel-xmlsecurity/pom.xml
+++ b/components/camel-xmlsecurity/pom.xml
@@ -101,7 +101,7 @@
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
-            <artifactId>bcprov-jdk15on</artifactId>
+            <artifactId>bcprov-jdk18on</artifactId>
             <version>${bouncycastle-version}</version>
             <scope>test</scope>
         </dependency>
diff --git a/parent/pom.xml b/parent/pom.xml
index a5d7743d476..64f646c3d65 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -94,7 +94,7 @@
         <azure-storage-blob-changefeed-version>12.0.0-beta.17</azure-storage-blob-changefeed-version>
         <azure-storage-datalake-version>12.9.1</azure-storage-datalake-version>
         <azure-storage-queue-version>12.12.2</azure-storage-queue-version>
-        <bouncycastle-version>1.70</bouncycastle-version>
+        <bouncycastle-version>1.71</bouncycastle-version>
         <box-java-sdk-version>2.58.0</box-java-sdk-version>
         <braintree-gateway-version>3.16.1</braintree-gateway-version>
         <brave-zipkin-version>5.13.3</brave-zipkin-version>