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
3 changes: 0 additions & 3 deletions java/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ plugins {
id("com.palantir.git-version") version "5.0.0"
id("com.palantir.java-format") version "2.90.0"
id("net.ltgt.errorprone") version "5.1.0" apply false
id("com.google.protobuf") version "0.10.0" apply false
id("com.vanniktech.maven.publish") version "0.36.0" apply false
}

Expand Down Expand Up @@ -55,8 +54,6 @@ allprojects {
tasks.withType<JavaCompile> {
options.errorprone.disable("UnusedVariable")
options.errorprone.disableWarningsInGeneratedCode = true
// ignore protobuf generated files
options.errorprone.excludedPaths = ".*/build/generated/.*"
options.release = 17
options.compilerArgs.add("-Werror")

Expand Down
2 changes: 0 additions & 2 deletions java/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ junit-jupiter = "6.0.3"
logback = "1.5.32"
netty = "4.2.13.Final"
nopen = "1.0.1"
protobuf = "4.34.1"
slf4j = "2.0.17"
spark3 = "3.5.8"
spark4 = "4.1.1"
Expand All @@ -31,7 +30,6 @@ logback-classic = { module = "ch.qos.logback:logback-classic", version.ref = "lo
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" }
Expand Down
11 changes: 1 addition & 10 deletions java/vortex-jni/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import org.gradle.kotlin.dsl.support.serviceOf
plugins {
`java-library`
`jvm-test-suite`
id("com.google.protobuf")
id("com.gradleup.shadow") version "9.4.1"
}

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

implementation(libs.guava)
implementation(libs.protobuf.java)
compileOnly(libs.errorprone.annotations)
compileOnly(libs.nopen.annotations)

Expand Down Expand Up @@ -91,15 +89,8 @@ tasks.withType<Test>().all {
)
}

protobuf {
protoc {
artifact = "com.google.protobuf:protoc:${libs.versions.protobuf.get()}"
}
}

// shade guava and protobuf dependencies
// shade guava and arrow dependencies
tasks.withType<ShadowJar> {
relocate("com.google.protobuf", "dev.vortex.relocated.com.google.protobuf")
relocate("com.google.common", "dev.vortex.relocated.com.google.common")
relocate("org.apache.arrow", "dev.vortex.relocated.org.apache.arrow") {
// exclude C Data Interface since JNI cannot be relocated
Expand Down
1 change: 0 additions & 1 deletion java/vortex-jni/src/main/proto/dtype.proto

This file was deleted.

1 change: 0 additions & 1 deletion java/vortex-jni/src/main/proto/expr.proto

This file was deleted.

6 changes: 0 additions & 6 deletions java/vortex-jni/src/main/proto/google/REUSE.toml

This file was deleted.

95 changes: 0 additions & 95 deletions java/vortex-jni/src/main/proto/google/protobuf/struct.proto

This file was deleted.

157 changes: 0 additions & 157 deletions java/vortex-jni/src/main/proto/google/protobuf/wrappers.proto

This file was deleted.

1 change: 0 additions & 1 deletion java/vortex-jni/src/main/proto/scalar.proto

This file was deleted.

3 changes: 1 addition & 2 deletions java/vortex-spark/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,8 @@ mavenPublishing {
}
}

// shade guava and protobuf dependencies
// shade guava and arrow dependencies
tasks.withType<ShadowJar> {
relocate("com.google.protobuf", "dev.vortex.relocated.com.google.protobuf")
relocate("com.google.common", "dev.vortex.relocated.com.google.common")
relocate("org.apache.arrow", "dev.vortex.relocated.org.apache.arrow") {
// exclude C Data Interface since JNI cannot be relocated
Expand Down
Loading