You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kudu.apache.org by gr...@apache.org on 2018/04/20 03:50:50 UTC
kudu git commit: [Java] Mark the Yetus annotations dependency optional
Repository: kudu
Updated Branches:
refs/heads/master e6061b205 -> 934e34328
[Java] Mark the Yetus annotations dependency optional
Given the Yetus dependency is mainly used for documentation
generation and is not used at runtime, we can mark the
annotation as optional for users consuming Kudu.
This is similar to the jsr305 dependency which we mark
as optional.
Additionally we don’t need to include Yetus in our shaded
jars.
Change-Id: I6daf4f21c6cdde08145f5467e84d68dbe40cec16
Reviewed-on: http://gerrit.cloudera.org:8080/10095
Reviewed-by: Grant Henke <gr...@apache.org>
Tested-by: Kudu Jenkins
Project: http://git-wip-us.apache.org/repos/asf/kudu/repo
Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/934e3432
Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/934e3432
Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/934e3432
Branch: refs/heads/master
Commit: 934e343288836025d8bb571d27d7f33130e4e5b4
Parents: e6061b2
Author: Grant Henke <gr...@apache.org>
Authored: Mon Apr 16 09:28:23 2018 -0500
Committer: Grant Henke <gr...@apache.org>
Committed: Fri Apr 20 03:49:11 2018 +0000
----------------------------------------------------------------------
java/kudu-client-tools/build.gradle | 4 ++--
java/kudu-client-tools/pom.xml | 13 +++++++------
java/kudu-client/build.gradle | 2 +-
java/kudu-client/pom.xml | 11 ++++++-----
java/kudu-flume-sink/build.gradle | 3 ++-
java/kudu-flume-sink/pom.xml | 12 +++++++-----
java/kudu-jepsen/build.gradle | 3 ++-
java/kudu-jepsen/pom.xml | 1 +
java/kudu-mapreduce/build.gradle | 3 ++-
java/kudu-mapreduce/pom.xml | 12 +++++++-----
java/kudu-spark-tools/build.gradle | 3 ++-
java/kudu-spark-tools/pom.xml | 14 +++++++-------
java/kudu-spark/build.gradle | 3 ++-
java/kudu-spark/pom.xml | 12 +++++++-----
14 files changed, 55 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kudu/blob/934e3432/java/kudu-client-tools/build.gradle
----------------------------------------------------------------------
diff --git a/java/kudu-client-tools/build.gradle b/java/kudu-client-tools/build.gradle
index 2728287..fb07600 100644
--- a/java/kudu-client-tools/build.gradle
+++ b/java/kudu-client-tools/build.gradle
@@ -19,12 +19,12 @@ apply from: "$rootDir/gradle/shadow.gradle"
dependencies {
compile project(":kudu-mapreduce")
-
// 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
- compile libs.yetusAnnotations
+
+ optional libs.yetusAnnotations
provided libs.hadoopClient
http://git-wip-us.apache.org/repos/asf/kudu/blob/934e3432/java/kudu-client-tools/pom.xml
----------------------------------------------------------------------
diff --git a/java/kudu-client-tools/pom.xml b/java/kudu-client-tools/pom.xml
index d72b9cb..b363e49 100644
--- a/java/kudu-client-tools/pom.xml
+++ b/java/kudu-client-tools/pom.xml
@@ -37,11 +37,6 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.yetus</groupId>
- <artifactId>audience-annotations</artifactId>
- <version>${yetus.version}</version>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
@@ -63,6 +58,13 @@
</dependency>
<dependency>
+ <groupId>org.apache.yetus</groupId>
+ <artifactId>audience-annotations</artifactId>
+ <version>${yetus.version}</version>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.kudu</groupId>
<artifactId>kudu-client</artifactId>
<version>${project.version}</version>
@@ -112,7 +114,6 @@
<includes>
<include>org.apache.kudu:kudu-client</include>
<include>org.apache.kudu:kudu-mapreduce</include>
- <include>org.apache.yetus:audience-annotations</include>
<include>org.apache.parquet:parquet-hadoop</include>
</includes>
</artifactSet>
http://git-wip-us.apache.org/repos/asf/kudu/blob/934e3432/java/kudu-client/build.gradle
----------------------------------------------------------------------
diff --git a/java/kudu-client/build.gradle b/java/kudu-client/build.gradle
index b266073..3161f6c 100644
--- a/java/kudu-client/build.gradle
+++ b/java/kudu-client/build.gradle
@@ -28,7 +28,6 @@ dependencies {
exclude group: "org.slf4j", module: "slf4j-api"
}
compileUnshaded libs.slf4jApi
- compileUnshaded libs.yetusAnnotations
compile libs.guava
compile libs.murmur
@@ -36,6 +35,7 @@ dependencies {
compile libs.protobufJava
optional libs.jsr305
+ optional libs.yetusAnnotations
testCompile libs.commonsIo
testCompile libs.hamcrestCore
http://git-wip-us.apache.org/repos/asf/kudu/blob/934e3432/java/kudu-client/pom.xml
----------------------------------------------------------------------
diff --git a/java/kudu-client/pom.xml b/java/kudu-client/pom.xml
index 75c7974..70dffc6 100644
--- a/java/kudu-client/pom.xml
+++ b/java/kudu-client/pom.xml
@@ -67,11 +67,6 @@
<version>${netty.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.yetus</groupId>
- <artifactId>audience-annotations</artifactId>
- <version>${yetus.version}</version>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
@@ -83,6 +78,12 @@
<version>${jsr305.version}</version>
<optional>true</optional>
</dependency>
+ <dependency>
+ <groupId>org.apache.yetus</groupId>
+ <artifactId>audience-annotations</artifactId>
+ <version>${yetus.version}</version>
+ <optional>true</optional>
+ </dependency>
<dependency>
<groupId>commons-io</groupId>
http://git-wip-us.apache.org/repos/asf/kudu/blob/934e3432/java/kudu-flume-sink/build.gradle
----------------------------------------------------------------------
diff --git a/java/kudu-flume-sink/build.gradle b/java/kudu-flume-sink/build.gradle
index 79df593..fcadcee 100644
--- a/java/kudu-flume-sink/build.gradle
+++ b/java/kudu-flume-sink/build.gradle
@@ -21,7 +21,8 @@ apply plugin: "com.commercehub.gradle.plugin.avro"
dependencies {
compile project(path: ":kudu-client", configuration: "shadow")
compile libs.slf4jApi
- compile libs.yetusAnnotations
+
+ optional libs.yetusAnnotations
provided libs.avro
provided libs.flumeConfiguration
http://git-wip-us.apache.org/repos/asf/kudu/blob/934e3432/java/kudu-flume-sink/pom.xml
----------------------------------------------------------------------
diff --git a/java/kudu-flume-sink/pom.xml b/java/kudu-flume-sink/pom.xml
index ff23150..b783925 100644
--- a/java/kudu-flume-sink/pom.xml
+++ b/java/kudu-flume-sink/pom.xml
@@ -26,11 +26,6 @@
<artifactId>kudu-client</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.yetus</groupId>
- <artifactId>audience-annotations</artifactId>
- <version>${yetus.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.flume</groupId>
@@ -64,6 +59,13 @@
</dependency>
<dependency>
+ <groupId>org.apache.yetus</groupId>
+ <artifactId>audience-annotations</artifactId>
+ <version>${yetus.version}</version>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.kudu</groupId>
<artifactId>kudu-client</artifactId>
<version>${project.version}</version>
http://git-wip-us.apache.org/repos/asf/kudu/blob/934e3432/java/kudu-jepsen/build.gradle
----------------------------------------------------------------------
diff --git a/java/kudu-jepsen/build.gradle b/java/kudu-jepsen/build.gradle
index fe55c21..a0b326b 100644
--- a/java/kudu-jepsen/build.gradle
+++ b/java/kudu-jepsen/build.gradle
@@ -36,7 +36,8 @@ dependencies {
compile libs.clojure
compile libs.clojureToolsCli
compile libs.jepsen
- compile libs.yetusAnnotations
+
+ optional libs.yetusAnnotations
}
compileClojure {
http://git-wip-us.apache.org/repos/asf/kudu/blob/934e3432/java/kudu-jepsen/pom.xml
----------------------------------------------------------------------
diff --git a/java/kudu-jepsen/pom.xml b/java/kudu-jepsen/pom.xml
index 4de2418..055ce31 100644
--- a/java/kudu-jepsen/pom.xml
+++ b/java/kudu-jepsen/pom.xml
@@ -98,6 +98,7 @@
<groupId>org.apache.yetus</groupId>
<artifactId>audience-annotations</artifactId>
<version>${yetus.version}</version>
+ <optional>true</optional>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/kudu/blob/934e3432/java/kudu-mapreduce/build.gradle
----------------------------------------------------------------------
diff --git a/java/kudu-mapreduce/build.gradle b/java/kudu-mapreduce/build.gradle
index cfeb26b..70c2624 100644
--- a/java/kudu-mapreduce/build.gradle
+++ b/java/kudu-mapreduce/build.gradle
@@ -23,10 +23,11 @@ dependencies {
exclude group: "org.slf4j", module: "slf4j-api"
}
compile libs.slf4jApi
- compile libs.yetusAnnotations
provided libs.hadoopClient
+ optional libs.yetusAnnotations
+
testCompile project(path: ":kudu-client", configuration: "shadowTest")
testCompile libs.junit
testCompile libs.log4j
http://git-wip-us.apache.org/repos/asf/kudu/blob/934e3432/java/kudu-mapreduce/pom.xml
----------------------------------------------------------------------
diff --git a/java/kudu-mapreduce/pom.xml b/java/kudu-mapreduce/pom.xml
index b3f6a27..a98afcf 100644
--- a/java/kudu-mapreduce/pom.xml
+++ b/java/kudu-mapreduce/pom.xml
@@ -49,11 +49,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.yetus</groupId>
- <artifactId>audience-annotations</artifactId>
- <version>${yetus.version}</version>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
@@ -67,6 +62,13 @@
</dependency>
<dependency>
+ <groupId>org.apache.yetus</groupId>
+ <artifactId>audience-annotations</artifactId>
+ <version>${yetus.version}</version>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.kudu</groupId>
<artifactId>kudu-client</artifactId>
<version>${project.version}</version>
http://git-wip-us.apache.org/repos/asf/kudu/blob/934e3432/java/kudu-spark-tools/build.gradle
----------------------------------------------------------------------
diff --git a/java/kudu-spark-tools/build.gradle b/java/kudu-spark-tools/build.gradle
index d01420b..ebb3413 100644
--- a/java/kudu-spark-tools/build.gradle
+++ b/java/kudu-spark-tools/build.gradle
@@ -31,7 +31,8 @@ dependencies {
provided libs.scalaLibrary
provided libs.sparkCore
provided libs.sparkSql
- provided libs.yetusAnnotations
+
+ optional libs.yetusAnnotations
testCompile project(path: ":kudu-client", configuration: "shadowTest")
testCompile project(path: ":kudu-spark", configuration: "test")
http://git-wip-us.apache.org/repos/asf/kudu/blob/934e3432/java/kudu-spark-tools/pom.xml
----------------------------------------------------------------------
diff --git a/java/kudu-spark-tools/pom.xml b/java/kudu-spark-tools/pom.xml
index f284ad0..c4a9127 100644
--- a/java/kudu-spark-tools/pom.xml
+++ b/java/kudu-spark-tools/pom.xml
@@ -86,12 +86,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.yetus</groupId>
- <artifactId>audience-annotations</artifactId>
- <version>${yetus.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
<version>${scala.version}</version>
@@ -99,6 +93,13 @@
</dependency>
<dependency>
+ <groupId>org.apache.yetus</groupId>
+ <artifactId>audience-annotations</artifactId>
+ <version>${yetus.version}</version>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.kudu</groupId>
<artifactId>kudu-client</artifactId>
<version>${project.version}</version>
@@ -188,7 +189,6 @@
<include>org.apache.kudu:kudu-client</include>
<include>org.apache.kudu:kudu-client-tools</include>
<include>org.apache.kudu:kudu-${spark.version.label}_${scala.binary.version}</include>
- <include>org.apache.yetus:audience-annotations</include>
<include>com.databricks:spark-avro_${scala.binary.version}</include>
</includes>
</artifactSet>
http://git-wip-us.apache.org/repos/asf/kudu/blob/934e3432/java/kudu-spark/build.gradle
----------------------------------------------------------------------
diff --git a/java/kudu-spark/build.gradle b/java/kudu-spark/build.gradle
index 0c89a8b..8921d85 100644
--- a/java/kudu-spark/build.gradle
+++ b/java/kudu-spark/build.gradle
@@ -20,12 +20,13 @@ apply from: "$rootDir/gradle/shadow.gradle"
dependencies {
compile project(path: ":kudu-client", configuration: "shadow")
- compile libs.yetusAnnotations
provided libs.scalaLibrary
provided libs.sparkCore
provided libs.sparkSql
+ optional libs.yetusAnnotations
+
testCompile project(path: ":kudu-client", configuration: "shadowTest")
testCompile libs.junit
testCompile libs.scalatest
http://git-wip-us.apache.org/repos/asf/kudu/blob/934e3432/java/kudu-spark/pom.xml
----------------------------------------------------------------------
diff --git a/java/kudu-spark/pom.xml b/java/kudu-spark/pom.xml
index 5ad15a1..2e3bf55 100644
--- a/java/kudu-spark/pom.xml
+++ b/java/kudu-spark/pom.xml
@@ -29,11 +29,6 @@
<artifactId>kudu-client</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.yetus</groupId>
- <artifactId>audience-annotations</artifactId>
- <version>${yetus.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.spark</groupId>
@@ -67,6 +62,13 @@
</dependency>
<dependency>
+ <groupId>org.apache.yetus</groupId>
+ <artifactId>audience-annotations</artifactId>
+ <version>${yetus.version}</version>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.kudu</groupId>
<artifactId>kudu-client</artifactId>
<version>${project.version}</version>