Change yetus dependency to compile in spark modules

Due to Spark’s usage of reflection the Yetus annotation is required at runtime. Because it is getting in the way of other development and Yetus is a small dependency, I changed the scope to compile in the Spark modules to ensure the class is available. See KUDU-2500 for details and to track the final solution. Change-Id: I16867a75b7f29f57c557449f94e52439cb9642c9 Reviewed-on: http://gerrit.cloudera.org:8080/10927 Tested-by: Kudu Jenkins Reviewed-by: Mike Percy <[email protected]> Reviewed-by: Tony Foerster <[email protected]>
alanliang · Jul 13, 2018 · daee555 · daee555
1 parent d074de8
commit daee555
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 27 deletions.
diff --git a/java/kudu-backup/build.gradle b/java/kudu-backup/build.gradle
@@ -31,15 +31,15 @@ dependencies {
     // Make sure wrong Scala version is not pulled in.
     exclude group: "org.scala-lang", module: "scala-library"
   }
+  // TODO(KUDU-2500): Spark uses reflection which requires the annotations at runtime.
+  compile libs.yetusAnnotations
 
   provided libs.scalaLibrary
   provided libs.sparkAvro
   provided libs.sparkCore
   provided libs.sparkSql
   provided libs.slf4jApi
 
-  optional libs.yetusAnnotations
-
   testCompile project(path: ":kudu-client", configuration: "shadowTest")
   testCompile project(path: ":kudu-spark", configuration: "test")
   testCompile libs.junit

diff --git a/java/kudu-backup/pom.xml b/java/kudu-backup/pom.xml
@@ -70,6 +70,12 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <!-- TODO(KUDU-2500): Spark uses reflection which requires the annotations at runtime. -->
+        <dependency>
+            <groupId>org.apache.yetus</groupId>
+            <artifactId>audience-annotations</artifactId>
+            <version>${yetus.version}</version>
+        </dependency>
 
         <dependency>
             <groupId>com.databricks</groupId>
@@ -102,14 +108,6 @@
             <scope>provided</scope>
         </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-${spark.version.label}_${scala.binary.version}</artifactId>

diff --git a/java/kudu-spark-tools/build.gradle b/java/kudu-spark-tools/build.gradle
@@ -22,15 +22,15 @@ dependencies {
   compile project(path: ":kudu-client", configuration: "shadow")
   compile project(path: ":kudu-client-tools", configuration: "shadow")
   compile project(path: ":kudu-spark", configuration: "shadow")
+  // TODO(KUDU-2500): Spark uses reflection which requires the annotations at runtime.
+  compile libs.yetusAnnotations
 
   provided libs.scalaLibrary
   provided libs.sparkAvro
   provided libs.sparkCore
   provided libs.sparkSql
   provided libs.slf4jApi
 
-  optional libs.yetusAnnotations
-
   testCompile project(path: ":kudu-client", configuration: "shadowTest")
   testCompile project(path: ":kudu-spark", configuration: "test")
   testCompile libs.junit

diff --git a/java/kudu-spark-tools/pom.xml b/java/kudu-spark-tools/pom.xml
@@ -47,6 +47,12 @@
             <artifactId>kudu-${spark.version.label}_${scala.binary.version}</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <!-- TODO(KUDU-2500): Spark uses reflection which requires the annotations at runtime. -->
+        <dependency>
+            <groupId>org.apache.yetus</groupId>
+            <artifactId>audience-annotations</artifactId>
+            <version>${yetus.version}</version>
+        </dependency>
 
         <dependency>
             <groupId>com.databricks</groupId>
@@ -91,13 +97,6 @@
             <scope>provided</scope>
         </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>

diff --git a/java/kudu-spark/build.gradle b/java/kudu-spark/build.gradle
@@ -20,13 +20,14 @@ apply from: "$rootDir/gradle/shadow.gradle"
 
 dependencies {
   compile project(path: ":kudu-client", configuration: "shadow")
+  // TODO(KUDU-2500): Spark uses reflection which requires the annotations at runtime.
+  compile libs.yetusAnnotations
 
   provided libs.scalaLibrary
   provided libs.sparkCore
   provided libs.sparkSql
   provided libs.slf4jApi
 
-  optional libs.yetusAnnotations
 
   testCompile project(path: ":kudu-client", configuration: "shadowTest")
   testCompile libs.junit

diff --git a/java/kudu-spark/pom.xml b/java/kudu-spark/pom.xml
@@ -29,6 +29,12 @@
             <artifactId>kudu-client</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <!-- TODO(KUDU-2500): Spark uses reflection which requires the annotations at runtime. -->
+        <dependency>
+            <groupId>org.apache.yetus</groupId>
+            <artifactId>audience-annotations</artifactId>
+            <version>${yetus.version}</version>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.spark</groupId>
@@ -67,13 +73,6 @@
             <scope>provided</scope>
         </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>