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/24 00:49:07 UTC

kudu git commit: KUDU-2365: [Java] Fix Gradle Artifacts

Repository: kudu
Updated Branches:
  refs/heads/master 1a3911c2e -> 7f0487397


KUDU-2365: [Java] Fix Gradle Artifacts

This resolves KUDU-2365 and adresses the remaining
Gradle artifact issues.

- Fixes the handling of compileUnshaded scope
- Adds NOTICE.txt and LICENSE.txt file to the jar manifest
- Adds a licence section to the published poms
- Removes empty directories from jars
- Moves SLF4J to provided scope in Flume, Spark, and
   Mapreduce integrations where we want to use the version
   on the existing classpath.
- Reduce the usage of large aggregate dependencies where
   smaller more pointed ones are available
- Prevents publishing of kudu-hive and kudu-jepsen
- Enables the /build directory on verify_jars.pl
- Tweaks the artifact signing flags and enables using
   gpg-agent like the current Maven signing process

Change-Id: Iaef485eca7eebe55286ad5670452839bebb0c47e
Reviewed-on: http://gerrit.cloudera.org:8080/10097
Reviewed-by: Dan Burkert <da...@apache.org>
Tested-by: Grant Henke <gr...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/kudu/repo
Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/7f048739
Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/7f048739
Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/7f048739

Branch: refs/heads/master
Commit: 7f04873975d73bb335e09ee2a9bbbb9fd4b0cd89
Parents: 1a3911c
Author: Grant Henke <gr...@apache.org>
Authored: Tue Apr 17 13:49:58 2018 -0500
Committer: Grant Henke <gr...@apache.org>
Committed: Tue Apr 24 00:47:03 2018 +0000

----------------------------------------------------------------------
 build-support/verify_jars.pl                    |  4 +-
 java/gradle.properties                          | 10 ++++-
 java/gradle/artifacts.gradle                    | 16 +++++++
 java/gradle/publishing.gradle                   | 46 ++++++++++++++++----
 java/gradle/shadow.gradle                       | 44 +++++++++++++------
 java/kudu-client-tools/build.gradle             |  6 ++-
 java/kudu-client-tools/pom.xml                  | 23 +++++++---
 java/kudu-client/build.gradle                   |  1 -
 java/kudu-client/pom.xml                        |  6 ---
 .../java/org/apache/kudu/client/TestUtils.java  |  1 +
 java/kudu-flume-sink/build.gradle               |  5 ++-
 java/kudu-flume-sink/pom.xml                    |  3 +-
 java/kudu-hive/build.gradle                     |  6 ++-
 java/kudu-jepsen/build.gradle                   |  5 ++-
 java/kudu-mapreduce/build.gradle                |  6 ++-
 java/kudu-mapreduce/pom.xml                     | 27 +++++++++---
 java/kudu-spark-tools/build.gradle              |  3 +-
 java/kudu-spark-tools/pom.xml                   | 16 +++----
 java/kudu-spark/build.gradle                    |  1 +
 java/kudu-spark/pom.xml                         |  7 ++-
 20 files changed, 166 insertions(+), 70 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kudu/blob/7f048739/build-support/verify_jars.pl
----------------------------------------------------------------------
diff --git a/build-support/verify_jars.pl b/build-support/verify_jars.pl
index 1493574..45352a8 100755
--- a/build-support/verify_jars.pl
+++ b/build-support/verify_jars.pl
@@ -57,13 +57,13 @@ my $dest_dir = $ARGV[0];
 chdir($dest_dir) or die "cannot chdir to destination directory $dest_dir: $!";
 print "Checking jars in directory: " . `pwd`;
 
-# TODO(KUDU-2365): re-include build/ once this bug is fixed.
 chomp(my @jars = `find . -type f -name \*.jar |
-                         grep -v build/ |
                          grep -v tests\.jar |
+                         grep -v tests-shaded\.jar |
                          grep -v original |
                          grep -v sources\.jar |
                          grep -v javadoc\.jar |
+                         grep -v unshaded\.jar |
                          grep -v gradle-wrapper.jar`);
 
 my $num_errors = 0;

http://git-wip-us.apache.org/repos/asf/kudu/blob/7f048739/java/gradle.properties
----------------------------------------------------------------------
diff --git a/java/gradle.properties b/java/gradle.properties
index 6d03f76..039e27a 100755
--- a/java/gradle.properties
+++ b/java/gradle.properties
@@ -22,8 +22,9 @@
 group = org.apache.kudu
 version = 1.8.0-SNAPSHOT
 url = https://kudu.apache.org/
-scmUrl = git://git.apache.org/kudu.git
-issueTrackerUrl = https://issues.apache.org/jira/projects/KUDU
+
+# The Maven respository used when uploading artifacts.
+mavenPublishUrl = https://repository.apache.org/service/local/staging/deploy/maven2
 
 # Version passed to javac's -source and -target parameters:
 #
@@ -37,6 +38,11 @@ javaCompatibility = 1.7
 
 encoding = UTF-8
 
+# gpg-agent configuration for artifact signing.
+# See https://docs.gradle.org/current/userguide/signing_plugin.html#sec:using_gpg_agent
+signing.gnupg.executable = gpg
+signing.gnupg.useLegacyGpg = true
+
 # Maximum parallel forks to use while unit testing.
 maxParallelForks = 1
 

http://git-wip-us.apache.org/repos/asf/kudu/blob/7f048739/java/gradle/artifacts.gradle
----------------------------------------------------------------------
diff --git a/java/gradle/artifacts.gradle b/java/gradle/artifacts.gradle
index 69a74ab..844fdf8 100755
--- a/java/gradle/artifacts.gradle
+++ b/java/gradle/artifacts.gradle
@@ -48,6 +48,22 @@ task javadocJar(type: Jar, dependsOn: javadoc, group: "Build") {
   extension "jar"
 }
 
+tasks.withType(Jar) {
+  // Configure the manifest content of the Jars.
+  manifest {
+    attributes "Implementation-Title": "$project.archivesBaseName"
+    attributes "Implementation-Version": "$project.version"
+  }
+  from ("$rootDir/../NOTICE.txt") {
+    into "META-INF"
+  }
+  from ("$rootDir/../LICENSE.txt") {
+    into "META-INF"
+  }
+  // Prevent empty directories in the Jars.
+  includeEmptyDirs = false
+}
+
 artifacts {
   test testJar
   archives testJar

http://git-wip-us.apache.org/repos/asf/kudu/blob/7f048739/java/gradle/publishing.gradle
----------------------------------------------------------------------
diff --git a/java/gradle/publishing.gradle b/java/gradle/publishing.gradle
index 5b3ba2e..f2ad3eb 100644
--- a/java/gradle/publishing.gradle
+++ b/java/gradle/publishing.gradle
@@ -20,25 +20,53 @@
 apply plugin: "maven"
 apply plugin: "signing"
 
-// Only sign artifacts if skipSigning is false,
-// the version is not a snapshot, and we are uploading them to maven.
-// This allows simplified builds and local maven installs.
-def skipSigning = propertyExists("skipSigning")
-def shouldSign = !skipSigning && !version.endsWith("SNAPSHOT") && project.gradle.startParameter.taskNames.any { it.contains("upload") }
-def mavenUrl = propertyWithDefault("mavenUrl", "")
-def mavenUsername = propertyWithDefault("mavenUsername", "")
-def mavenPassword = propertyWithDefault("mavenPassword", "")
+ext {
+  // This allows simplified builds and local maven installs.
+  forceSigning = propertyExists("forceSigning")
+  skipSigning = propertyExists("skipSigning")
+  shouldSign =
+      // Always sign artifacts if -PforceSigning is passed.
+      forceSigning ||
+          // Skip signing artifacts by default if -PskipSigning is passed.
+          (!skipSigning
+              // Sign artifacts if the version is not a snapshot, and we are uploading them to maven.
+              && !version.endsWith("SNAPSHOT") && gradle.taskGraph.hasTask("uploadArchives"))
+
+  // These properties can be set in ~/.gradle/gradle.properties file,
+  // though it would be open text. They can also be set on the cli via
+  // -PmavenUsername and -PmavenPassword.
+  mavenPublishUrl = propertyWithDefault("mavenPublishUrl", "")
+  mavenUsername = propertyWithDefault("mavenUsername", "")
+  mavenPassword = propertyWithDefault("mavenPassword", "")
+}
 
 uploadArchives {
   repositories {
     signing {
       required { shouldSign }
+      // Check if we are going to sign, because CI environments may not have
+      // gpg on their path and useGpgCmd evaluates eagerly.
+      if (shouldSign) {
+        useGpgCmd() // Use gpg-agent to sign
+      }
       sign configurations.archives
       mavenDeployer {
         beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
-        repository(url: "${mavenUrl}") {
+        repository(url: "${mavenPublishUrl}") {
           authentication(userName: "${mavenUsername}", password: "${mavenPassword}")
         }
+        afterEvaluate {
+          pom.project {
+            url = "$url"
+            licenses {
+              license {
+                name = "The Apache Software License, Version 2.0"
+                url = "http://www.apache.org/licenses/LICENSE-2.0.txt"
+                distribution = "repo"
+              }
+            }
+          }
+        }
       }
     }
   }

http://git-wip-us.apache.org/repos/asf/kudu/blob/7f048739/java/gradle/shadow.gradle
----------------------------------------------------------------------
diff --git a/java/gradle/shadow.gradle b/java/gradle/shadow.gradle
index 3663cc7..29e22ec 100644
--- a/java/gradle/shadow.gradle
+++ b/java/gradle/shadow.gradle
@@ -40,6 +40,15 @@ configurations.archives.artifacts.removeAll {
   it instanceof ArchivePublishArtifact && it.archiveTask == jar
 }
 
+shadowJar {
+  dependencies {
+    // Our shaded jars always try to pull in the slf4j api from
+    // kudu-client, though we never want it included. Excluding it
+    // here prevents the need to always list it.
+    exclude dependency(libs.slf4jApi)
+  }
+}
+
 // Ensure we always relocate these shaded dependencies to the same
 // location across all modules.
 shadowJar {
@@ -54,6 +63,8 @@ shadowJar {
 // Everything below is a "hack" to support partial shading and
 // accurate pom generation. At some point this logic should exist
 // in the shadow plugin itself.
+// https://github.com/johnrengelman/shadow/issues/166
+// https://github.com/johnrengelman/shadow/issues/159
 // ------------------------------------------------------------------
 
 // Add a configuration to support unshaded compile dependencies.
@@ -62,6 +73,21 @@ configurations.create("compileUnshaded")
 configurations.shadow.extendsFrom(configurations.compileUnshaded)
 configurations.compile.extendsFrom(configurations.compileUnshaded)
 
+// Ensure compileUnshaded dependencies are not compiled into shadowJar.
+// We use afterEvaluate to add additional configuration once all the definitions
+// in the projects build script have been applied
+afterEvaluate {
+  project.configurations.compileUnshaded.dependencies.each { dep ->
+    def depStr = "${dep.group}:${dep.name}:${dep.version}"
+    logger.info "Excluding ${depStr} from being bundled into the shaded jar."
+    shadowJar {
+      dependencies {
+        exclude(dependency(depStr))
+      }
+    }
+  }
+}
+
 // Remove the shaded dependencies from the generated pom.
 // This hack allows the project to support partially shaded jars,
 // where the shadow plugin by default would remove all compile and runtime dependencies.
@@ -75,14 +101,16 @@ tasks.withType(Upload) {
     def configs = shadowJar.getConfigurations()
 
     def shadowDependencies = configs.collectMany {
-      // Find all dependencies included in the shadow configuration.
+      // Find all dependencies included in the shaded jar.
       it.resolvedConfiguration.firstLevelModuleDependencies.findAll {
         filter.isIncluded(it)
       }
     }
 
-    // Remove the shadow dependencies from the pom.
+    // Remove the shaded dependencies from the pom.
     shadowDependencies.each { shaded ->
+      def depStr = "${shaded.getModuleGroup()}:${shaded.getModuleName()}:${shaded.getModuleVersion()}"
+      logger.info "Excluding ${depStr} from the generated pom."
       pom.dependencies.removeAll { dep ->
         dep.groupId == shaded.getModuleGroup() &&
         dep.artifactId == shaded.getModuleName() &&
@@ -90,18 +118,6 @@ tasks.withType(Upload) {
       }
     }
 
-    // Add the explicitly unshaded dependencies from the pom.
-    def unshadedDependencies = project.configurations.compileUnshaded.resolvedConfiguration.firstLevelModuleDependencies
-    unshadedDependencies.each { unshaded ->
-      // to avoid class loading problems
-      def dependency = pom.model.class.classLoader.loadClass("org.apache.maven.model.Dependency").newInstance()
-      dependency.setGroupId(unshaded.getModuleGroup())
-      dependency.setArtifactId(unshaded.getModuleName())
-      dependency.setVersion(unshaded.getModuleVersion())
-      dependency.setScope("compile")
-      pom.dependencies.add(dependency)
-    }
-
     // Re-sort the generated maven dependencies to make pom comparisons easier.
     pom.dependencies = pom.dependencies.sort { dep ->
       "$dep.scope:$dep.optional:$dep.groupId:$dep.artifactId"

http://git-wip-us.apache.org/repos/asf/kudu/blob/7f048739/java/kudu-client-tools/build.gradle
----------------------------------------------------------------------
diff --git a/java/kudu-client-tools/build.gradle b/java/kudu-client-tools/build.gradle
index b6c683d..99b9fcf 100644
--- a/java/kudu-client-tools/build.gradle
+++ b/java/kudu-client-tools/build.gradle
@@ -20,15 +20,17 @@ apply from: "$rootDir/gradle/shadow.gradle"
 dependencies {
   compile project(":kudu-mapreduce")
   compile libs.guava
-  compile libs.slf4jApi
 
-  provided libs.hadoopClient
+  provided libs.hadoopMRClientCommon
+  provided libs.hadoopCommon
   provided libs.parquetHadoop
+  provided libs.slf4jApi
 
   optional libs.yetusAnnotations
 
   testCompile project(path: ":kudu-client", configuration: "shadowTest")
   testCompile project(path: ":kudu-mapreduce", configuration: "test")
+  testCompile libs.commonsIo
   testCompile libs.junit
   testCompile libs.log4j
   testCompile libs.slf4jLog4j12

http://git-wip-us.apache.org/repos/asf/kudu/blob/7f048739/java/kudu-client-tools/pom.xml
----------------------------------------------------------------------
diff --git a/java/kudu-client-tools/pom.xml b/java/kudu-client-tools/pom.xml
index 35e8162..35a45c7 100644
--- a/java/kudu-client-tools/pom.xml
+++ b/java/kudu-client-tools/pom.xml
@@ -50,15 +50,16 @@
                 </exclusion>
             </exclusions>
         </dependency>
+
         <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>${slf4j.version}</version>
+            <groupId>org.apache.hadoop</groupId>
+            <artifactId>hadoop-common</artifactId>
+            <version>${hadoop.version}</version>
+            <scope>provided</scope>
         </dependency>
-
         <dependency>
             <groupId>org.apache.hadoop</groupId>
-            <artifactId>hadoop-client</artifactId>
+            <artifactId>hadoop-mapreduce-client-common</artifactId>
             <version>${hadoop.version}</version>
             <scope>provided</scope>
         </dependency>
@@ -68,6 +69,12 @@
             <version>${parquet.version}</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>${slf4j.version}</version>
+            <scope>provided</scope>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.yetus</groupId>
@@ -91,6 +98,12 @@
             <scope>test</scope>
         </dependency>
         <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>${commons-io.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <version>${junit.version}</version>

http://git-wip-us.apache.org/repos/asf/kudu/blob/7f048739/java/kudu-client/build.gradle
----------------------------------------------------------------------
diff --git a/java/kudu-client/build.gradle b/java/kudu-client/build.gradle
index 3161f6c..3d4c25c 100644
--- a/java/kudu-client/build.gradle
+++ b/java/kudu-client/build.gradle
@@ -37,7 +37,6 @@ dependencies {
   optional libs.jsr305
   optional libs.yetusAnnotations
 
-  testCompile libs.commonsIo
   testCompile libs.hamcrestCore
   testCompile libs.junit
   testCompile libs.log4j

http://git-wip-us.apache.org/repos/asf/kudu/blob/7f048739/java/kudu-client/pom.xml
----------------------------------------------------------------------
diff --git a/java/kudu-client/pom.xml b/java/kudu-client/pom.xml
index ad3cd36..0d522e9 100644
--- a/java/kudu-client/pom.xml
+++ b/java/kudu-client/pom.xml
@@ -94,12 +94,6 @@
         </dependency>
 
         <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>${commons-io.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <version>${junit.version}</version>

http://git-wip-us.apache.org/repos/asf/kudu/blob/7f048739/java/kudu-client/src/test/java/org/apache/kudu/client/TestUtils.java
----------------------------------------------------------------------
diff --git a/java/kudu-client/src/test/java/org/apache/kudu/client/TestUtils.java b/java/kudu-client/src/test/java/org/apache/kudu/client/TestUtils.java
index 751cbd7..c3a12bd 100644
--- a/java/kudu-client/src/test/java/org/apache/kudu/client/TestUtils.java
+++ b/java/kudu-client/src/test/java/org/apache/kudu/client/TestUtils.java
@@ -95,6 +95,7 @@ public class TestUtils {
     // instead relying on setting -DbinDir for cases where the test libs may be in the Maven repo.
     // See the following code reviews for the discussion: https://gerrit.cloudera.org/5328 and
     // https://gerrit.cloudera.org/4630
+    // Note: Builds using Gradle do not have this issue.
 
     LOG.warn("Unable to find bin dir! codeSrcUrl={}", codeSrcUrl);
     return null;

http://git-wip-us.apache.org/repos/asf/kudu/blob/7f048739/java/kudu-flume-sink/build.gradle
----------------------------------------------------------------------
diff --git a/java/kudu-flume-sink/build.gradle b/java/kudu-flume-sink/build.gradle
index 72ae0cd..5767103 100644
--- a/java/kudu-flume-sink/build.gradle
+++ b/java/kudu-flume-sink/build.gradle
@@ -16,11 +16,11 @@
 // under the License.
 
 // Add the Avro plugin to support code generation from schema files.
+apply from: "$rootDir/gradle/shadow.gradle"
 apply plugin: "com.commercehub.gradle.plugin.avro"
 
 dependencies {
   compile project(path: ":kudu-client", configuration: "shadow")
-  compile libs.slf4jApi
 
   optional libs.yetusAnnotations
 
@@ -28,7 +28,8 @@ dependencies {
   provided libs.flumeConfiguration
   provided libs.flumeCore
   provided libs.guava
-  provided libs.hadoopClient
+  provided libs.hadoopCommon
+  provided libs.slf4jApi
 
   testCompile project(path: ":kudu-client", configuration: "shadowTest")
   testCompile libs.junit

http://git-wip-us.apache.org/repos/asf/kudu/blob/7f048739/java/kudu-flume-sink/pom.xml
----------------------------------------------------------------------
diff --git a/java/kudu-flume-sink/pom.xml b/java/kudu-flume-sink/pom.xml
index a585a19..6f585da 100644
--- a/java/kudu-flume-sink/pom.xml
+++ b/java/kudu-flume-sink/pom.xml
@@ -53,7 +53,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-client</artifactId>
+      <artifactId>hadoop-common</artifactId>
       <version>${hadoop.version}</version>
       <scope>provided</scope>
     </dependency>
@@ -96,7 +96,6 @@
           <artifactSet>
             <includes>
               <include>org.apache.kudu:kudu-client</include>
-              <include>org.slf4:slf4j-api</include>
               <include>com.stumbleupon:async</include>
             </includes>
           </artifactSet>

http://git-wip-us.apache.org/repos/asf/kudu/blob/7f048739/java/kudu-hive/build.gradle
----------------------------------------------------------------------
diff --git a/java/kudu-hive/build.gradle b/java/kudu-hive/build.gradle
index bff308a..bed5ae2 100644
--- a/java/kudu-hive/build.gradle
+++ b/java/kudu-hive/build.gradle
@@ -39,8 +39,10 @@ test {
   systemProperty "derby.stream.error.file", "$temporaryDir/derby.log"
 }
 
-
 // kudu-hive has no public Javadoc.
 javadoc {
   enabled = false
-}
\ No newline at end of file
+}
+
+// Skip publishing kudu-hive until it's ready to be supported long-term.
+uploadArchives.enabled = false
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/kudu/blob/7f048739/java/kudu-jepsen/build.gradle
----------------------------------------------------------------------
diff --git a/java/kudu-jepsen/build.gradle b/java/kudu-jepsen/build.gradle
index a0b326b..1f4ccc9 100644
--- a/java/kudu-jepsen/build.gradle
+++ b/java/kudu-jepsen/build.gradle
@@ -64,4 +64,7 @@ task runJepsen(type: JavaExec) {
       "--ssh-key-path=${sshKeyPath}",
       "--iter-num=${iterNum}"
   ]
-}
\ No newline at end of file
+}
+
+// We don't publish kudu-jepsen
+uploadArchives.enabled = false
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/kudu/blob/7f048739/java/kudu-mapreduce/build.gradle
----------------------------------------------------------------------
diff --git a/java/kudu-mapreduce/build.gradle b/java/kudu-mapreduce/build.gradle
index 0c40c8d..3789ed3 100644
--- a/java/kudu-mapreduce/build.gradle
+++ b/java/kudu-mapreduce/build.gradle
@@ -23,13 +23,15 @@ dependencies {
     exclude group: "org.slf4j", module: "slf4j-api"
   }
   compile libs.guava
-  compile libs.slf4jApi
 
-  provided libs.hadoopClient
+  provided libs.hadoopMRClientCommon
+  provided libs.hadoopCommon
+  provided libs.slf4jApi
 
   optional libs.yetusAnnotations
 
   testCompile project(path: ":kudu-client", configuration: "shadowTest")
+  testCompile libs.commonsIo
   testCompile libs.junit
   testCompile libs.log4j
   testCompile libs.slf4jLog4j12

http://git-wip-us.apache.org/repos/asf/kudu/blob/7f048739/java/kudu-mapreduce/pom.xml
----------------------------------------------------------------------
diff --git a/java/kudu-mapreduce/pom.xml b/java/kudu-mapreduce/pom.xml
index ee26955..a772ad4 100644
--- a/java/kudu-mapreduce/pom.xml
+++ b/java/kudu-mapreduce/pom.xml
@@ -62,17 +62,24 @@
                 </exclusion>
             </exclusions>
         </dependency>
+
+        <dependency>
+            <groupId>org.apache.hadoop</groupId>
+            <artifactId>hadoop-common</artifactId>
+            <version>${hadoop.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.hadoop</groupId>
+            <artifactId>hadoop-mapreduce-client-common</artifactId>
+            <version>${hadoop.version}</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
             <version>${slf4j.version}</version>
-        </dependency>
-
-        <dependency>
-          <groupId>org.apache.hadoop</groupId>
-          <artifactId>hadoop-client</artifactId>
-          <version>${hadoop.version}</version>
-          <scope>provided</scope>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
@@ -90,6 +97,12 @@
             <scope>test</scope>
         </dependency>
         <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>${commons-io.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
             <version>${log4j.version}</version>

http://git-wip-us.apache.org/repos/asf/kudu/blob/7f048739/java/kudu-spark-tools/build.gradle
----------------------------------------------------------------------
diff --git a/java/kudu-spark-tools/build.gradle b/java/kudu-spark-tools/build.gradle
index b32ab20..606d8ed 100644
--- a/java/kudu-spark-tools/build.gradle
+++ b/java/kudu-spark-tools/build.gradle
@@ -19,15 +19,14 @@ apply plugin: "scala"
 apply from: "$rootDir/gradle/shadow.gradle"
 
 dependencies {
-  compile project(path: ":kudu-client", configuration: "shadow")
   compile project(path: ":kudu-client-tools", configuration: "shadow")
   compile project(path: ":kudu-spark", configuration: "shadow")
-  compile libs.slf4jApi
 
   provided libs.scalaLibrary
   provided libs.sparkAvro
   provided libs.sparkCore
   provided libs.sparkSql
+  provided libs.slf4jApi
 
   optional libs.yetusAnnotations
 

http://git-wip-us.apache.org/repos/asf/kudu/blob/7f048739/java/kudu-spark-tools/pom.xml
----------------------------------------------------------------------
diff --git a/java/kudu-spark-tools/pom.xml b/java/kudu-spark-tools/pom.xml
index d97bac8..2bc79f0 100644
--- a/java/kudu-spark-tools/pom.xml
+++ b/java/kudu-spark-tools/pom.xml
@@ -34,11 +34,6 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.kudu</groupId>
-            <artifactId>kudu-client</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.kudu</groupId>
             <artifactId>kudu-client-tools</artifactId>
             <version>${project.version}</version>
         </dependency>
@@ -47,11 +42,6 @@
             <artifactId>kudu-${spark.version.label}_${scala.binary.version}</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>${slf4j.version}</version>
-        </dependency>
 
         <dependency>
             <groupId>com.databricks</groupId>
@@ -89,6 +79,12 @@
             <version>${scala.version}</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>${slf4j.version}</version>
+            <scope>provided</scope>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.yetus</groupId>

http://git-wip-us.apache.org/repos/asf/kudu/blob/7f048739/java/kudu-spark/build.gradle
----------------------------------------------------------------------
diff --git a/java/kudu-spark/build.gradle b/java/kudu-spark/build.gradle
index 8921d85..8ee217a 100644
--- a/java/kudu-spark/build.gradle
+++ b/java/kudu-spark/build.gradle
@@ -24,6 +24,7 @@ dependencies {
   provided libs.scalaLibrary
   provided libs.sparkCore
   provided libs.sparkSql
+  provided libs.slf4jApi
 
   optional libs.yetusAnnotations
 

http://git-wip-us.apache.org/repos/asf/kudu/blob/7f048739/java/kudu-spark/pom.xml
----------------------------------------------------------------------
diff --git a/java/kudu-spark/pom.xml b/java/kudu-spark/pom.xml
index 2e3bf55..09861f7 100644
--- a/java/kudu-spark/pom.xml
+++ b/java/kudu-spark/pom.xml
@@ -60,6 +60,12 @@
             <version>${scala.version}</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>${slf4j.version}</version>
+            <scope>provided</scope>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.yetus</groupId>
@@ -142,7 +148,6 @@
                     <artifactSet>
                         <includes>
                             <include>org.apache.kudu:kudu-client</include>
-                            <include>org.slf4:slf4j-api</include>
                             <include>com.stumbleupon:async</include>
                         </includes>
                     </artifactSet>