Repository: incubator-ratis Updated Branches: refs/heads/master fef6574c2 -> d7d706180
RATIS-237. Multiple definition of io.opencensus.trace.unsafe.ContextUtils is resolved as dependency causing runtime issue. Contributed by Tsz Wo Nicholas Sze. Project: http://git-wip-us.apache.org/repos/asf/incubator-ratis/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ratis/commit/d7d70618 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ratis/tree/d7d70618 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ratis/diff/d7d70618 Branch: refs/heads/master Commit: d7d7061803b1bfa8890982153db82fcadde7e777 Parents: fef6574 Author: Márton Elek <[email protected]> Authored: Fri May 11 16:50:13 2018 +0200 Committer: Márton Elek <[email protected]> Committed: Fri May 11 16:50:13 2018 +0200 ---------------------------------------------------------------------- pom.xml | 27 ++++++++++--------- ratis-grpc/pom.xml | 16 ----------- ratis-netty/pom.xml | 5 ---- ratis-proto-shaded/pom.xml | 60 +++++++++++++++++++++++++++++++---------- 4 files changed, 60 insertions(+), 48 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/d7d70618/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 4aa3ec9..e6386b5 100644 --- a/pom.xml +++ b/pom.xml @@ -137,7 +137,7 @@ <maven-checkstyle-plugin.version>2.15</maven-checkstyle-plugin.version> <maven-clean-plugin.version>3.0.0</maven-clean-plugin.version> <maven-clover2-plugin.version>3.3.0</maven-clover2-plugin.version> - <maven-compiler-plugin.version>3.2</maven-compiler-plugin.version> + <maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version> <maven-dependency-plugin.version>2.10</maven-dependency-plugin.version> <maven-deploy-plugin.version>2.8.1</maven-deploy-plugin.version> <maven-install-plugin.version>2.5.1</maven-install-plugin.version> @@ -145,7 +145,7 @@ <maven-javadoc-plugin.version>2.10.3</maven-javadoc-plugin.version> <maven-pdf-plugin.version>1.2</maven-pdf-plugin.version> <maven-resources-plugin.version>2.6</maven-resources-plugin.version> - <maven-shade-plugin.version>3.1.0</maven-shade-plugin.version> + <maven-shade-plugin.version>3.1.1</maven-shade-plugin.version> <maven-site-plugin.version>3.5</maven-site-plugin.version> <maven-source-plugin.version>2.3</maven-source-plugin.version> <maven-stylus-skin.version>1.5</maven-stylus-skin.version> @@ -332,12 +332,6 @@ <artifactId>mockito-all</artifactId> <version>1.8.5</version> </dependency> - - <dependency> - <groupId>org.jctools</groupId> - <artifactId>jctools-core</artifactId> - <version>2.1.2</version> - </dependency> </dependencies> </dependencyManagement> @@ -454,10 +448,15 @@ <configuration> <source>${javac.version}</source> <target>${javac.version}</target> + <fork>true</fork> + <meminitial>512m</meminitial> + <maxmem>2048m</maxmem> <showWarnings>true</showWarnings> <showDeprecation>false</showDeprecation> <useIncrementalCompilation>false</useIncrementalCompilation> - <compilerArgument>-Xlint:-options</compilerArgument> + <compilerArgs> + <arg>-Xlint:all,-options,-path</arg> + </compilerArgs> </configuration> </plugin> <!-- Make a jar and put the sources in the jar. @@ -709,10 +708,12 @@ <fork>true</fork> <source>${javac.version}</source> <target>${javac.version}</target> - <compilerArguments> - <Xlint /> - <Xmaxwarns>9999</Xmaxwarns> - </compilerArguments> + <fork>true</fork> + <meminitial>512m</meminitial> + <maxmem>2048m</maxmem> + <compilerArgs> + <arg>-Xlint:all,-options,-path</arg> + </compilerArgs> </configuration> </plugin> </plugins> http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/d7d70618/ratis-grpc/pom.xml ---------------------------------------------------------------------- diff --git a/ratis-grpc/pom.xml b/ratis-grpc/pom.xml index a3c3cc1..62900b7 100644 --- a/ratis-grpc/pom.xml +++ b/ratis-grpc/pom.xml @@ -79,21 +79,5 @@ <artifactId>mockito-all</artifactId> <scope>test</scope> </dependency> - - <dependency> - <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/d7d70618/ratis-netty/pom.xml ---------------------------------------------------------------------- diff --git a/ratis-netty/pom.xml b/ratis-netty/pom.xml index 4e11207..0a81d25 100644 --- a/ratis-netty/pom.xml +++ b/ratis-netty/pom.xml @@ -80,10 +80,5 @@ <artifactId>mockito-all</artifactId> <scope>test</scope> </dependency> - - <dependency> - <groupId>org.jctools</groupId> - <artifactId>jctools-core</artifactId> - </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/d7d70618/ratis-proto-shaded/pom.xml ---------------------------------------------------------------------- diff --git a/ratis-proto-shaded/pom.xml b/ratis-proto-shaded/pom.xml index 032e0fa..e49428b 100644 --- a/ratis-proto-shaded/pom.xml +++ b/ratis-proto-shaded/pom.xml @@ -443,7 +443,7 @@ <dependency> <groupId>org.jctools</groupId> <artifactId>jctools-core</artifactId> - <optional>true</optional> + <version>2.1.2</version> </dependency> <dependency> @@ -625,10 +625,43 @@ <shadedArtifactAttached>true</shadedArtifactAttached> <relocations> <relocation> - <pattern>com.google</pattern> - <shadedPattern>org.apache.ratis.shaded.com.google</shadedPattern> + <pattern>com.google.api</pattern> + <shadedPattern>org.apache.ratis.shaded.com.google.api</shadedPattern> + </relocation> + <relocation> + <pattern>com.google.cloud.audit</pattern> + <shadedPattern>org.apache.ratis.shaded.com.google.cloud.audit</shadedPattern> + </relocation> + <relocation> + <pattern>com.google.common</pattern> + <shadedPattern>org.apache.ratis.shaded.com.google.common</shadedPattern> + </relocation> + <relocation> + <pattern>com.google.logging.type</pattern> + <shadedPattern>org.apache.ratis.shaded.com.google.logging.type</shadedPattern> + </relocation> + <relocation> + <pattern>com.google.longrunning</pattern> + <shadedPattern>org.apache.ratis.shaded.com.google.longrunning</shadedPattern> + </relocation> + <relocation> + <pattern>com.google.protobuf</pattern> + <shadedPattern>org.apache.ratis.shaded.com.google.protobuf</shadedPattern> + </relocation> + <relocation> + <pattern>com.google.rpc</pattern> + <shadedPattern>org.apache.ratis.shaded.com.google.rpc</shadedPattern> + </relocation> + <relocation> + <pattern>com.google.thirdparty.publicsuffix</pattern> + <shadedPattern>org.apache.ratis.shaded.com.google.thirdparty.publicsuffix</shadedPattern> </relocation> <relocation> + <pattern>com.google.type</pattern> + <shadedPattern>org.apache.ratis.shaded.com.google.type</shadedPattern> + </relocation> + + <relocation> <pattern>io.grpc</pattern> <shadedPattern>org.apache.ratis.shaded.io.grpc</shadedPattern> </relocation> @@ -638,18 +671,9 @@ </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> + <pattern>io.opencensus</pattern> + <shadedPattern>org.apache.ratis.shaded.io.opencensus</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> @@ -669,10 +693,17 @@ <exclude>com.github.jponge:lzma-java</exclude> <exclude>com.google.code.findbugs:jsr305</exclude> + <exclude>com.google.auto:auto-common</exclude> + <exclude>com.google.auto.service:auto-service</exclude> + <exclude>com.google.auto.value:auto-value-annotations</exclude> + <exclude>com.google.errorprone:error_prone_annotations</exclude> + <exclude>com.google.code.gson:gson</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.squareup:javapoet</exclude> <exclude>com.yammer.metrics:metrics-core</exclude> <exclude>commons-logging:commons-logging</exclude> @@ -710,6 +741,7 @@ <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>
