This is an automated email from the ASF dual-hosted git repository.
kirs pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new 42760416987 [Chore](dependencies)bcprov-jdkon15 migration to
bcprov-jdkon18 (#34344)
42760416987 is described below
commit 42760416987172f6a2e712347d7c1134c5f4f3bb
Author: Calvin Kirs <[email protected]>
AuthorDate: Tue Apr 30 16:37:22 2024 +0800
[Chore](dependencies)bcprov-jdkon15 migration to bcprov-jdkon18 (#34344)
The bcprov-jdk15on library is primarily used for providing encryption and
decryption algorithms. The vesoft-client and metastore-client-hive3 modules,
which are dependencies of the FE module, both rely on bcprov-jdk15on to write
keys and other objects to files. Additionally, the arrow-flight-jdbc module in
version 2.1 also depends on this package.
Migration to bcprov-jdkon18
Since bcprov-jdk15on is no longer being maintained and bcprov-jdkon18 is
fully compatible with it, we can replace bcprov-jdk15on with bcprov-jdkon18.
This will ensure continued support and security for our applications.
---
fe/be-java-extensions/java-common/pom.xml | 5 +++++
fe/fe-core/pom.xml | 19 +++++--------------
fe/pom.xml | 31 +++++++++++++++++++++++++++++++
3 files changed, 41 insertions(+), 14 deletions(-)
diff --git a/fe/be-java-extensions/java-common/pom.xml
b/fe/be-java-extensions/java-common/pom.xml
index 20ed0104fa5..91229c0f416 100644
--- a/fe/be-java-extensions/java-common/pom.xml
+++ b/fe/be-java-extensions/java-common/pom.xml
@@ -38,6 +38,11 @@ under the License.
<groupId>com.vesoft</groupId>
<artifactId>client</artifactId>
</dependency>
+ <!--vesoft client need bcprov-jdk18on-->
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcpkix-jdk18on</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.doris</groupId>
<artifactId>fe-common</artifactId>
diff --git a/fe/fe-core/pom.xml b/fe/fe-core/pom.xml
index 65d52ffbabf..baa8976de27 100644
--- a/fe/fe-core/pom.xml
+++ b/fe/fe-core/pom.xml
@@ -667,20 +667,11 @@ under the License.
<dependency>
<groupId>com.aliyun.datalake</groupId>
<artifactId>metastore-client-hive3</artifactId>
- <exclusions>
- <exclusion>
- <groupId>com.aliyun</groupId>
- <artifactId>tea</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.aliyun</groupId>
- <artifactId>tea-openapi</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.aliyun</groupId>
- <artifactId>tea-util</artifactId>
- </exclusion>
- </exclusions>
+ </dependency>
+ <!--metastore-client need bouncycastle-->
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcpkix-jdk18on</artifactId>
</dependency>
<!-- for fe recognize files stored on gcs -->
diff --git a/fe/pom.xml b/fe/pom.xml
index cd4cfdd11f0..3511557737a 100644
--- a/fe/pom.xml
+++ b/fe/pom.xml
@@ -353,6 +353,8 @@ under the License.
<arrow.vector.classifier>shade-format-flatbuffers</arrow.vector.classifier>
<flatbuffers.version>1.12.0</flatbuffers.version>
<jacoco.version>0.8.10</jacoco.version>
+ <!--bcpix jdk18-->
+ <bcpkix-jdk18.version>1.78.1</bcpkix-jdk18.version>
</properties>
<profiles>
<profile>
@@ -1685,10 +1687,33 @@ under the License.
<artifactId>mariadb-java-client</artifactId>
<version>${mariadb-java-client.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcpkix-jdk18on</artifactId>
+ <version>${bcpkix-jdk18.version}</version>
+ </dependency>
<dependency>
<groupId>com.aliyun.datalake</groupId>
<artifactId>metastore-client-hive3</artifactId>
<version>${dlf-metastore-client-hive.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcpkix-jdk15on</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.aliyun</groupId>
+ <artifactId>tea</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.aliyun</groupId>
+ <artifactId>tea-openapi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.aliyun</groupId>
+ <artifactId>tea-util</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.hive</groupId>
@@ -1763,6 +1788,12 @@ under the License.
<groupId>com.vesoft</groupId>
<artifactId>client</artifactId>
<version>${vesoft.client.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcpkix-jdk15on</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
</dependencyManagement>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
