Repository: orc Updated Branches: refs/heads/master 360a2af98 -> 72a68866a
ORC-399. Move Java compiler to version 8. Fixes #305 Signed-off-by: Owen O'Malley <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/orc/repo Commit: http://git-wip-us.apache.org/repos/asf/orc/commit/72a68866 Tree: http://git-wip-us.apache.org/repos/asf/orc/tree/72a68866 Diff: http://git-wip-us.apache.org/repos/asf/orc/diff/72a68866 Branch: refs/heads/master Commit: 72a68866ae1a7e5878f231b1d9d82eb7bdd516f6 Parents: 360a2af Author: Owen O'Malley <[email protected]> Authored: Fri Aug 31 15:21:49 2018 -0700 Committer: Owen O'Malley <[email protected]> Committed: Sat Sep 1 18:41:28 2018 -0700 ---------------------------------------------------------------------- .travis.yml | 4 ++-- java/bench/pom.xml | 8 ++++++++ java/pom.xml | 4 ++-- 3 files changed, 12 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/orc/blob/72a68866/.travis.yml ---------------------------------------------------------------------- diff --git a/.travis.yml b/.travis.yml index d27a890..66c7992 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,8 +14,8 @@ matrix: script: - mkdir build - cd build - - cmake -DANALYZE_JAVA=ON -DTEST_VALGRIND_MEMCHECK=ON .. - - travis_wait 35 make package test-out + - cmake -DANALYZE_JAVA=ON .. + - make package test-out - compiler: clang os: linux addons: http://git-wip-us.apache.org/repos/asf/orc/blob/72a68866/java/bench/pom.xml ---------------------------------------------------------------------- diff --git a/java/bench/pom.xml b/java/bench/pom.xml index aed26b6..13fa93c 100644 --- a/java/bench/pom.xml +++ b/java/bench/pom.xml @@ -285,6 +285,14 @@ <version>${hive.version}</version> <exclusions> <exclusion> + <groupId>org.apache.calcite</groupId> + <artifactId>calcite-core</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.calcite</groupId> + <artifactId>calcite-druid</artifactId> + </exclusion> + <exclusion> <groupId>org.apache.calcite.avatica</groupId> <artifactId>avatica</artifactId> </exclusion> http://git-wip-us.apache.org/repos/asf/orc/blob/72a68866/java/pom.xml ---------------------------------------------------------------------- diff --git a/java/pom.xml b/java/pom.xml index 6b30faf..16874e2 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -266,8 +266,8 @@ <artifactId>maven-compiler-plugin</artifactId> <version>3.1</version> <configuration> - <source>1.7</source> - <target>1.7</target> + <source>1.8</source> + <target>1.8</target> </configuration> </plugin> <plugin>
