This is an automated email from the ASF dual-hosted git repository. vladimirsitnikov pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/calcite.git
commit 000053b23fb43ad03a49ad1d1d22071265202ca5 Author: Vladimir Sitnikov <[email protected]> AuthorDate: Mon Nov 18 21:35:30 2019 +0300 [CALCITE-3516] Bump net.java.dev.jna:jna to 5.5.0 --- .github/workflows/main.yml | 12 ++++++------ bom/build.gradle.kts | 1 + cassandra/build.gradle.kts | 3 ++- elasticsearch/build.gradle.kts | 1 + gradle.properties | 1 + 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9a74b1b..ba48ae1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -12,29 +12,29 @@ on: jobs: windows: - name: 'Windows (JDK 11)' + name: 'Windows (JDK 8)' runs-on: windows-latest steps: - uses: actions/checkout@master with: fetch-depth: 50 - - name: 'Set up JDK 11' + - name: 'Set up JDK 8' uses: actions/setup-java@v1 with: - java-version: 11 + java-version: 8 - name: 'Test' shell: cmd run: | ./gradlew --no-parallel --no-daemon build javadoc linux-avatica: - name: 'Linux (JDK 13), Avatica master' + name: 'Linux (JDK 11), Avatica master' runs-on: ubuntu-latest steps: - - name: 'Set up JDK 13' + - name: 'Set up JDK 11' uses: actions/setup-java@v1 with: - java-version: 13 + java-version: 11 - name: 'Install Avatica to Maven Local repository' run: | git clone --branch master --depth 100 https://github.com/apache/calcite-avatica.git ../calcite-avatica diff --git a/bom/build.gradle.kts b/bom/build.gradle.kts index c75f8a0..2f65c52 100644 --- a/bom/build.gradle.kts +++ b/bom/build.gradle.kts @@ -82,6 +82,7 @@ dependencies { apiv("net.hydromatic:quidem") apiv("net.hydromatic:scott-data-hsqldb") apiv("net.hydromatic:tpcds", "hydromatic.tpcds") + apiv("net.java.dev.jna:jna") apiv("net.sf.opencsv:opencsv") apiv("org.apache.calcite.avatica:avatica-core", "calcite.avatica") apiv("org.apache.calcite.avatica:avatica-server", "calcite.avatica") diff --git a/cassandra/build.gradle.kts b/cassandra/build.gradle.kts index 5b6b73e..55f1ef3 100644 --- a/cassandra/build.gradle.kts +++ b/cassandra/build.gradle.kts @@ -26,10 +26,11 @@ dependencies { implementation("org.slf4j:slf4j-api") testImplementation(project(":core", "testClasses")) + testImplementation("com.github.stephenc.jcip:jcip-annotations") testImplementation("org.apache.cassandra:cassandra-all") { exclude("org.slf4j", "log4j-over-slf4j") .because("log4j is already present in the classpath") } testImplementation("org.cassandraunit:cassandra-unit") - testImplementation("com.github.stephenc.jcip:jcip-annotations") + testRuntimeOnly("net.java.dev.jna:jna") } diff --git a/elasticsearch/build.gradle.kts b/elasticsearch/build.gradle.kts index 9a0d91d..c59a6a4 100644 --- a/elasticsearch/build.gradle.kts +++ b/elasticsearch/build.gradle.kts @@ -60,4 +60,5 @@ dependencies { testImplementation("org.elasticsearch.plugin:transport-netty4-client") testImplementation("org.elasticsearch:elasticsearch") testImplementation(project(":core", "testClasses")) + testRuntimeOnly("net.java.dev.jna:jna") } diff --git a/gradle.properties b/gradle.properties index 451859a..f3f508b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -98,6 +98,7 @@ jcip-annotations.version=1.0-1 jcommander.version=1.72 jetty.version=9.4.15.v20190215 jmh.version=1.12 +jna.version=5.5.0 joda-time.version=2.8.1 json-path.version=2.4.0 jsoup.version=1.11.3
