You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by kr...@apache.org on 2019/03/29 21:53:29 UTC
[calcite] branch master updated: [CALCITE-2961] Enable Travis to
test against JDK 13
This is an automated email from the ASF dual-hosted git repository.
krisden pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/calcite.git
The following commit(s) were added to refs/heads/master by this push:
new 5cdf856 [CALCITE-2961] Enable Travis to test against JDK 13
5cdf856 is described below
commit 5cdf8562e1aaf97d5ba16ccafc3e16a96966561d
Author: Kevin Risden <kr...@apache.org>
AuthorDate: Fri Mar 29 15:19:05 2019 -0400
[CALCITE-2961] Enable Travis to test against JDK 13
Signed-off-by: Kevin Risden <kr...@apache.org>
---
.travis.yml | 1 +
.../test/java/org/apache/calcite/test/CassandraAdapterTest.java | 9 ++++-----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 6099a04..ceec9dc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,6 +20,7 @@ language: java
matrix:
fast_finish: true
include:
+ - env: IMAGE=maven:3-jdk-13
- env: IMAGE=maven:3-jdk-12
- env: IMAGE=maven:3-jdk-11 JDOC=Y RAT=Y
- env: IMAGE=maven:3-jdk-10 SLOW_TESTS=Y
diff --git a/cassandra/src/test/java/org/apache/calcite/test/CassandraAdapterTest.java b/cassandra/src/test/java/org/apache/calcite/test/CassandraAdapterTest.java
index 4574586..5f18f99 100644
--- a/cassandra/src/test/java/org/apache/calcite/test/CassandraAdapterTest.java
+++ b/cassandra/src/test/java/org/apache/calcite/test/CassandraAdapterTest.java
@@ -46,7 +46,7 @@ import static org.junit.Assume.assumeTrue;
* <p>Will start embedded cassandra cluster and populate it from local {@code twissandra.cql} file.
* All configuration files are located in test classpath.
*
- * <p>Note that tests will be skipped if running on JDK11 and JDK12
+ * <p>Note that tests will be skipped if running on JDK11+
* (which is not yet supported by cassandra) see
* <a href="https://issues.apache.org/jira/browse/CASSANDRA-9608">CASSANDRA-9608</a>.
*
@@ -74,8 +74,8 @@ public class CassandraAdapterTest {
* version (see below).
*
* <p>As of this wiring Cassandra 4.x is not yet released and we're using 3.x
- * (which fails on JDK11 and JDK12). All cassandra tests will be skipped if
- * running on JDK11 and JDK12.
+ * (which fails on JDK11+). All cassandra tests will be skipped if
+ * running on JDK11+.
*
* @see <a href="https://issues.apache.org/jira/browse/CASSANDRA-9608">CASSANDRA-9608</a>
* @return {@code true} if test is compatible with current environment,
@@ -84,8 +84,7 @@ public class CassandraAdapterTest {
private static boolean enabled() {
final boolean enabled = CalciteSystemProperty.TEST_CASSANDRA.value();
Bug.upgrade("remove JDK version check once current adapter supports Cassandra 4.x");
- final boolean compatibleJdk = TestUtil.getJavaMajorVersion() != 11
- && TestUtil.getJavaMajorVersion() != 12;
+ final boolean compatibleJdk = TestUtil.getJavaMajorVersion() < 11;
return enabled && compatibleJdk;
}