Repository: kudu
Updated Branches:
  refs/heads/master 70e1a9caa -> 133ef7e9d


[java] Update dependencies and plugins

Note: Also removes a use of Objects.toStringHelper in
kudu-mapreduce as a workaround to maven’s shaded
module dependency issues and breaking Guava changes.

Change-Id: Ie8323ede9d7aae70bb95086542747704d2dac3a7
Reviewed-on: http://gerrit.cloudera.org:8080/9990
Reviewed-by: Adar Dembo <a...@cloudera.com>
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/133ef7e9
Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/133ef7e9
Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/133ef7e9

Branch: refs/heads/master
Commit: 133ef7e9dc469927a5b5e6ecec2cb24af91719ac
Parents: 70e1a9c
Author: Grant Henke <granthe...@apache.org>
Authored: Tue Mar 27 23:03:16 2018 -0500
Committer: Grant Henke <granthe...@apache.org>
Committed: Thu Apr 12 17:51:13 2018 +0000

----------------------------------------------------------------------
 docs/release_notes.adoc                         |  7 ++++
 java/buildSrc/build.gradle                      |  4 +-
 java/gradle.properties                          | 13 +++---
 java/gradle/dependencies.gradle                 | 28 +++++++------
 java/gradlew                                    |  4 +-
 java/kudu-client/pom.xml                        |  2 +-
 .../kudu/mapreduce/KuduTableInputFormat.java    | 13 +++---
 java/pom.xml                                    | 44 +++++++++++---------
 8 files changed, 68 insertions(+), 47 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kudu/blob/133ef7e9/docs/release_notes.adoc
----------------------------------------------------------------------
diff --git a/docs/release_notes.adoc b/docs/release_notes.adoc
index d18124b..575e800 100644
--- a/docs/release_notes.adoc
+++ b/docs/release_notes.adoc
@@ -31,6 +31,13 @@
 [[rn_1.8.0_upgrade_notes]]
 == Upgrade Notes
 
+* Flume 1.8+ requires Java 8 at runtime even though the Kudu Flume integration
+  is Java 7 compatible. Flume 1.8 is the default dependency version as of
+  Kudu 1.8.0.
+
+* Hadoop 3.0+ requires Java 8 at runtime even though the Kudu Hadoop 
integration
+  is Java 7 compatible. Hadoop 3.1 is the default dependency version as of
+  Kudu 1.8.0.
 
 [[rn_1.8.0_obsoletions]]
 == Obsoletions

http://git-wip-us.apache.org/repos/asf/kudu/blob/133ef7e9/java/buildSrc/build.gradle
----------------------------------------------------------------------
diff --git a/java/buildSrc/build.gradle b/java/buildSrc/build.gradle
index 4cd37eb..08a9982 100644
--- a/java/buildSrc/build.gradle
+++ b/java/buildSrc/build.gradle
@@ -30,8 +30,8 @@ repositories {
 dependencies {
   compile "com.commercehub.gradle.plugin:gradle-avro-plugin:0.14.0"
   compile "com.github.ben-manes:gradle-versions-plugin:0.17.0"
-  compile "com.github.jengelman.gradle.plugins:shadow:2.0.2"
-  compile "com.google.protobuf:protobuf-gradle-plugin:0.8.4"
+  compile "com.github.jengelman.gradle.plugins:shadow:2.0.3"
+  compile "com.google.protobuf:protobuf-gradle-plugin:0.8.5"
   compile "com.netflix.nebula:nebula-clojure-plugin:5.0.6"
   compile "io.spring.gradle:propdeps-plugin:0.0.9.RELEASE"
   compile "ru.vyarus:gradle-animalsniffer-plugin:1.4.3"

http://git-wip-us.apache.org/repos/asf/kudu/blob/133ef7e9/java/gradle.properties
----------------------------------------------------------------------
diff --git a/java/gradle.properties b/java/gradle.properties
index 2d2ce50..6d03f76 100755
--- a/java/gradle.properties
+++ b/java/gradle.properties
@@ -40,11 +40,14 @@ encoding = UTF-8
 # Maximum parallel forks to use while unit testing.
 maxParallelForks = 1
 
+# Warn about deprecated gradle usage
+org.gradle.warning.mode = all
+
 # Flags to speed up the gradle build.
 # https://docs.gradle.org/current/userguide/build_environment.html
-org.gradle.daemon=true
+org.gradle.daemon = true
 # The below configurations are experimental but a nice performance boost.
-# org.gradle.caching=true
-# org.gradle.configureondemand=true
-# org.gradle.parallel=true
-# org.gradle.workers.max=4
+# org.gradle.caching = true
+# org.gradle.configureondemand = true
+# org.gradle.parallel = true
+# org.gradle.workers.max = 4

http://git-wip-us.apache.org/repos/asf/kudu/blob/133ef7e9/java/gradle/dependencies.gradle
----------------------------------------------------------------------
diff --git a/java/gradle/dependencies.gradle b/java/gradle/dependencies.gradle
index 12635b5..6f04c20 100755
--- a/java/gradle/dependencies.gradle
+++ b/java/gradle/dependencies.gradle
@@ -27,33 +27,37 @@ ext {
 versions += [
     async          : "1.4.1",
     avro           : "1.8.2",
-    clojure        : "1.8.0",
+    clojure        : "1.9.0",
     clojureToolsCli: "0.3.5",
     commonsIo      : "2.6",
     findbugs       : "3.0.1",
-    flume          : "1.7.0",
-    gradle         : "4.5.1",
-    guava          : "20.0",
-    hadoop         : "2.9.0",
+    flume          : "1.8.0",
+    gradle         : "4.6",
+    // We use the android version instead of the jre version
+    // to maintain Java 1.7 compatibility.
+    guava          : "24.1-android",
+    hadoop         : "3.1.0",
     hamcrest       : "1.3",
-    hive           : "2.3.2",
+    hive           : "2.3.3",
     jepsen         : "0.1.5",
     jsr305         : "3.0.2",
     junit          : "4.12",
     log4j          : "1.2.17",
-    mockito        : "2.15.0",
+    mockito        : "2.18.0",
     murmur         : "1.0.0",
     netty          : "3.10.6.Final",
     parquet        : "1.9.0",
     pmd            : "5.8.1",
-    // Upgrading protobuf breaks el6 compatibility
+    protobuf       : "3.5.1",
+    // protoc is generally the same version as protobuf
+    // This is a workaround for
     // https://github.com/google/protobuf/issues/4109
-    protobuf       : "3.4.0",
+    protoc         : "3.5.1-1",
     scala          : "2.11.12",
     scalatest      : "3.0.5",
     slf4j          : "1.7.25",
-    spark          : "2.2.1",
-    sparkAvro      : "3.2.0",
+    spark          : "2.3.0",
+    sparkAvro      : "4.0.0",
     yetus          : "0.7.0"
 ]
 
@@ -90,7 +94,7 @@ libs += [
     netty             : "io.netty:netty:$versions.netty",
     parquetHadoop     : "org.apache.parquet:parquet-hadoop:$versions.parquet",
     protobufJava      : "com.google.protobuf:protobuf-java:$versions.protobuf",
-    protoc            : "com.google.protobuf:protoc:$versions.protobuf",
+    protoc            : "com.google.protobuf:protoc:$versions.protoc",
     scalaLibrary      : "org.scala-lang:scala-library:$versions.scala",
     scalatest         : 
"org.scalatest:scalatest_$versions.scalaBase:$versions.scalatest",
     slf4jApi          : "org.slf4j:slf4j-api:$versions.slf4j",

http://git-wip-us.apache.org/repos/asf/kudu/blob/133ef7e9/java/gradlew
----------------------------------------------------------------------
diff --git a/java/gradlew b/java/gradlew
index 5751ddd..7b21bed 100755
--- a/java/gradlew
+++ b/java/gradlew
@@ -81,10 +81,10 @@ esac
 
 mkdir -p $APP_HOME/gradle/wrapper
 if [ ! -e $APP_HOME/gradle/wrapper/gradle-wrapper.jar ]; then
-   curl -o $APP_HOME/gradle/wrapper/gradle-wrapper.jar 
https://raw.githubusercontent.com/gradle/gradle/v4.5.1/gradle/wrapper/gradle-wrapper.jar
+   curl -o $APP_HOME/gradle/wrapper/gradle-wrapper.jar 
https://raw.githubusercontent.com/gradle/gradle/v4.6.0/gradle/wrapper/gradle-wrapper.jar
 fi
 if [ ! -e $APP_HOME/gradle/wrapper/gradle-wrapper.properties ]; then
-   curl -o $APP_HOME/gradle/wrapper/gradle-wrapper.properties 
https://raw.githubusercontent.com/gradle/gradle/v4.5.1/gradle/wrapper/gradle-wrapper.properties
+   curl -o $APP_HOME/gradle/wrapper/gradle-wrapper.properties 
https://raw.githubusercontent.com/gradle/gradle/v4.6.0/gradle/wrapper/gradle-wrapper.properties
 fi
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar

http://git-wip-us.apache.org/repos/asf/kudu/blob/133ef7e9/java/kudu-client/pom.xml
----------------------------------------------------------------------
diff --git a/java/kudu-client/pom.xml b/java/kudu-client/pom.xml
index 7481a8e..75c7974 100644
--- a/java/kudu-client/pom.xml
+++ b/java/kudu-client/pom.xml
@@ -146,7 +146,7 @@
                     <excludes>
                       <exclude>**/*test*.proto</exclude>
                     </excludes>
-                    
<protocArtifact>com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}</protocArtifact>
+                    
<protocArtifact>com.google.protobuf:protoc:${protoc.version}:exe:${os.detected.classifier}</protocArtifact>
                 </configuration>
                 <executions>
                     <execution>

http://git-wip-us.apache.org/repos/asf/kudu/blob/133ef7e9/java/kudu-mapreduce/src/main/java/org/apache/kudu/mapreduce/KuduTableInputFormat.java
----------------------------------------------------------------------
diff --git 
a/java/kudu-mapreduce/src/main/java/org/apache/kudu/mapreduce/KuduTableInputFormat.java
 
b/java/kudu-mapreduce/src/main/java/org/apache/kudu/mapreduce/KuduTableInputFormat.java
index aa8d877..cbf12f6 100644
--- 
a/java/kudu-mapreduce/src/main/java/org/apache/kudu/mapreduce/KuduTableInputFormat.java
+++ 
b/java/kudu-mapreduce/src/main/java/org/apache/kudu/mapreduce/KuduTableInputFormat.java
@@ -29,7 +29,6 @@ import java.util.List;
 import java.util.Map;
 import javax.naming.NamingException;
 
-import com.google.common.base.Objects;
 import com.google.common.base.Splitter;
 import com.google.common.collect.Lists;
 import com.google.common.primitives.UnsignedBytes;
@@ -392,10 +391,14 @@ public class KuduTableInputFormat extends 
InputFormat<NullWritable, RowResult>
 
     @Override
     public String toString() {
-      return Objects.toStringHelper(this)
-                    .add("partitionKey", Bytes.pretty(partitionKey))
-                    .add("locations", Arrays.toString(locations))
-                    .toString();
+      StringBuilder sb = new StringBuilder();
+      sb.append("TableSplit{");
+      sb.append("partitionKey=");
+      sb.append(Bytes.pretty(partitionKey));
+      sb.append(", locations=");
+      sb.append(Arrays.toString(locations));
+      sb.append("}");
+      return sb.toString();
     }
   }
 

http://git-wip-us.apache.org/repos/asf/kudu/blob/133ef7e9/java/pom.xml
----------------------------------------------------------------------
diff --git a/java/pom.xml b/java/pom.xml
index 39f2f97..28c1876 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -48,53 +48,57 @@
         
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
         <!-- Maven plugins -->
-        <clojure-maven-plugin.version>1.7.1</clojure-maven-plugin.version>
+        <clojure-maven-plugin.version>1.8.1</clojure-maven-plugin.version>
         <maven-antrun-plugin.version>1.8</maven-antrun-plugin.version>
-        <maven-assembly-plugin.version>3.0.0</maven-assembly-plugin.version>
-        <maven-checkstyle-plugin.version>2.17</maven-checkstyle-plugin.version>
-        <maven-compiler-plugin.version>3.6.2</maven-compiler-plugin.version>
+        <maven-assembly-plugin.version>3.1.0</maven-assembly-plugin.version>
+        
<maven-checkstyle-plugin.version>3.0.0</maven-checkstyle-plugin.version>
+        <maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
         <maven-enforcer-plugin.version>1.4.1</maven-enforcer-plugin.version>
-        <!-- Note: Bumping maven-failsafe-plugin to 2.19+ breaks the 
integration tests due to shading issues -->
+        <!-- Note: Bumping maven-failsafe-plugin to 2.19+ (2.21) breaks the 
integration tests due to shading issues -->
         <maven-failsafe-plugin.version>2.18</maven-failsafe-plugin.version>
         <maven-os-plugin.version>1.5.0.Final</maven-os-plugin.version>
-        <maven-jar-plugin.version>3.0.2</maven-jar-plugin.version>
-        <maven-javadoc-plugin.version>2.10.4</maven-javadoc-plugin.version>
-        <maven-protoc-plugin.version>0.5.0</maven-protoc-plugin.version>
-        <maven-shade-plugin.version>3.0.0</maven-shade-plugin.version>
-        <maven-surefire-plugin.version>2.20</maven-surefire-plugin.version>
-        <scala-maven-plugin.version>3.2.2</scala-maven-plugin.version>
+        <maven-jar-plugin.version>3.1.0</maven-jar-plugin.version>
+        <maven-javadoc-plugin.version>3.0.0</maven-javadoc-plugin.version>
+        <maven-protoc-plugin.version>0.5.1</maven-protoc-plugin.version>
+        <maven-shade-plugin.version>3.1.1</maven-shade-plugin.version>
+        <maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
+        <scala-maven-plugin.version>3.3.2</scala-maven-plugin.version>
 
         <!-- Library dependencies -->
         <async.version>1.4.1</async.version>
         <avro.version>1.8.2</avro.version>
         <clojure.tools.version>0.3.5</clojure.tools.version>
-        <clojure.version>1.8.0</clojure.version>
+        <clojure.version>1.9.0</clojure.version>
         <commons-io.version>2.6</commons-io.version>
-        <flume.version>1.7.0</flume.version>
-        <guava.version>20.0</guava.version>
-        <hadoop.version>2.9.0</hadoop.version>
+        <flume.version>1.8.0</flume.version>
+
+        <guava.version>24.1-android</guava.version>
+        <hadoop.version>3.1.0</hadoop.version>
         <hamcrest-core.version>1.3</hamcrest-core.version>
-        <hive.version>2.3.2</hive.version>
+        <hive.version>2.3.3</hive.version>
         <jepsen.version>0.1.5</jepsen.version>
         <jsr305.version>3.0.2</jsr305.version>
         <junit.version>4.12</junit.version>
         <log4j.version>1.2.17</log4j.version>
-        <mockito-core.version>2.15.0</mockito-core.version>
+        <mockito-core.version>2.18.0</mockito-core.version>
         <murmur.version>1.0.0</murmur.version>
         <netty.version>3.10.6.Final</netty.version>
         <parquet.version>1.9.0</parquet.version>
         <!-- Upgrading protobuf breaks el6 compatibility
              https://github.com/google/protobuf/issues/4109 -->
-        <protobuf.version>3.4.0</protobuf.version>
+        <protobuf.version>3.5.1</protobuf.version>
+        <!--  This is a workaround for
+              https://github.com/google/protobuf/issues/4109 -->
+        <protoc.version>3.5.1-1</protoc.version>
         <slf4j.version>1.7.25</slf4j.version>
-        <sparkavro.version>3.2.0</sparkavro.version>
+        <sparkavro.version>4.0.0</sparkavro.version>
         <yetus.version>0.7.0</yetus.version>
 
         <!-- Scala Library dependencies -->
         <scala.binary.version>2.11</scala.binary.version>
         <scala.version>2.11.12</scala.version>
         <scalatest.version>3.0.5</scalatest.version>
-        <spark.version>2.2.1</spark.version>
+        <spark.version>2.3.0</spark.version>
         <spark.version.label>spark2</spark.version.label>
 
         <!-- Misc variables -->

Reply via email to