Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions java/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import net.ltgt.gradle.errorprone.errorprone

plugins {
id("com.diffplug.spotless") version "8.4.0"
id("com.palantir.consistent-versions") version "3.15.0"
id("com.palantir.git-version") version "5.0.0"
id("net.ltgt.errorprone") version "5.1.0" apply false
id("com.google.protobuf") version "0.9.6" apply false
Expand Down Expand Up @@ -33,9 +32,9 @@ allprojects {
apply(plugin = "net.ltgt.errorprone")

dependencies {
"errorprone"("com.google.errorprone:error_prone_core")
"errorprone"("com.jakewharton.nopen:nopen-checker")
"compileOnly"("com.jakewharton.nopen:nopen-annotations")
"errorprone"("com.google.errorprone:error_prone_core:2.36.0")
"errorprone"("com.jakewharton.nopen:nopen-checker:1.0.1")
"compileOnly"("com.jakewharton.nopen:nopen-annotations:1.0.1")
}

spotless {
Expand Down
38 changes: 38 additions & 0 deletions java/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
# SPDX-License-Identifier: Apache-2.0
# SPDX-FileCopyrightText: Copyright the Vortex contributors

[versions]
arrow = "18.3.0"
errorprone = "2.36.0"
guava = "33.5.0-jre"
immutables = "2.12.1"
junit-jupiter = "6.0.3"
logback = "1.5.32"
netty = "4.2.7.Final"
nopen = "1.0.1"
protobuf = "4.33.5"
slf4j = "2.0.17"
spark3 = "3.5.8"
spark4 = "4.1.1"
s3mock = "4.11.0"
testcontainers-jupiter = "1.20.4"

[libraries]
arrow-c-data = { module = "org.apache.arrow:arrow-c-data", version.ref = "arrow" }
arrow-memory-core = { module = "org.apache.arrow:arrow-memory-core", version.ref = "arrow" }
arrow-memory-netty = { module = "org.apache.arrow:arrow-memory-netty", version.ref = "arrow" }
errorprone-annotations = { module = "com.google.errorprone:error_prone_annotations", version.ref = "errorprone" }
errorprone-core = { module = "com.google.errorprone:error_prone_core", version.ref = "errorprone" }
guava = { module = "com.google.guava:guava", version.ref = "guava" }
immutables-value = { module = "org.immutables:value", version.ref = "immutables" }
junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit-jupiter" }
junit-jupiter-params = { module = "org.junit.jupiter:junit-jupiter-params", version.ref = "junit-jupiter" }
logback-classic = { module = "ch.qos.logback:logback-classic", version.ref = "logback" }
netty-bom = { module = "io.netty:netty-bom", version.ref = "netty" }
nopen-annotations = { module = "com.jakewharton.nopen:nopen-annotations", version.ref = "nopen" }
nopen-checker = { module = "com.jakewharton.nopen:nopen-checker", version.ref = "nopen" }
protobuf-java = { module = "com.google.protobuf:protobuf-java", version.ref = "protobuf" }
slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
slf4j-simple = { module = "org.slf4j:slf4j-simple", version.ref = "slf4j" }
s3mock-testcontainers = { module = "com.adobe.testing:s3mock-testcontainers", version.ref = "s3mock" }
testcontainers-juputer = { module = "org.testcontainers:junit-jupiter", version.ref = "testcontainers-jupiter" }
4 changes: 0 additions & 4 deletions java/settings-gradle.lockfile

This file was deleted.

6 changes: 5 additions & 1 deletion java/settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,8 @@ rootProject.name = "vortex-root"

// API bindings
include("vortex-jni")
include("vortex-spark")
include("vortex-spark_2.12")
project(":vortex-spark_2.12").projectDir = file("vortex-spark")

include("vortex-spark_2.13")
project(":vortex-spark_2.13").projectDir = file("vortex-spark")
15 changes: 5 additions & 10 deletions java/testfiles/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading