Repository: incubator-ratis Updated Branches: refs/heads/master d87875e5c -> 05fb38bf1
RATIS-168. Update Grpc and netty versions in Ratis. Contributed by Mukul Kumar Singh Project: http://git-wip-us.apache.org/repos/asf/incubator-ratis/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ratis/commit/05fb38bf Tree: http://git-wip-us.apache.org/repos/asf/incubator-ratis/tree/05fb38bf Diff: http://git-wip-us.apache.org/repos/asf/incubator-ratis/diff/05fb38bf Branch: refs/heads/master Commit: 05fb38bf1e169e30a59c511682159964b47ec8c6 Parents: d87875e Author: Tsz-Wo Nicholas Sze <[email protected]> Authored: Sun Apr 1 03:46:42 2018 +0800 Committer: Tsz-Wo Nicholas Sze <[email protected]> Committed: Sun Apr 1 03:46:42 2018 +0800 ---------------------------------------------------------------------- pom.xml | 7 ++- ratis-grpc/pom.xml | 11 ++++ ratis-hadoop-shaded/pom.xml | 10 +--- ratis-hadoop/pom.xml | 8 ++- ratis-proto-shaded/pom.xml | 120 +++++++++++++++++++++++++++++++-------- 5 files changed, 121 insertions(+), 35 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/05fb38bf/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 6642988..4aa3ec9 100644 --- a/pom.xml +++ b/pom.xml @@ -174,7 +174,10 @@ <maven.min.version>3.3.9</maven.min.version> <!--Version of protobuf to be shaded --> - <shaded.protobuf.version>3.1.0</shaded.protobuf.version> + <shaded.protobuf.version>3.5.0</shaded.protobuf.version> + <shaded.protobuf-javanano.version>3.1.0</shaded.protobuf-javanano.version> + + <io.opencensus.version>0.12.2</io.opencensus.version> <!-- Test properties --> <maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile> @@ -333,7 +336,7 @@ <dependency> <groupId>org.jctools</groupId> <artifactId>jctools-core</artifactId> - <version>1.2.1</version> + <version>2.1.2</version> </dependency> </dependencies> </dependencyManagement> http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/05fb38bf/ratis-grpc/pom.xml ---------------------------------------------------------------------- diff --git a/ratis-grpc/pom.xml b/ratis-grpc/pom.xml index 96f3fba..a3c3cc1 100644 --- a/ratis-grpc/pom.xml +++ b/ratis-grpc/pom.xml @@ -84,5 +84,16 @@ <groupId>org.jctools</groupId> <artifactId>jctools-core</artifactId> </dependency> + + <dependency> + <groupId>io.opencensus</groupId> + <artifactId>opencensus-api</artifactId> + <version>${io.opencensus.version}</version> + </dependency> + <dependency> + <groupId>io.opencensus</groupId> + <artifactId>opencensus-contrib-grpc-metrics</artifactId> + <version>${io.opencensus.version}</version> + </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/05fb38bf/ratis-hadoop-shaded/pom.xml ---------------------------------------------------------------------- diff --git a/ratis-hadoop-shaded/pom.xml b/ratis-hadoop-shaded/pom.xml index 7fca43e..bfaad9c 100644 --- a/ratis-hadoop-shaded/pom.xml +++ b/ratis-hadoop-shaded/pom.xml @@ -95,7 +95,7 @@ <dependency> <groupId>com.google.protobuf.nano</groupId> <artifactId>protobuf-javanano</artifactId> - <version>${shaded.protobuf.version}</version> + <version>${shaded.protobuf-javanano.version}</version> <optional>true</optional> </dependency> @@ -285,6 +285,7 @@ <exclude>org.apache.kerby:kerby-util</exclude> <exclude>org.apache.zookeeper:zookeeper</exclude> + <exclude>org.checkerframework:checker-compat-qual</exclude> <exclude>org.codehaus.jackson:jackson-core-asl</exclude> <exclude>org.codehaus.jackson:jackson-jaxrs</exclude> <exclude>org.codehaus.jackson:jackson-mapper-asl</exclude> @@ -333,13 +334,6 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-install-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - </plugin> </plugins> </build> </profile> http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/05fb38bf/ratis-hadoop/pom.xml ---------------------------------------------------------------------- diff --git a/ratis-hadoop/pom.xml b/ratis-hadoop/pom.xml index 7738f75..19a747f 100644 --- a/ratis-hadoop/pom.xml +++ b/ratis-hadoop/pom.xml @@ -90,6 +90,12 @@ <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> <version>${hadoop.version}</version> - </dependency> + </dependency> + + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>11.0.2</version> + </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/05fb38bf/ratis-proto-shaded/pom.xml ---------------------------------------------------------------------- diff --git a/ratis-proto-shaded/pom.xml b/ratis-proto-shaded/pom.xml index 46649bc..032e0fa 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.0.1</shaded.grpc.version> + <shaded.grpc.version>1.10.0</shaded.grpc.version> <!--Version of Netty to be shaded --> - <shaded.netty.version>4.1.3.Final</shaded.netty.version> - <tcnative.version>1.1.33.Fork19</tcnative.version> + <shaded.netty.version>4.1.17.Final</shaded.netty.version> + <netty-tcnative.version>2.0.8.Final</netty-tcnative.version> </properties> <build> @@ -112,7 +112,7 @@ <dependency> <groupId>com.google.protobuf.nano</groupId> <artifactId>protobuf-javanano</artifactId> - <version>${shaded.protobuf.version}</version> + <version>${shaded.protobuf-javanano.version}</version> <optional>true</optional> </dependency> @@ -134,30 +134,73 @@ <version>${shaded.grpc.version}</version> <optional>true</optional> </dependency> + <dependency> + <groupId>io.grpc</groupId> + <artifactId>grpc-context</artifactId> + <version>${shaded.grpc.version}</version> + <optional>true</optional> + </dependency> + + <dependency> + <groupId>com.google.auto</groupId> + <artifactId>auto-common</artifactId> + <version>0.10</version> + <scope>compile</scope> + <optional>true</optional> + </dependency> + <dependency> + <groupId>com.google.auto.service</groupId> + <artifactId>auto-service</artifactId> + <version>1.0-rc4</version> + <scope>compile</scope> + <optional>true</optional> + </dependency> + <dependency> + <groupId>com.google.auto.value</groupId> + <artifactId>auto-value-annotations</artifactId> + <version>1.6</version> + </dependency> + <dependency> + <groupId>com.google.auto.value</groupId> + <artifactId>auto-value</artifactId> + <version>1.6</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>24.1-jre</version> + </dependency> <dependency> <groupId>com.google.code.findbugs</groupId> <artifactId>jsr305</artifactId> - <version>1.3.9</version> + <version>3.0.2</version> <optional>true</optional> </dependency> <dependency> <groupId>com.google.errorprone</groupId> <artifactId>error_prone_annotations</artifactId> - <version>2.0.18</version> + <version>2.2.0</version> <optional>true</optional> </dependency> <dependency> <groupId>com.google.j2objc</groupId> <artifactId>j2objc-annotations</artifactId> - <version>1.1</version> + <version>1.3</version> <optional>true</optional> </dependency> <dependency> + <groupId>com.squareup</groupId> + <artifactId>javapoet</artifactId> + <version>1.10.0</version> + </dependency> + + <dependency> <groupId>org.codehaus.mojo</groupId> <artifactId>animal-sniffer-annotations</artifactId> - <version>1.15</version> + <version>1.16</version> <optional>true</optional> </dependency> @@ -312,7 +355,7 @@ <dependency> <groupId>io.netty</groupId> <artifactId>netty-tcnative</artifactId> - <version>${tcnative.version}</version> + <version>${netty-tcnative.version}</version> <classifier>${os.detected.classifier}</classifier> <scope>compile</scope> <optional>true</optional> @@ -379,7 +422,7 @@ <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> - <version>2.8.0</version> + <version>2.8.2</version> <scope>compile</scope> <optional>true</optional> </dependency> @@ -402,6 +445,29 @@ <artifactId>jctools-core</artifactId> <optional>true</optional> </dependency> + + <dependency> + <groupId>com.fasterxml</groupId> + <artifactId>aalto-xml</artifactId> + <version>1.0.0</version> + <scope>compile</scope> + <optional>true</optional> + </dependency> + + <dependency> + <groupId>io.opencensus</groupId> + <artifactId>opencensus-api</artifactId> + <version>${io.opencensus.version}</version> + <scope>compile</scope> + <optional>true</optional> + </dependency> + <dependency> + <groupId>io.opencensus</groupId> + <artifactId>opencensus-contrib-grpc-metrics</artifactId> + <version>${io.opencensus.version}</version> + <scope>compile</scope> + <optional>true</optional> + </dependency> </dependencies> <profiles> @@ -559,16 +625,8 @@ <shadedArtifactAttached>true</shadedArtifactAttached> <relocations> <relocation> - <pattern>com.google.common</pattern> - <shadedPattern>org.apache.ratis.shaded.com.google.common</shadedPattern> - </relocation> - <relocation> - <pattern>com.google.thirdparty.publicsuffix</pattern> - <shadedPattern>org.apache.ratis.shaded.com.google.thirdparty.publicsuffix</shadedPattern> - </relocation> - <relocation> - <pattern>com.google.protobuf</pattern> - <shadedPattern>org.apache.ratis.shaded.com.google.protobuf</shadedPattern> + <pattern>com.google</pattern> + <shadedPattern>org.apache.ratis.shaded.com.google</shadedPattern> </relocation> <relocation> <pattern>io.grpc</pattern> @@ -578,6 +636,20 @@ <pattern>io.netty</pattern> <shadedPattern>org.apache.ratis.shaded.io.netty</shadedPattern> </relocation> + + <relocation> + <pattern>com.squareup</pattern> + <shadedPattern>org.apache.ratis.shaded.com.squareup</shadedPattern> + </relocation> + <relocation> + <pattern>org.jctools</pattern> + <shadedPattern>org.apache.ratis.shaded.org.jctools</shadedPattern> + </relocation> + <!-- Cannot relocate io.opencensus due to AutoValue code generation --> + <!--<relocation>--> + <!--<pattern>io.opencensus</pattern>--> + <!--<shadedPattern>org.apache.ratis.shaded.io.opencensus</shadedPattern>--> + <!--</relocation>--> </relocations> <filters> @@ -597,10 +669,8 @@ <exclude>com.github.jponge:lzma-java</exclude> <exclude>com.google.code.findbugs:jsr305</exclude> - <exclude>com.google.code.gson:gson</exclude> - <exclude>com.google.errorprone:error_prone_annotations</exclude> - <exclude>com.google.j2objc:j2objc-annotations</exclude> + <exclude>com.fasterxml:aalto-xml</exclude> <exclude>com.jcraft:jzlib</exclude> <exclude>com.ning:compress-lzf</exclude> <exclude>com.yammer.metrics:metrics-core</exclude> @@ -634,10 +704,12 @@ <exclude>org.apache.logging.log4j:log4j-api</exclude> <exclude>org.bouncycastle:bcpkix-jdk15on</exclude> <exclude>org.bouncycastle:bcprov-jdk15on</exclude> + <exclude>org.checkerframework:checker-compat-qual</exclude> <exclude>org.codehaus.mojo:animal-sniffer-annotations</exclude> + <exclude>org.codehaus.woodstox:stax2-api</exclude> + <exclude>org.conscrypt:conscrypt-openjdk-uber</exclude> <exclude>org.javassist:javassist</exclude> <exclude>org.jboss.marshalling:jboss-marshalling</exclude> - <exclude>org.jctools:jctools-core</exclude> <exclude>org.rxtx:rxtx</exclude> <exclude>org.slf4j:slf4j-api</exclude> </excludes>
