arrow-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From w...@apache.org
Subject arrow git commit: ARROW-1355: [Java] Make Arrow buildable with jdk9
Date Thu, 17 Aug 2017 20:38:08 GMT
Repository: arrow
Updated Branches:
  refs/heads/master 3c5290a7b -> 4ef7c898b


ARROW-1355: [Java] Make Arrow buildable with jdk9

Make Arrow buildable with jdk9:
- upgrade checkstyle plugin to 6.19
- upgrade assembly plugin to 3.0.0
- update jmockit version to 1.33

Also add travis entry to build using Oracle JDK9 EA

Author: Laurent Goujon <laurent@dremio.com>

Closes #966 from laurentgo/laurent/jdk-9 and squashes the following commits:

d009d012 [Laurent Goujon] Make mvn site optional since not working yet with jdk9
b3e58225 [Laurent Goujon] Update plugin version according to Maven team recommendations
d62d4096 [Laurent Goujon] Fix travis id for jdk9
92fe6d4f [Laurent Goujon] Make Arrow buildable with jdk9


Project: http://git-wip-us.apache.org/repos/asf/arrow/repo
Commit: http://git-wip-us.apache.org/repos/asf/arrow/commit/4ef7c898
Tree: http://git-wip-us.apache.org/repos/asf/arrow/tree/4ef7c898
Diff: http://git-wip-us.apache.org/repos/asf/arrow/diff/4ef7c898

Branch: refs/heads/master
Commit: 4ef7c898bb82cd3513e0ad3d80730e29ebaeb60e
Parents: 3c5290a
Author: Laurent Goujon <laurent@dremio.com>
Authored: Thu Aug 17 16:38:03 2017 -0400
Committer: Wes McKinney <wes.mckinney@twosigma.com>
Committed: Thu Aug 17 16:38:03 2017 -0400

----------------------------------------------------------------------
 .travis.yml              |  6 ++++++
 ci/travis_script_java.sh |  3 +--
 java/pom.xml             | 14 +++++++-------
 java/tools/pom.xml       |  2 +-
 4 files changed, 15 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/arrow/blob/4ef7c898/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index b93f1c2..016d111 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -86,6 +86,12 @@ 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
+  - language: java
+    os: linux
     env: ARROW_TEST_GROUP=integration
     jdk: openjdk7
     before_script:

http://git-wip-us.apache.org/repos/asf/arrow/blob/4ef7c898/ci/travis_script_java.sh
----------------------------------------------------------------------
diff --git a/ci/travis_script_java.sh b/ci/travis_script_java.sh
index 2f6b685..58e5d42 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

http://git-wip-us.apache.org/repos/asf/arrow/blob/4ef7c898/java/pom.xml
----------------------------------------------------------------------
diff --git a/java/pom.xml b/java/pom.xml
index f205f64..cfcfcd4 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>
@@ -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>
@@ -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>
@@ -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 -->

http://git-wip-us.apache.org/repos/asf/arrow/blob/4ef7c898/java/tools/pom.xml
----------------------------------------------------------------------
diff --git a/java/tools/pom.xml b/java/tools/pom.xml
index f1a7dcd..e2e3f81 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>


Mime
View raw message