From commits-return-5860-archive-asf-public=cust-asf.ponee.io@kudu.apache.org Mon Apr 23 18:27:46 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 7AF05180634 for ; Mon, 23 Apr 2018 18:27:45 +0200 (CEST) Received: (qmail 97413 invoked by uid 500); 23 Apr 2018 16:27:44 -0000 Mailing-List: contact commits-help@kudu.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@kudu.apache.org Delivered-To: mailing list commits@kudu.apache.org Received: (qmail 97400 invoked by uid 99); 23 Apr 2018 16:27:44 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 23 Apr 2018 16:27:44 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 117E3E38BB; Mon, 23 Apr 2018 16:27:44 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: granthenke@apache.org To: commits@kudu.apache.org Message-Id: <826bf3dfb91c4b6489ea52f8e77ccab5@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: kudu git commit: [Java] Fix Guava transitive dependecies Date: Mon, 23 Apr 2018 16:27:44 +0000 (UTC) Repository: kudu Updated Branches: refs/heads/master 3a801d104 -> 650e39e23 [Java] Fix Guava transitive dependecies In Guava 22.0+ the annotations dependencies are no longer marked as optional. However, if the annotations are not used at runtime or compile time they are actually not required. - Excludes the transitive annotations libraries that are not marked as optional in version 22.0+ - Adds Guava where it was used directly but not in the dependencies Change-Id: I8f1f6e762629c1dea30589a1ade1f3da6de6ad3d Reviewed-on: http://gerrit.cloudera.org:8080/10096 Tested-by: Kudu Jenkins Reviewed-by: Dan Burkert Project: http://git-wip-us.apache.org/repos/asf/kudu/repo Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/650e39e2 Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/650e39e2 Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/650e39e2 Branch: refs/heads/master Commit: 650e39e234142c69d4ff7adc56ad6359b790741b Parents: 3a801d1 Author: Grant Henke Authored: Mon Apr 16 10:45:19 2018 -0500 Committer: Grant Henke Committed: Mon Apr 23 16:18:47 2018 +0000 ---------------------------------------------------------------------- java/build.gradle | 11 +++++++++++ java/kudu-client-tools/build.gradle | 8 +++++--- java/kudu-client-tools/pom.xml | 25 +++++++++++++++++++++++++ java/kudu-client/pom.xml | 8 ++++++++ java/kudu-flume-sink/build.gradle | 1 + java/kudu-flume-sink/pom.xml | 6 ++++++ java/kudu-mapreduce/build.gradle | 1 + java/kudu-mapreduce/pom.xml | 14 ++++++++++++++ 8 files changed, 71 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kudu/blob/650e39e2/java/build.gradle ---------------------------------------------------------------------- diff --git a/java/build.gradle b/java/build.gradle index 30c3cd6..a64e4a1 100755 --- a/java/build.gradle +++ b/java/build.gradle @@ -48,6 +48,17 @@ subprojects { apply from: "$rootDir/gradle/quality.gradle" apply from: "$rootDir/gradle/artifacts.gradle" apply from: "$rootDir/gradle/publishing.gradle" + + // Ignore the transitive annotations libraries that are + // not marked as optional in Guava version 22.0+. + // See https://github.com/google/guava/issues/2824 + configurations.compile { + exclude group: "com.google.errorprone", module: "error_prone_annotations" + exclude group: "com.google.code.findbugs", module: "jsr305" + exclude group: "com.google.j2objc", module: "j2objc-annotations" + exclude group: "org.checkerframework", module: "checker-compat-qual" + exclude group: "org.codehaus.mojo", module: "animal-sniffer-annotations" + } } task javadocAggregate(type: Javadoc, group: "Documentation") { http://git-wip-us.apache.org/repos/asf/kudu/blob/650e39e2/java/kudu-client-tools/build.gradle ---------------------------------------------------------------------- diff --git a/java/kudu-client-tools/build.gradle b/java/kudu-client-tools/build.gradle index fb07600..9cb53c2 100644 --- a/java/kudu-client-tools/build.gradle +++ b/java/kudu-client-tools/build.gradle @@ -19,15 +19,17 @@ apply from: "$rootDir/gradle/shadow.gradle" dependencies { compile project(":kudu-mapreduce") + compile libs.guava + compile libs.slf4jApi + // This artifact is in compile scope for convenience, as it is typically // not included in the job classpath by MapReduce platform providers. compile libs.parquetHadoop - compile libs.slf4jApi - - optional libs.yetusAnnotations provided libs.hadoopClient + optional libs.yetusAnnotations + testCompile project(path: ":kudu-client", configuration: "shadowTest") testCompile project(path: ":kudu-mapreduce", configuration: "test") testCompile libs.junit http://git-wip-us.apache.org/repos/asf/kudu/blob/650e39e2/java/kudu-client-tools/pom.xml ---------------------------------------------------------------------- diff --git a/java/kudu-client-tools/pom.xml b/java/kudu-client-tools/pom.xml index b363e49..1c768de 100644 --- a/java/kudu-client-tools/pom.xml +++ b/java/kudu-client-tools/pom.xml @@ -36,6 +36,20 @@ kudu-mapreduce ${project.version} + + + com.google.guava + guava + ${guava.version} + + + + + * + * + + + org.slf4j slf4j-api @@ -112,11 +126,22 @@ + com.google.guava:guava org.apache.kudu:kudu-client org.apache.kudu:kudu-mapreduce org.apache.parquet:parquet-hadoop + + + com.google.common + org.apache.kudu.shaded.com.google.common + + + com.google.thirdparty + org.apache.kudu.shaded.com.google.thirdparty + + http://git-wip-us.apache.org/repos/asf/kudu/blob/650e39e2/java/kudu-client/pom.xml ---------------------------------------------------------------------- diff --git a/java/kudu-client/pom.xml b/java/kudu-client/pom.xml index 70dffc6..ad3cd36 100644 --- a/java/kudu-client/pom.xml +++ b/java/kudu-client/pom.xml @@ -50,6 +50,14 @@ com.google.guava guava ${guava.version} + + + + + * + * + + com.google.protobuf http://git-wip-us.apache.org/repos/asf/kudu/blob/650e39e2/java/kudu-flume-sink/build.gradle ---------------------------------------------------------------------- diff --git a/java/kudu-flume-sink/build.gradle b/java/kudu-flume-sink/build.gradle index fcadcee..72ae0cd 100644 --- a/java/kudu-flume-sink/build.gradle +++ b/java/kudu-flume-sink/build.gradle @@ -27,6 +27,7 @@ dependencies { provided libs.avro provided libs.flumeConfiguration provided libs.flumeCore + provided libs.guava provided libs.hadoopClient testCompile project(path: ":kudu-client", configuration: "shadowTest") http://git-wip-us.apache.org/repos/asf/kudu/blob/650e39e2/java/kudu-flume-sink/pom.xml ---------------------------------------------------------------------- diff --git a/java/kudu-flume-sink/pom.xml b/java/kudu-flume-sink/pom.xml index b783925..a585a19 100644 --- a/java/kudu-flume-sink/pom.xml +++ b/java/kudu-flume-sink/pom.xml @@ -28,6 +28,12 @@ + com.google.guava + guava + ${guava.version} + provided + + org.apache.flume flume-ng-core ${flume.version} http://git-wip-us.apache.org/repos/asf/kudu/blob/650e39e2/java/kudu-mapreduce/build.gradle ---------------------------------------------------------------------- diff --git a/java/kudu-mapreduce/build.gradle b/java/kudu-mapreduce/build.gradle index 70c2624..0c40c8d 100644 --- a/java/kudu-mapreduce/build.gradle +++ b/java/kudu-mapreduce/build.gradle @@ -22,6 +22,7 @@ dependencies { // Remove this once the following is merged: https://github.com/OpenTSDB/async/pull/8 exclude group: "org.slf4j", module: "slf4j-api" } + compile libs.guava compile libs.slf4jApi provided libs.hadoopClient http://git-wip-us.apache.org/repos/asf/kudu/blob/650e39e2/java/kudu-mapreduce/pom.xml ---------------------------------------------------------------------- diff --git a/java/kudu-mapreduce/pom.xml b/java/kudu-mapreduce/pom.xml index a98afcf..ee26955 100644 --- a/java/kudu-mapreduce/pom.xml +++ b/java/kudu-mapreduce/pom.xml @@ -35,6 +35,20 @@ kudu-client ${project.version} + + + com.google.guava + guava + ${guava.version} + + + + + * + * + + + com.stumbleupon async