Skip to content

Commit

Permalink
[CALCITE-3516] Bump net.java.dev.jna:jna to 5.5.0
Browse files Browse the repository at this point in the history
  • Loading branch information
vlsi committed Nov 19, 2019
1 parent c7c8ab1 commit 000053b
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 7 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions bom/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
3 changes: 2 additions & 1 deletion cassandra/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
1 change: 1 addition & 0 deletions elasticsearch/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
1 change: 1 addition & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 000053b

Please sign in to comment.