This is an automated email from the ASF dual-hosted git repository.
ljain pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ratis-thirdparty.git
The following commit(s) were added to refs/heads/master by this push:
new 01051ea RATIS-1037. Remove flatbuffers from thirdparty. (#6)
01051ea is described below
commit 01051ea89dafca900e48460522a21504185c56c3
Author: Tsz Wo Nicholas Sze <[email protected]>
AuthorDate: Fri Aug 14 15:29:31 2020 +0530
RATIS-1037. Remove flatbuffers from thirdparty. (#6)
---
misc/pom.xml | 14 --------------
misc/src/main/appended-resources/META-INF/NOTICE | 6 ------
pom.xml | 2 --
3 files changed, 22 deletions(-)
diff --git a/misc/pom.xml b/misc/pom.xml
index ef11adb..ae21606 100644
--- a/misc/pom.xml
+++ b/misc/pom.xml
@@ -40,16 +40,6 @@
<version>${shaded.grpc.version}</version>
</dependency>
<dependency>
- <groupId>com.google.flatbuffers</groupId>
- <artifactId>flatbuffers-java</artifactId>
- <version>${shaded.flatbuffers.version}</version>
- </dependency>
- <dependency>
- <groupId>com.google.flatbuffers</groupId>
- <artifactId>flatbuffers-java-grpc</artifactId>
- <version>${shaded.flatbuffers.version}</version>
- </dependency>
- <dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
<version>${shaded.grpc.version}</version>
@@ -149,10 +139,6 @@
<shadedPattern>${ratis.thirdparty.shaded.prefix}.io.grpc</shadedPattern>
</relocation>
<relocation>
- <pattern>com.google.flatbuffers</pattern>
-
<shadedPattern>${ratis.thirdparty.shaded.prefix}.com.google.flatbuffers</shadedPattern>
- </relocation>
- <relocation>
<pattern>io.netty</pattern>
<shadedPattern>${ratis.thirdparty.shaded.prefix}.io.netty</shadedPattern>
</relocation>
diff --git a/misc/src/main/appended-resources/META-INF/NOTICE
b/misc/src/main/appended-resources/META-INF/NOTICE
index 35a21e1..9cd2f8f 100644
--- a/misc/src/main/appended-resources/META-INF/NOTICE
+++ b/misc/src/main/appended-resources/META-INF/NOTICE
@@ -21,9 +21,3 @@ Copyright 2014 The Netty Project
This product bundles Gson which includes the following text:
Copyright 2008 Google Inc.
-
----
-
-This product bundles flatbuffers-java which includes the following text:
-
-Copyright 2014 Google Inc.
diff --git a/pom.xml b/pom.xml
index 8d8560b..dc53ae0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,8 +73,6 @@
<shaded.netty.version>4.1.48.Final</shaded.netty.version>
<!--Version of tcnative to be shaded -->
<shaded.netty.tcnative.version>2.0.28.Final</shaded.netty.tcnative.version>
- <!--Version of flatbuffers to be shaded -->
- <shaded.flatbuffers.version>1.11.0</shaded.flatbuffers.version>
<io.opencensus.version>0.21.0</io.opencensus.version>
<ratis.thirdparty.shaded.prefix>org.apache.ratis.thirdparty</ratis.thirdparty.shaded.prefix>
