Skip to content

Commit 37bb73d

Browse files
authored
Shade jackson in vortex-jni and vortex-spark and avoid scala version conflicts (#7168)
Java dependencies work in mysterious ways but mostly it's jackson-scala that's to blame. Because scala-lang is just a versioned library and 2.13 > 2.12 I had to remove consistent-versions since they specifically forbid doing the thing we need to - have two conflicting version sets across spark versions --------- Signed-off-by: Robert Kruszewski <github@robertk.io>
1 parent 7852ece commit 37bb73d

File tree

9 files changed

+112
-501
lines changed

9 files changed

+112
-501
lines changed

java/build.gradle.kts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import net.ltgt.gradle.errorprone.errorprone
55

66
plugins {
77
id("com.diffplug.spotless") version "8.4.0"
8-
id("com.palantir.consistent-versions") version "3.15.0"
98
id("com.palantir.git-version") version "5.0.0"
109
id("net.ltgt.errorprone") version "5.1.0" apply false
1110
id("com.google.protobuf") version "0.9.6" apply false
@@ -33,9 +32,9 @@ allprojects {
3332
apply(plugin = "net.ltgt.errorprone")
3433

3534
dependencies {
36-
"errorprone"("com.google.errorprone:error_prone_core")
37-
"errorprone"("com.jakewharton.nopen:nopen-checker")
38-
"compileOnly"("com.jakewharton.nopen:nopen-annotations")
35+
"errorprone"("com.google.errorprone:error_prone_core:2.36.0")
36+
"errorprone"("com.jakewharton.nopen:nopen-checker:1.0.1")
37+
"compileOnly"("com.jakewharton.nopen:nopen-annotations:1.0.1")
3938
}
4039

4140
spotless {

java/gradle/libs.versions.toml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# SPDX-License-Identifier: Apache-2.0
2+
# SPDX-FileCopyrightText: Copyright the Vortex contributors
3+
4+
[versions]
5+
arrow = "18.3.0"
6+
errorprone = "2.36.0"
7+
guava = "33.5.0-jre"
8+
immutables = "2.12.1"
9+
junit-jupiter = "6.0.3"
10+
logback = "1.5.32"
11+
netty = "4.2.7.Final"
12+
nopen = "1.0.1"
13+
protobuf = "4.33.5"
14+
slf4j = "2.0.17"
15+
spark3 = "3.5.8"
16+
spark4 = "4.1.1"
17+
s3mock = "4.11.0"
18+
testcontainers-jupiter = "1.20.4"
19+
20+
[libraries]
21+
arrow-c-data = { module = "org.apache.arrow:arrow-c-data", version.ref = "arrow" }
22+
arrow-memory-core = { module = "org.apache.arrow:arrow-memory-core", version.ref = "arrow" }
23+
arrow-memory-netty = { module = "org.apache.arrow:arrow-memory-netty", version.ref = "arrow" }
24+
errorprone-annotations = { module = "com.google.errorprone:error_prone_annotations", version.ref = "errorprone" }
25+
errorprone-core = { module = "com.google.errorprone:error_prone_core", version.ref = "errorprone" }
26+
guava = { module = "com.google.guava:guava", version.ref = "guava" }
27+
immutables-value = { module = "org.immutables:value", version.ref = "immutables" }
28+
junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit-jupiter" }
29+
junit-jupiter-params = { module = "org.junit.jupiter:junit-jupiter-params", version.ref = "junit-jupiter" }
30+
logback-classic = { module = "ch.qos.logback:logback-classic", version.ref = "logback" }
31+
netty-bom = { module = "io.netty:netty-bom", version.ref = "netty" }
32+
nopen-annotations = { module = "com.jakewharton.nopen:nopen-annotations", version.ref = "nopen" }
33+
nopen-checker = { module = "com.jakewharton.nopen:nopen-checker", version.ref = "nopen" }
34+
protobuf-java = { module = "com.google.protobuf:protobuf-java", version.ref = "protobuf" }
35+
slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
36+
slf4j-simple = { module = "org.slf4j:slf4j-simple", version.ref = "slf4j" }
37+
s3mock-testcontainers = { module = "com.adobe.testing:s3mock-testcontainers", version.ref = "s3mock" }
38+
testcontainers-juputer = { module = "org.testcontainers:junit-jupiter", version.ref = "testcontainers-jupiter" }

java/settings-gradle.lockfile

Lines changed: 0 additions & 4 deletions
This file was deleted.

java/settings.gradle.kts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,8 @@ rootProject.name = "vortex-root"
1919

2020
// API bindings
2121
include("vortex-jni")
22-
include("vortex-spark")
22+
include("vortex-spark_2.12")
23+
project(":vortex-spark_2.12").projectDir = file("vortex-spark")
24+
25+
include("vortex-spark_2.13")
26+
project(":vortex-spark_2.13").projectDir = file("vortex-spark")

java/testfiles/Cargo.lock

Lines changed: 5 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)