You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2022/06/22 13:01:39 UTC
[shardingsphere] branch master updated: Exclude unused dependency listenablefuture (#18514)
This is an automated email from the ASF dual-hosted git repository.
zhangliang 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 6be54413a64 Exclude unused dependency listenablefuture (#18514)
6be54413a64 is described below
commit 6be54413a649294dd57069adf42beb2039d568ed
Author: 吴伟杰 <wu...@apache.org>
AuthorDate: Wed Jun 22 21:01:32 2022 +0800
Exclude unused dependency listenablefuture (#18514)
* Exclude dependency listenablefuture from Guava
* Remove listenablefuture from LICENSE
---
pom.xml | 11 ++++-------
.../src/main/release-docs/LICENSE | 1 -
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/pom.xml b/pom.xml
index 1a75aacde69..8ae31ed87e7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,7 +60,6 @@
<shade.package>org.apache.shardingsphere.dependencies</shade.package>
<guava.version>30.0-jre</guava.version>
- <guava-listenablefuture.version>1.0</guava-listenablefuture.version>
<commons-lang3.version>3.8</commons-lang3.version>
<commons-collections4.version>4.4</commons-collections4.version>
<commons-codec.version>1.15</commons-codec.version>
@@ -168,6 +167,10 @@
<groupId>com.google.j2objc</groupId>
<artifactId>j2objc-annotations</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>listenablefuture</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -690,12 +693,6 @@
<artifactId>caffeine</artifactId>
<version>${caffeine.version}</version>
</dependency>
-
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>listenablefuture</artifactId>
- <version>${guava-listenablefuture.version}</version>
- </dependency>
</dependencies>
</dependencyManagement>
diff --git a/shardingsphere-distribution/shardingsphere-proxy-distribution/src/main/release-docs/LICENSE b/shardingsphere-distribution/shardingsphere-proxy-distribution/src/main/release-docs/LICENSE
index f52075946a2..20c9a26ab76 100644
--- a/shardingsphere-distribution/shardingsphere-proxy-distribution/src/main/release-docs/LICENSE
+++ b/shardingsphere-distribution/shardingsphere-proxy-distribution/src/main/release-docs/LICENSE
@@ -265,7 +265,6 @@ The text of each license is the standard Apache 2.0 license.
json-path 2.4.0: https://github.com/jayway/JsonPath, Apache 2.0
json-smart 2.3: https://www.minidev.net/, Apache 2.0
jsr305 3.0.2: http://findbugs.sourceforge.net/, Apache 2.0
- listenablefuture 1.0:https://github.com/google/guava, Apache 2.0
log4j 1.2.17: http://logging.apache.org/log4j/1.2/, Apache 2.0
memory 0.9.0, Apache 2.0
netty-buffer 4.1.73.Final: https://github.com/netty, Apache 2.0