From 92fe6d4f2629b12b69ef4278ac664d54373af8b5 Mon Sep 17 00:00:00 2001
From: Laurent Goujon <laurent@dremio.com>
Date: Tue, 15 Aug 2017 11:21:45 -0700
Subject: [PATCH 1/4] Make Arrow buildable with jdk9

---
 .travis.yml        | 5 +++++
 java/pom.xml       | 6 +++---
 java/tools/pom.xml | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b93f1c2519b..098013b30d3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -84,6 +84,11 @@ matrix:
     jdk: openjdk8
     script:
     - $TRAVIS_BUILD_DIR/ci/travis_script_java.sh
+  - language: java
+    os: linux
+    jdk: openjdk9
+    script:
+    - $TRAVIS_BUILD_DIR/ci/travis_script_java.sh
   - language: java
     os: linux
     env: ARROW_TEST_GROUP=integration
diff --git a/java/pom.xml b/java/pom.xml
index f205f6464f7..ed94e1e9412 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -279,7 +279,7 @@
             <dependency>
               <groupId>com.puppycrawl.tools</groupId>
               <artifactId>checkstyle</artifactId>
-              <version>6.15</version>
+              <version>6.19</version>
             </dependency>
             <dependency>
               <groupId>com.google.guava</groupId>
@@ -493,9 +493,9 @@
 
     <dependency>
       <!-- JMockit needs to be on class path before JUnit. -->
-      <groupId>com.googlecode.jmockit</groupId>
+      <groupId>org.jmockit</groupId>
       <artifactId>jmockit</artifactId>
-      <version>1.7</version>
+      <version>1.33</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/java/tools/pom.xml b/java/tools/pom.xml
index f1a7dcd68e4..e2e3f8129c7 100644
--- a/java/tools/pom.xml
+++ b/java/tools/pom.xml
@@ -57,7 +57,7 @@
       <plugins>
         <plugin>
           <artifactId>maven-assembly-plugin</artifactId>
-          <version>2.6</version>
+          <version>3.0.0</version>
           <configuration>
             <descriptorRefs>
               <descriptorRef>jar-with-dependencies</descriptorRef>

From d62d4096f5b9ce326f197d7ea75d327cf33d1756 Mon Sep 17 00:00:00 2001
From: Laurent Goujon <laurent@dremio.com>
Date: Tue, 15 Aug 2017 12:42:03 -0700
Subject: [PATCH 2/4] Fix travis id for jdk9

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 098013b30d3..71701325bb2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -86,7 +86,7 @@ matrix:
     - $TRAVIS_BUILD_DIR/ci/travis_script_java.sh
   - language: java
     os: linux
-    jdk: openjdk9
+    jdk: oraclejdk9
     script:
     - $TRAVIS_BUILD_DIR/ci/travis_script_java.sh
   - language: java

From b3e58225582e8d653f3ea6f9afb0303bd6473940 Mon Sep 17 00:00:00 2001
From: Laurent Goujon <laurent@dremio.com>
Date: Thu, 17 Aug 2017 10:50:12 -0700
Subject: [PATCH 3/4] Update plugin version according to Maven team
 recommendations

Using recommended versions from https://cwiki.apache.org/confluence/display/MAVEN/Java+9+-+Jigsaw
---
 java/pom.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/java/pom.xml b/java/pom.xml
index ed94e1e9412..cfcfcd448f0 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -333,15 +333,15 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.2</version>
+          <version>3.6.2</version>
         </plugin>
         <plugin>
           <artifactId>maven-enforcer-plugin</artifactId>
-          <version>1.3.1</version>
+          <version>3.0.0-M1</version>
         </plugin>
         <plugin>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.17</version>
+          <version>2.20</version>
           <configuration>
             <enableAssertions>true</enableAssertions>
             <forkCount>${forkCount}</forkCount>
@@ -537,7 +537,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.9</version>
+        <version>3.0.0-M1</version>
         <reportSets>
           <reportSet><!-- by default, id = "default" -->
             <reports><!-- select non-aggregate reports -->

From d009d012f051f81884e869b7a103662b97fb0bb2 Mon Sep 17 00:00:00 2001
From: Laurent Goujon <laurent@dremio.com>
Date: Thu, 17 Aug 2017 10:54:44 -0700
Subject: [PATCH 4/4] Make mvn site optional since not working yet with jdk9

---
 .travis.yml              | 1 +
 ci/travis_script_java.sh | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 71701325bb2..016d1110720 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -86,6 +86,7 @@ matrix:
     - $TRAVIS_BUILD_DIR/ci/travis_script_java.sh
   - language: java
     os: linux
+    env: ARROW_TRAVIS_SKIP_SITE=yes
     jdk: oraclejdk9
     script:
     - $TRAVIS_BUILD_DIR/ci/travis_script_java.sh
diff --git a/ci/travis_script_java.sh b/ci/travis_script_java.sh
index 2f6b685253b..58e5d42708b 100755
--- a/ci/travis_script_java.sh
+++ b/ci/travis_script_java.sh
@@ -24,8 +24,7 @@ JAVA_DIR=${TRAVIS_BUILD_DIR}/java
 pushd $JAVA_DIR
 
 export MAVEN_OPTS="$MAVEN_OPTS -Dorg.slf4j.simpleLogger.defaultLogLevel=warn"
-mvn -B test
 mvn -B install
-mvn -B site
+[ "${ARROW_TRAVIS_SKIP_SITE}" = "yes" ] || mvn -B site
 
 popd