You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@calcite.apache.org by Julian Hyde <jh...@apache.org> on 2018/11/07 22:04:15 UTC
Re: calcite git commit: CALCITE-2655 - Enable Travis to test against
JDK 12
Can you force-push to change the message to
[CALCITE-2655] Enable Travis to test against JDK 12
Sorry to be pedantic, but having a consistent format for commit comments helps.
> On Nov 7, 2018, at 1:46 PM, krisden@apache.org wrote:
>
> Repository: calcite
> Updated Branches:
> refs/heads/master 06197d3bb -> c5ace08c8
>
>
> CALCITE-2655 - Enable Travis to test against JDK 12
>
> Signed-off-by: Kevin Risden <kr...@apache.org>
>
>
> Project: http://git-wip-us.apache.org/repos/asf/calcite/repo
> Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/c5ace08c
> Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/c5ace08c
> Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/c5ace08c
>
> Branch: refs/heads/master
> Commit: c5ace08c8a3296ce3c160cd483f57ab1de1c13d2
> Parents: 06197d3
> Author: Kevin Risden <kr...@apache.org>
> Authored: Tue Nov 6 11:30:50 2018 -0500
> Committer: Kevin Risden <kr...@apache.org>
> Committed: Wed Nov 7 16:21:21 2018 -0500
>
> ----------------------------------------------------------------------
> .travis.yml | 3 +++
> .../org/apache/calcite/test/CassandraAdapterTest.java | 11 +++++++----
> pom.xml | 7 ++++---
> ubenchmark/pom.xml | 7 -------
> 4 files changed, 14 insertions(+), 14 deletions(-)
> ----------------------------------------------------------------------
>
>
> http://git-wip-us.apache.org/repos/asf/calcite/blob/c5ace08c/.travis.yml
> ----------------------------------------------------------------------
> diff --git a/.travis.yml b/.travis.yml
> index c70cc17..beb8e16 100644
> --- a/.travis.yml
> +++ b/.travis.yml
> @@ -20,10 +20,13 @@ language: java
> matrix:
> fast_finish: true
> include:
> + - env: IMAGE=maven:3-jdk-12
> - env: IMAGE=maven:3-jdk-11 JDOC=Y RAT=Y
> - env: IMAGE=maven:3-jdk-10
> - env: IMAGE=maven:3-jdk-9
> - env: IMAGE=maven:3-jdk-8 JDOC=Y
> + allow_failures:
> + - env: IMAGE=maven:3-jdk-12
> branches:
> only:
> - master
>
> http://git-wip-us.apache.org/repos/asf/calcite/blob/c5ace08c/cassandra/src/test/java/org/apache/calcite/test/CassandraAdapterTest.java
> ----------------------------------------------------------------------
> 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 61039cb..29dda35 100644
> --- a/cassandra/src/test/java/org/apache/calcite/test/CassandraAdapterTest.java
> +++ b/cassandra/src/test/java/org/apache/calcite/test/CassandraAdapterTest.java
> @@ -46,8 +46,9 @@ 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 (which is not yet supported by cassandra)
> - * see <a href="https://issues.apache.org/jira/browse/CASSANDRA-9608">CASSANDRA-9608</a>.
> + * <p>Note that tests will be skipped if running on JDK11 and JDK12
> + * (which is not yet supported by cassandra) see
> + * <a href="https://issues.apache.org/jira/browse/CASSANDRA-9608">CASSANDRA-9608</a>.
> *
> */
> // force tests to run sequentially (maven surefire and failsafe are running them in parallel)
> @@ -73,7 +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). All cassandra tests will be skipped if running on JDK11.
> + * (which fails on JDK11 and JDK12). All cassandra tests will be skipped if
> + * running on JDK11 and JDK12.
> *
> * @see <a href="https://issues.apache.org/jira/browse/CASSANDRA-9608">CASSANDRA-9608</a>
> * @return {@code true} if test is compatible with current environment,
> @@ -83,7 +85,8 @@ public class CassandraAdapterTest {
> final boolean enabled =
> Util.getBooleanProperty("calcite.test.cassandra", true);
> Bug.upgrade("remove JDK version check once current adapter supports Cassandra 4.x");
> - final boolean compatibleJdk = TestUtil.getJavaMajorVersion() != 11;
> + final boolean compatibleJdk = TestUtil.getJavaMajorVersion() != 11
> + && TestUtil.getJavaMajorVersion() != 12;
> return enabled && compatibleJdk;
> }
>
>
> http://git-wip-us.apache.org/repos/asf/calcite/blob/c5ace08c/pom.xml
> ----------------------------------------------------------------------
> diff --git a/pom.xml b/pom.xml
> index d2ad4e3..98fd037 100644
> --- a/pom.xml
> +++ b/pom.xml
> @@ -915,7 +915,8 @@ limitations under the License.
> <configuration>
> <threadCount>6</threadCount>
> <parallel>both</parallel>
> - <argLine>-Xmx1024m</argLine>
> + <!-- work around https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=911925 -->
> + <argLine>-Xmx1024m -Djdk.net.URLClassPath.disableClassPathURLCheck=true</argLine>
> <systemPropertyVariables>
> <calcite.integrationTest>true</calcite.integrationTest>
> </systemPropertyVariables>
> @@ -987,8 +988,8 @@ limitations under the License.
> <value>tr</value>
> </systemProperty>
> </systemProperties>
> - <!--<argLine>-Xmx1536m -Duser.timezone=${user.timezone} -Duser.country=${user.country} -Duser.language=${user.language}</argLine>-->
> - <argLine>-Xmx1536m</argLine>
> + <!-- work around https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=911925 -->
> + <argLine>-Xmx1536m -Djdk.net.URLClassPath.disableClassPathURLCheck=true</argLine>
> </configuration>
> </plugin>
> <plugin>
>
> http://git-wip-us.apache.org/repos/asf/calcite/blob/c5ace08c/ubenchmark/pom.xml
> ----------------------------------------------------------------------
> diff --git a/ubenchmark/pom.xml b/ubenchmark/pom.xml
> index 43c2b7b..fd57e3f 100644
> --- a/ubenchmark/pom.xml
> +++ b/ubenchmark/pom.xml
> @@ -73,13 +73,6 @@ limitations under the License.
> </executions>
> </plugin>
> <plugin>
> - <artifactId>maven-compiler-plugin</artifactId>
> - <configuration>
> - <source>1.6</source>
> - <target>1.6</target>
> - </configuration>
> - </plugin>
> - <plugin>
> <groupId>org.apache.maven.plugins</groupId>
> <artifactId>maven-shade-plugin</artifactId>
> <executions>
>
Re: calcite git commit: CALCITE-2655 - Enable Travis to test against
JDK 12
Posted by Kevin Risden <kr...@apache.org>.
Yup sorry mixed up formats between projects :(
Kevin Risden
On Wed, Nov 7, 2018 at 5:13 PM Julian Hyde <jh...@apache.org> wrote:
> Can you force-push to change the message to
>
> [CALCITE-2655] Enable Travis to test against JDK 12
>
> Sorry to be pedantic, but having a consistent format for commit comments
> helps.
>
>
> > On Nov 7, 2018, at 1:46 PM, krisden@apache.org wrote:
> >
> > Repository: calcite
> > Updated Branches:
> > refs/heads/master 06197d3bb -> c5ace08c8
> >
> >
> > CALCITE-2655 - Enable Travis to test against JDK 12
> >
> > Signed-off-by:
> Kevin Risden
> <kr...@apache.org>
> >
> >
> > Project: http://git-wip-us.apache.org/repos/asf/calcite/repo
> > Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/c5ace08c
> > Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/c5ace08c
> > Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/c5ace08c
> >
> > Branch: refs/heads/master
> > Commit: c5ace08c8a3296ce3c160cd483f57ab1de1c13d2
> > Parents: 06197d3
> > Author: Kevin Risden <kr...@apache.org>
> > Authored: Tue Nov 6 11:30:50 2018 -0500
> > Committer: Kevin Risden <kr...@apache.org>
> > Committed: Wed Nov 7 16:21:21 2018 -0500
> >
> > ----------------------------------------------------------------------
> > .travis.yml | 3 +++
> > .../org/apache/calcite/test/CassandraAdapterTest.java | 11 +++++++----
> > pom.xml | 7 ++++---
> > ubenchmark/pom.xml | 7 -------
> > 4 files changed, 14 insertions(+), 14 deletions(-)
> > ----------------------------------------------------------------------
> >
> >
> > http://git-wip-us.apache.org/repos/asf/calcite/blob/c5ace08c/.travis.yml
> > ----------------------------------------------------------------------
> > diff --git a/.travis.yml b/.travis.yml
> > index c70cc17..beb8e16 100644
> > --- a/.travis.yml
> > +++ b/.travis.yml
> > @@ -20,10 +20,13 @@ language: java
> > matrix:
> > fast_finish: true
> > include:
> > + - env: IMAGE=maven:3-jdk-12
> > - env: IMAGE=maven:3-jdk-11 JDOC=Y RAT=Y
> > - env: IMAGE=maven:3-jdk-10
> > - env: IMAGE=maven:3-jdk-9
> > - env: IMAGE=maven:3-jdk-8 JDOC=Y
> > + allow_failures:
> > + - env: IMAGE=maven:3-jdk-12
> > branches:
> > only:
> > - master
> >
> >
> http://git-wip-us.apache.org/repos/asf/calcite/blob/c5ace08c/cassandra/src/test/java/org/apache/calcite/test/CassandraAdapterTest.java
> > ----------------------------------------------------------------------
> > 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 61039cb..29dda35 100644
> > ---
> a/cassandra/src/test/java/org/apache/calcite/test/CassandraAdapterTest.java
> > +++
> b/cassandra/src/test/java/org/apache/calcite/test/CassandraAdapterTest.java
> > @@ -46,8 +46,9 @@ 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 (which is not
> yet supported by cassandra)
> > - * see <a href="https://issues.apache.org/jira/browse/CASSANDRA-9608
> ">CASSANDRA-9608</a>.
> > + * <p>Note that tests will be skipped if running on JDK11 and JDK12
> > + * (which is not yet supported by cassandra) see
> > + * <a href="https://issues.apache.org/jira/browse/CASSANDRA-9608
> ">CASSANDRA-9608</a>.
> > *
> > */
> > // force tests to run sequentially (maven surefire and failsafe are
> running them in parallel)
> > @@ -73,7 +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). All cassandra tests will be skipped if
> running on JDK11.
> > + * (which fails on JDK11 and JDK12). All cassandra tests will be
> skipped if
> > + * running on JDK11 and JDK12.
> > *
> > * @see <a href="https://issues.apache.org/jira/browse/CASSANDRA-9608
> ">CASSANDRA-9608</a>
> > * @return {@code true} if test is compatible with current environment,
> > @@ -83,7 +85,8 @@ public class CassandraAdapterTest {
> > final boolean enabled =
> > Util.getBooleanProperty("calcite.test.cassandra", true);
> > Bug.upgrade("remove JDK version check once current adapter supports
> Cassandra 4.x");
> > - final boolean compatibleJdk = TestUtil.getJavaMajorVersion() != 11;
> > + final boolean compatibleJdk = TestUtil.getJavaMajorVersion() != 11
> > + && TestUtil.getJavaMajorVersion()
> != 12;
> > return enabled && compatibleJdk;
> > }
> >
> >
> > http://git-wip-us.apache.org/repos/asf/calcite/blob/c5ace08c/pom.xml
> > ----------------------------------------------------------------------
> > diff --git a/pom.xml b/pom.xml
> > index d2ad4e3..98fd037 100644
> > --- a/pom.xml
> > +++ b/pom.xml
> > @@ -915,7 +915,8 @@ limitations under the License.
> > <configuration>
> > <threadCount>6</threadCount>
> > <parallel>both</parallel>
> > - <argLine>-Xmx1024m</argLine>
> > + <!-- work around
> https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=911925 -->
> > + <argLine>-Xmx1024m
> -Djdk.net.URLClassPath.disableClassPathURLCheck=true</argLine>
> > <systemPropertyVariables>
> > <calcite.integrationTest>true</calcite.integrationTest>
> > </systemPropertyVariables>
> > @@ -987,8 +988,8 @@ limitations under the License.
> > <value>tr</value>
> > </systemProperty>
> > </systemProperties>
> > - <!--<argLine>-Xmx1536m -Duser.timezone=${user.timezone}
> -Duser.country=${user.country} -Duser.language=${user.language}</argLine>-->
> > - <argLine>-Xmx1536m</argLine>
> > + <!-- work around
> https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=911925 -->
> > + <argLine>-Xmx1536m
> -Djdk.net.URLClassPath.disableClassPathURLCheck=true</argLine>
> > </configuration>
> > </plugin>
> > <plugin>
> >
> >
> http://git-wip-us.apache.org/repos/asf/calcite/blob/c5ace08c/ubenchmark/pom.xml
> > ----------------------------------------------------------------------
> > diff --git a/ubenchmark/pom.xml b/ubenchmark/pom.xml
> > index 43c2b7b..fd57e3f 100644
> > --- a/ubenchmark/pom.xml
> > +++ b/ubenchmark/pom.xml
> > @@ -73,13 +73,6 @@ limitations under the License.
> > </executions>
> > </plugin>
> > <plugin>
> > - <artifactId>maven-compiler-plugin</artifactId>
> > - <configuration>
> > - <source>1.6</source>
> > - <target>1.6</target>
> > - </configuration>
> > - </plugin>
> > - <plugin>
> > <groupId>org.apache.maven.plugins</groupId>
> > <artifactId>maven-shade-plugin</artifactId>
> > <executions>
> >
>
>