You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by su...@apache.org on 2023/10/21 13:41:24 UTC
[shardingsphere] branch master updated: Refactor dependency of bouncycastle (#28830)
This is an automated email from the ASF dual-hosted git repository.
sunnianjun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 6870af7fafe Refactor dependency of bouncycastle (#28830)
6870af7fafe is described below
commit 6870af7fafecf366759176c8e753edfa5e2ce284
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sat Oct 21 21:41:18 2023 +0800
Refactor dependency of bouncycastle (#28830)
* Refactor dependency of bouncycastle
* Add j2objc-annotations license
---
.../proxy-native/src/main/release-docs/LICENSE | 1 +
distribution/proxy/src/main/release-docs/LICENSE | 1 +
pom.xml | 32 ++++++++++++++--------
proxy/frontend/core/pom.xml | 2 --
4 files changed, 23 insertions(+), 13 deletions(-)
diff --git a/distribution/proxy-native/src/main/release-docs/LICENSE b/distribution/proxy-native/src/main/release-docs/LICENSE
index c5fa7f3dde2..9cfaafa9c9b 100644
--- a/distribution/proxy-native/src/main/release-docs/LICENSE
+++ b/distribution/proxy-native/src/main/release-docs/LICENSE
@@ -257,6 +257,7 @@ The text of each license is the standard Apache 2.0 license.
httpclient5 5.1.3: https://hc.apache.org/httpcomponents-client-5.1.x, Apache 2.0
httpcore5-h2 5.1.3: https://hc.apache.org/httpcomponents-core-5.1.x, Apache 2.0
httpcore5 5.1.3: https://hc.apache.org/httpcomponents-core-5.1.x, Apache 2.0
+ j2objc-annotations 1.3 https://github.com/google/j2objc/, Apache 2.0
jackson-annotations 2.14.0: http://github.com/FasterXML/jackson, Apache 2.0
jackson-core 2.14.0: http://github.com/FasterXML/jackson, Apache 2.0
jackson-databind 2.14.0: http://github.com/FasterXML/jackson, Apache 2.0
diff --git a/distribution/proxy/src/main/release-docs/LICENSE b/distribution/proxy/src/main/release-docs/LICENSE
index c5fa7f3dde2..9cfaafa9c9b 100644
--- a/distribution/proxy/src/main/release-docs/LICENSE
+++ b/distribution/proxy/src/main/release-docs/LICENSE
@@ -257,6 +257,7 @@ The text of each license is the standard Apache 2.0 license.
httpclient5 5.1.3: https://hc.apache.org/httpcomponents-client-5.1.x, Apache 2.0
httpcore5-h2 5.1.3: https://hc.apache.org/httpcomponents-core-5.1.x, Apache 2.0
httpcore5 5.1.3: https://hc.apache.org/httpcomponents-core-5.1.x, Apache 2.0
+ j2objc-annotations 1.3 https://github.com/google/j2objc/, Apache 2.0
jackson-annotations 2.14.0: http://github.com/FasterXML/jackson, Apache 2.0
jackson-core 2.14.0: http://github.com/FasterXML/jackson, Apache 2.0
jackson-databind 2.14.0: http://github.com/FasterXML/jackson, Apache 2.0
diff --git a/pom.xml b/pom.xml
index d5dab7208a7..e7f5a3bb1cb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,6 +66,7 @@
<guava.version>32.1.2-jre</guava.version>
<checker-qual.version>3.39.0</checker-qual.version>
<error_prone_annotations.version>2.22.0</error_prone_annotations.version>
+ <j2objc-annotations.version>1.3</j2objc-annotations.version>
<commons-lang3.version>3.12.0</commons-lang3.version>
<commons-collections4.version>4.4</commons-collections4.version>
<commons-codec.version>1.16.0</commons-codec.version>
@@ -87,11 +88,12 @@
<calcite.version>1.35.0</calcite.version>
<immutables.version>2.9.3</immutables.version>
- <bouncycastle.version>1.70</bouncycastle.version>
<javax.transaction.version>1.1</javax.transaction.version>
<netty.version>4.1.99.Final</netty.version>
+ <bouncycastle.version>1.70</bouncycastle.version>
+
<zookeeper.version>3.9.0</zookeeper.version>
<curator.version>5.5.0</curator.version>
<jetcd.version>0.7.6</jetcd.version>
@@ -176,10 +178,6 @@
<groupId>com.google.guava</groupId>
<artifactId>listenablefuture</artifactId>
</exclusion>
- <exclusion>
- <groupId>com.google.j2objc</groupId>
- <artifactId>j2objc-annotations</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -192,6 +190,11 @@
<artifactId>error_prone_annotations</artifactId>
<version>${error_prone_annotations.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.google.j2objc</groupId>
+ <artifactId>j2objc-annotations</artifactId>
+ <version>${j2objc-annotations.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
@@ -289,6 +292,7 @@
<version>${immutables.version}</version>
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>javax.transaction</groupId>
<artifactId>jta</artifactId>
@@ -302,6 +306,18 @@
<type>pom</type>
<scope>import</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcpkix-jdk15on</artifactId>
+ <version>${bouncycastle.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bctls-jdk15on</artifactId>
+ <version>${bouncycastle.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
@@ -356,12 +372,6 @@
<version>${protobuf.version}</version>
<type>pom</type>
<scope>import</scope>
- <exclusions>
- <exclusion>
- <groupId>com.google.j2objc</groupId>
- <artifactId>j2objc-annotations</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
diff --git a/proxy/frontend/core/pom.xml b/proxy/frontend/core/pom.xml
index 48af12fd00c..6fb9aaf4115 100644
--- a/proxy/frontend/core/pom.xml
+++ b/proxy/frontend/core/pom.xml
@@ -99,12 +99,10 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId>
- <version>${bouncycastle.version}</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bctls-jdk15on</artifactId>
- <version>${bouncycastle.version}</version>
</dependency>
</dependencies>
</project>