You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kudu.apache.org by da...@apache.org on 2017/08/21 19:35:59 UTC

kudu git commit: KUDU-2104. Upgrade to Spark 2.2.0

Repository: kudu
Updated Branches:
  refs/heads/master 055425245 -> 84096d89b


KUDU-2104. Upgrade to Spark 2.2.0

Upgrades to Spark 2.2.0 and documents the Java 8
runtime requirement.

Also adjusts the Jenkins scripts to use Java 8 when
building and running.

Change-Id: If3c179816f02fa8cc3e942e803851881dda0a014
Reviewed-on: http://gerrit.cloudera.org:8080/7720
Tested-by: Kudu Jenkins
Reviewed-by: Dan Burkert <da...@apache.org>


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

Branch: refs/heads/master
Commit: 84096d89bfb86a2021e9c62867a01cdd524a0473
Parents: 0554252
Author: Grant Henke <gr...@gmail.com>
Authored: Fri Aug 18 11:49:46 2017 -0500
Committer: Dan Burkert <da...@apache.org>
Committed: Mon Aug 21 19:35:36 2017 +0000

----------------------------------------------------------------------
 build-support/jenkins/build-and-test.sh | 4 ++--
 docs/developing.adoc                    | 3 +++
 docs/release_notes.adoc                 | 4 ++++
 java/README.md                          | 3 +++
 java/gradle/dependencies.gradle         | 2 +-
 java/pom.xml                            | 2 +-
 6 files changed, 14 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kudu/blob/84096d89/build-support/jenkins/build-and-test.sh
----------------------------------------------------------------------
diff --git a/build-support/jenkins/build-and-test.sh b/build-support/jenkins/build-and-test.sh
index 7789bd3..6b735a3 100755
--- a/build-support/jenkins/build-and-test.sh
+++ b/build-support/jenkins/build-and-test.sh
@@ -348,8 +348,8 @@ if [ "$BUILD_JAVA" == "1" ]; then
   echo Building and testing java...
   echo ------------------------------------------------------------
 
-  # Make sure we use JDK7
-  export JAVA_HOME=$JAVA7_HOME
+  # Make sure we use JDK8
+  export JAVA_HOME=$JAVA8_HOME
   export PATH=$JAVA_HOME/bin:$PATH
   pushd $SOURCE_ROOT/java
   export TSAN_OPTIONS="$TSAN_OPTIONS suppressions=$SOURCE_ROOT/build-support/tsan-suppressions.txt history_size=7"

http://git-wip-us.apache.org/repos/asf/kudu/blob/84096d89/docs/developing.adoc
----------------------------------------------------------------------
diff --git a/docs/developing.adoc b/docs/developing.adoc
index 1cc6312..1064ba2 100644
--- a/docs/developing.adoc
+++ b/docs/developing.adoc
@@ -159,6 +159,9 @@ kuduContext.deleteTable("unwanted_table")
 
 === Spark Integration Known Issues and Limitations
 
+- Spark 2.2+ requires Java 8 at runtime even though Kudu Spark 2.x integration
+  is Java 7 compatible. Spark 2.2 is the default dependency version as of
+  Kudu 1.5.0.
 - Kudu tables with a name containing upper case or non-ascii characters must be
   assigned an alternate name when registered as a temporary table.
 - Kudu tables with a column name containing upper case or non-ascii characters

http://git-wip-us.apache.org/repos/asf/kudu/blob/84096d89/docs/release_notes.adoc
----------------------------------------------------------------------
diff --git a/docs/release_notes.adoc b/docs/release_notes.adoc
index 6e589b4..1a95887 100644
--- a/docs/release_notes.adoc
+++ b/docs/release_notes.adoc
@@ -38,6 +38,10 @@
   storage format changes, downgrading to versions 1.3 or earlier is not
   supported and will result in an error.
 
+* Spark 2.2+ requires Java 8 at runtime even though Kudu Spark 2.x integration
+  is Java 7 compatible. Spark 2.2 is the default dependency version as of
+  Kudu 1.5.0.
+
 [[rn_1.5.0_deprecations]]
 == Deprecations
 

http://git-wip-us.apache.org/repos/asf/kudu/blob/84096d89/java/README.md
----------------------------------------------------------------------
diff --git a/java/README.md b/java/README.md
index f94b373..775e2b9 100644
--- a/java/README.md
+++ b/java/README.md
@@ -70,6 +70,9 @@ The two artifactIds are
 WARNING: Support for Spark 1 is deprecated as of Kudu 1.5.0 and may be removed in
 the next minor release.
 
+WARNING: Spark 2.2+ requires Java 8 at runtime even though Kudu Spark 2.x integration
+is Java 7 compatible. Spark 2.2 is the default dependency version as of Kudu 1.5.0.
+
 State of Eclipse integration
 ------------------------------------------------------------
 

http://git-wip-us.apache.org/repos/asf/kudu/blob/84096d89/java/gradle/dependencies.gradle
----------------------------------------------------------------------
diff --git a/java/gradle/dependencies.gradle b/java/gradle/dependencies.gradle
index 626f9d3..b69f40d 100755
--- a/java/gradle/dependencies.gradle
+++ b/java/gradle/dependencies.gradle
@@ -67,7 +67,7 @@ versions["scalaBase"] = versions.scala.substring(0, versions.scala.lastIndexOf("
 
 // Set the Spark version based on the Scala version.
 def spark1Version = "1.6.3"
-def spark2Version = "2.1.1"
+def spark2Version = "2.2.0"
 if ("$versions.scalaBase" == "2.10") {
   versions["spark"] = spark1Version
 } else {

http://git-wip-us.apache.org/repos/asf/kudu/blob/84096d89/java/pom.xml
----------------------------------------------------------------------
diff --git a/java/pom.xml b/java/pom.xml
index f3befea..20b9eff 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -93,7 +93,7 @@
         <scala-2.11.version>2.11.11</scala-2.11.version>
         <scalatest.version>3.0.3</scalatest.version>
         <spark1.version>1.6.3</spark1.version>
-        <spark2.version>2.1.1</spark2.version>
+        <spark2.version>2.2.0</spark2.version>
 
         <!-- Misc variables -->
         <testdata.dir>target/testdata</testdata.dir>