Skip to content

Commit 5ab4975

Browse files
committed
Remove unused protobuf dependency in java bindings
Signed-off-by: Robert Kruszewski <github@robertk.io>
1 parent 04fc7f6 commit 5ab4975

10 files changed

Lines changed: 2 additions & 278 deletions

File tree

java/build.gradle.kts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ plugins {
88
id("com.palantir.git-version") version "5.0.0"
99
id("com.palantir.java-format") version "2.90.0"
1010
id("net.ltgt.errorprone") version "5.1.0" apply false
11-
id("com.google.protobuf") version "0.10.0" apply false
1211
id("com.vanniktech.maven.publish") version "0.36.0" apply false
1312
}
1413

@@ -55,8 +54,6 @@ allprojects {
5554
tasks.withType<JavaCompile> {
5655
options.errorprone.disable("UnusedVariable")
5756
options.errorprone.disableWarningsInGeneratedCode = true
58-
// ignore protobuf generated files
59-
options.errorprone.excludedPaths = ".*/build/generated/.*"
6057
options.release = 17
6158
options.compilerArgs.add("-Werror")
6259

java/gradle/libs.versions.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ junit-jupiter = "6.0.3"
1010
logback = "1.5.32"
1111
netty = "4.2.13.Final"
1212
nopen = "1.0.1"
13-
protobuf = "4.34.1"
1413
slf4j = "2.0.17"
1514
spark3 = "3.5.8"
1615
spark4 = "4.1.1"
@@ -31,7 +30,6 @@ logback-classic = { module = "ch.qos.logback:logback-classic", version.ref = "lo
3130
netty-bom = { module = "io.netty:netty-bom", version.ref = "netty" }
3231
nopen-annotations = { module = "com.jakewharton.nopen:nopen-annotations", version.ref = "nopen" }
3332
nopen-checker = { module = "com.jakewharton.nopen:nopen-checker", version.ref = "nopen" }
34-
protobuf-java = { module = "com.google.protobuf:protobuf-java", version.ref = "protobuf" }
3533
slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
3634
slf4j-simple = { module = "org.slf4j:slf4j-simple", version.ref = "slf4j" }
3735
s3mock-testcontainers = { module = "com.adobe.testing:s3mock-testcontainers", version.ref = "s3mock" }

java/vortex-jni/build.gradle.kts

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import org.gradle.kotlin.dsl.support.serviceOf
77
plugins {
88
`java-library`
99
`jvm-test-suite`
10-
id("com.google.protobuf")
1110
id("com.gradleup.shadow") version "9.4.1"
1211
}
1312

@@ -26,7 +25,6 @@ dependencies {
2625
errorprone(libs.nopen.checker)
2726

2827
implementation(libs.guava)
29-
implementation(libs.protobuf.java)
3028
compileOnly(libs.errorprone.annotations)
3129
compileOnly(libs.nopen.annotations)
3230

@@ -91,15 +89,8 @@ tasks.withType<Test>().all {
9189
)
9290
}
9391

94-
protobuf {
95-
protoc {
96-
artifact = "com.google.protobuf:protoc:${libs.versions.protobuf.get()}"
97-
}
98-
}
99-
100-
// shade guava and protobuf dependencies
92+
// shade guava and arrow dependencies
10193
tasks.withType<ShadowJar> {
102-
relocate("com.google.protobuf", "dev.vortex.relocated.com.google.protobuf")
10394
relocate("com.google.common", "dev.vortex.relocated.com.google.common")
10495
relocate("org.apache.arrow", "dev.vortex.relocated.org.apache.arrow") {
10596
// exclude C Data Interface since JNI cannot be relocated

java/vortex-jni/src/main/proto/dtype.proto

Lines changed: 0 additions & 1 deletion
This file was deleted.

java/vortex-jni/src/main/proto/expr.proto

Lines changed: 0 additions & 1 deletion
This file was deleted.

java/vortex-jni/src/main/proto/google/REUSE.toml

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

java/vortex-jni/src/main/proto/google/protobuf/struct.proto

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

java/vortex-jni/src/main/proto/google/protobuf/wrappers.proto

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

java/vortex-jni/src/main/proto/scalar.proto

Lines changed: 0 additions & 1 deletion
This file was deleted.

java/vortex-spark/build.gradle.kts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,8 @@ mavenPublishing {
103103
}
104104
}
105105

106-
// shade guava and protobuf dependencies
106+
// shade guava and arrow dependencies
107107
tasks.withType<ShadowJar> {
108-
relocate("com.google.protobuf", "dev.vortex.relocated.com.google.protobuf")
109108
relocate("com.google.common", "dev.vortex.relocated.com.google.common")
110109
relocate("org.apache.arrow", "dev.vortex.relocated.org.apache.arrow") {
111110
// exclude C Data Interface since JNI cannot be relocated

0 commit comments

Comments
 (0)