Repository: incubator-ratis Updated Branches: refs/heads/master fac475dbb -> abc1538fb
Revert "RATIS-168. Update Grpc and netty versions in Ratis. Contributed by Mukul Kumar Singh" This reverts commit fac475dbb2b70efbde9b0ec0be60231e2e17bfe6. Project: http://git-wip-us.apache.org/repos/asf/incubator-ratis/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ratis/commit/abc1538f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ratis/tree/abc1538f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ratis/diff/abc1538f Branch: refs/heads/master Commit: abc1538fb0ba6ae9d761ea7189d9ba9b723444d4 Parents: fac475d Author: Tsz-Wo Nicholas Sze <[email protected]> Authored: Thu Dec 28 19:04:22 2017 +0800 Committer: Tsz-Wo Nicholas Sze <[email protected]> Committed: Thu Dec 28 19:04:22 2017 +0800 ---------------------------------------------------------------------- BUILDING.md | 8 ----- pom.xml | 2 +- ratis-proto-shaded/pom.xml | 72 ++--------------------------------------- 3 files changed, 4 insertions(+), 78 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/abc1538f/BUILDING.md ---------------------------------------------------------------------- diff --git a/BUILDING.md b/BUILDING.md index a3af7bc..3017be5 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -62,16 +62,8 @@ $ mvn clean -DskipCleanShade | `com.google.common` | `org.apache.ratis.shaded.com.google.common` | | `com.google.protobuf` | `org.apache.ratis.shaded.com.google.protobuf` | | `com.google.thirdparty.publicsuffix`| `org.apache.ratis.shaded.com.google.thirdparty.publicsuffix` | -| `com.google.instrumentation` | `org.apache.ratis.shaded.com.google.instrumentation` | -| `com.google.rpc` | `org.apache.ratis.shaded.com.google.rpc` | -| `com.google.api` | `org.apache.ratis.shaded.com.google.api` | -| `com.google.type` | `org.apache.ratis.shaded.com.google.type` | -| `com.google.cloud.audit` | `org.apache.ratis.shaded.com.google.cloud.audit` | -| `com.google.longrunning` | `org.apache.ratis.shaded.com.google.longrunning` | -| `com.google.logging.type` | `org.apache.ratis.shaded.com.google.logging.type` | | `io.grpc` | `org.apache.ratis.shaded.io.grpc` | | `io.netty` | `org.apache.ratis.shaded.io.netty` | -| `io.opencensus` | `org.apache.ratis.shaded.io.opencensus` | | `org.apache.hadoop.ipc.protobuf` | `org.apache.ratis.shaded.org.apache.hadoop.ipc.protobuf` | The protos defined in this project are stored in the `org.apache.ratis.shaded.proto` package. http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/abc1538f/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 94e23e6..6642988 100644 --- a/pom.xml +++ b/pom.xml @@ -333,7 +333,7 @@ <dependency> <groupId>org.jctools</groupId> <artifactId>jctools-core</artifactId> - <version>2.1.1</version> + <version>1.2.1</version> </dependency> </dependencies> </dependencyManagement> http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/abc1538f/ratis-proto-shaded/pom.xml ---------------------------------------------------------------------- diff --git a/ratis-proto-shaded/pom.xml b/ratis-proto-shaded/pom.xml index 51e6f48..421197b 100644 --- a/ratis-proto-shaded/pom.xml +++ b/ratis-proto-shaded/pom.xml @@ -31,10 +31,10 @@ <shaded.sources.dir>src/main/java</shaded.sources.dir> <!--Version of grpc to be shaded --> - <shaded.grpc.version>1.7.1</shaded.grpc.version> + <shaded.grpc.version>1.0.1</shaded.grpc.version> <!--Version of Netty to be shaded --> - <shaded.netty.version>4.1.16.Final</shaded.netty.version> - <tcnative.version>2.0.6.Final</tcnative.version> + <shaded.netty.version>4.1.3.Final</shaded.netty.version> + <tcnative.version>1.1.33.Fork19</tcnative.version> </properties> <build> @@ -402,34 +402,6 @@ <artifactId>jctools-core</artifactId> <optional>true</optional> </dependency> - - <dependency> - <groupId>com.google.auto.value</groupId> - <artifactId>auto-value</artifactId> - <version>1.5</version> - <optional>true</optional> - </dependency> - - <dependency> - <groupId>com.google.auto</groupId> - <artifactId>auto-common</artifactId> - <version>0.8</version> - <optional>true</optional> - </dependency> - - <dependency> - <groupId>com.google.auto.service</groupId> - <artifactId>auto-service</artifactId> - <version>1.0-rc2</version> - <optional>true</optional> - </dependency> - - <dependency> - <groupId>com.fasterxml</groupId> - <artifactId>aalto-xml</artifactId> - <version>1.0.0</version> - <optional>true</optional> - </dependency> </dependencies> <profiles> @@ -599,34 +571,6 @@ <shadedPattern>org.apache.ratis.shaded.com.google.protobuf</shadedPattern> </relocation> <relocation> - <pattern>com.google.instrumentation</pattern> - <shadedPattern>org.apache.ratis.shaded.com.google.instrumentation</shadedPattern> - </relocation> - <relocation> - <pattern>com.google.rpc</pattern> - <shadedPattern>org.apache.ratis.shaded.com.google.rpc</shadedPattern> - </relocation> - <relocation> - <pattern>com.google.api</pattern> - <shadedPattern>org.apache.ratis.shaded.com.google.api</shadedPattern> - </relocation> - <relocation> - <pattern>com.google.type</pattern> - <shadedPattern>org.apache.ratis.shaded.com.google.type</shadedPattern> - </relocation> - <relocation> - <pattern>com.google.cloud.audit</pattern> - <shadedPattern>org.apache.ratis.shaded.com.google.cloud.audit</shadedPattern> - </relocation> - <relocation> - <pattern>com.google.longrunning</pattern> - <shadedPattern>org.apache.ratis.shaded.com.google.longrunning</shadedPattern> - </relocation> - <relocation> - <pattern>com.google.logging.type</pattern> - <shadedPattern>org.apache.ratis.shaded.com.google.logging.type</shadedPattern> - </relocation> - <relocation> <pattern>io.grpc</pattern> <shadedPattern>org.apache.ratis.shaded.io.grpc</shadedPattern> </relocation> @@ -634,10 +578,6 @@ <pattern>io.netty</pattern> <shadedPattern>org.apache.ratis.shaded.io.netty</shadedPattern> </relocation> - <relocation> - <pattern>io.opencensus</pattern> - <shadedPattern>org.apache.ratis.shaded.io.opencensus</shadedPattern> - </relocation> </relocations> <filters> @@ -688,12 +628,6 @@ <exclude>io.netty:netty-transport-sctp</exclude> <exclude>io.netty:netty-transport-udt</exclude> <exclude>io.netty:netty-transport</exclude> - <exclude>com.google.auto.value:auto-value</exclude> - <exclude>com.google.auto:auto-common</exclude> - <exclude>com.google.auto.service:auto-service</exclude> - <exclude>org.conscrypt:conscrypt-openjdk-uber</exclude> - <exclude>com.fasterxml:aalto-xml</exclude> - <exclude>org.codehaus.woodstox:stax2-api</exclude> <exclude>log4j:log4j</exclude> <exclude>net.jpountz.lz4:lz4</exclude>
