From 14ec3833cb91858cfc43a4b275b3cb578193e8b5 Mon Sep 17 00:00:00 2001 From: Jerry Shao Date: Fri, 10 Jan 2025 22:03:34 +0800 Subject: [PATCH] [#6184]improve(core): Remove the protobuf dependency (#6185) ### What changes were proposed in this pull request? Remove the unused protobuf dependency. ### Why are the changes needed? Since we already removed the KV storage support, so protobuf dependency is not required any more. Fix: #6184 ### Does this PR introduce _any_ user-facing change? No. ### How was this patch tested? Existing tests. --- NOTICE.bin | 8 -------- NOTICE.rest | 14 +++----------- clients/client-java/build.gradle.kts | 4 ---- common/build.gradle.kts | 1 - core/build.gradle.kts | 4 ---- gradle/libs.versions.toml | 4 ---- 6 files changed, 3 insertions(+), 32 deletions(-) diff --git a/NOTICE.bin b/NOTICE.bin index 79645c85bf0..eef511ff7a7 100644 --- a/NOTICE.bin +++ b/NOTICE.bin @@ -184,14 +184,6 @@ zlib in pure Java, which can be obtained at: * HOMEPAGE: * http://www.jcraft.com/jzlib/ -This product optionally depends on 'Protocol Buffers', Google's data -interchange format, which can be obtained at: - - * LICENSE: - * license/LICENSE.protobuf.txt (New BSD License) - * HOMEPAGE: - * http://code.google.com/p/protobuf/ - This product optionally depends on 'SLF4J', a simple logging facade for Java, which can be obtained at: diff --git a/NOTICE.rest b/NOTICE.rest index 8a06bae6fbe..551b4d3eb3b 100644 --- a/NOTICE.rest +++ b/NOTICE.rest @@ -253,7 +253,7 @@ Dropwizard Hadoop Metrics Copyright 2016 Josh Elser AWS EventStream for Java -Copyright 2017 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2017 Amazon.com, Inc. or its affiliates. All Rights Reserved. Apache Gravitino (incubating) Copyright 2024 The Apache Software Foundation @@ -488,7 +488,7 @@ The Apache Software Foundation (https://www.apache.org/). This product includes software developed by Joda.org (https://www.joda.org/). -Kerby-kerb Admin +Kerby-kerb Admin Copyright 2014-2022 The Apache Software Foundation Kerby-kerb core @@ -524,7 +524,7 @@ Copyright 2014-2022 The Apache Software Foundation Kerby PKIX Project Copyright 2014-2022 The Apache Software Foundation -Kerby Util +Kerby Util Copyright 2014-2022 The Apache Software Foundation Kerby XDR Project @@ -605,14 +605,6 @@ zlib in pure Java, which can be obtained at: * HOMEPAGE: * http://www.jcraft.com/jzlib/ -This product optionally depends on 'Protocol Buffers', Google's data -interchange format, which can be obtained at: - - * LICENSE: - * license/LICENSE.protobuf.txt (New BSD License) - * HOMEPAGE: - * http://code.google.com/p/protobuf/ - This product optionally depends on 'SLF4J', a simple logging facade for Java, which can be obtained at: diff --git a/clients/client-java/build.gradle.kts b/clients/client-java/build.gradle.kts index d928c5ce006..d7518569c94 100644 --- a/clients/client-java/build.gradle.kts +++ b/clients/client-java/build.gradle.kts @@ -25,10 +25,6 @@ plugins { dependencies { implementation(project(":api")) implementation(project(":common")) - implementation(libs.protobuf.java.util) { - exclude("com.google.guava", "guava") - .because("Brings in Guava for Android, which we don't want (and breaks multimaps).") - } implementation(libs.jackson.databind) implementation(libs.jackson.annotations) implementation(libs.jackson.datatype.jdk8) diff --git a/common/build.gradle.kts b/common/build.gradle.kts index 91e2d137f25..1acf0e1b4c8 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -36,7 +36,6 @@ dependencies { implementation(libs.jackson.datatype.jdk8) implementation(libs.jackson.datatype.jsr310) implementation(libs.jackson.databind) - implementation(libs.protobuf.java) annotationProcessor(libs.lombok) compileOnly(libs.lombok) diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 3ca446a51c1..ef23950b07c 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -36,10 +36,6 @@ dependencies { implementation(libs.guava) implementation(libs.h2db) implementation(libs.mybatis) - implementation(libs.protobuf.java.util) { - exclude("com.google.guava", "guava") - .because("Brings in Guava for Android, which we don't want (and breaks multimaps).") - } annotationProcessor(libs.lombok) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 52bccd9b480..3391daf30be 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -93,7 +93,6 @@ cglib = "2.2" ranger = "2.4.0" javax-jaxb-api = "2.3.1" javax-ws-rs-api = "2.1.1" -protobuf-plugin = "0.9.2" spotless-plugin = '6.11.0' gradle-extensions-plugin = '1.74' publish-plugin = '1.2.0' @@ -129,8 +128,6 @@ azure-identity = { group = "com.azure", name = "azure-identity", version.ref = " azure-storage-file-datalake = { group = "com.azure", name = "azure-storage-file-datalake", version.ref = "azure-storage-file-datalake"} reactor-netty-http = {group = "io.projectreactor.netty", name = "reactor-netty-http", version.ref = "reactor-netty-http"} reactor-netty-core = {group = "io.projectreactor.netty", name = "reactor-netty-core", version.ref = "reactor-netty-core"} -protobuf-java = { group = "com.google.protobuf", name = "protobuf-java", version.ref = "protoc" } -protobuf-java-util = { group = "com.google.protobuf", name = "protobuf-java-util", version.ref = "protoc" } jackson-databind = { group = "com.fasterxml.jackson.core", name = "jackson-databind", version.ref = "jackson" } jackson-annotations = { group = "com.fasterxml.jackson.core", name = "jackson-annotations", version.ref = "jackson" } jackson-datatype-jdk8 = { group = "com.fasterxml.jackson.datatype", name = "jackson-datatype-jdk8", version.ref = "jackson" } @@ -293,7 +290,6 @@ prometheus = ["prometheus-servlet", "prometheus-dropwizard", "prometheus-client" kerby = ["kerby-core", "kerby-simplekdc"] [plugins] -protobuf = { id = "com.google.protobuf", version.ref = "protobuf-plugin" } spotless = { id = "com.diffplug.spotless", version.ref = "spotless-plugin" } gradle-extensions = { id = "com.github.vlsi.gradle-extensions", version.ref = "gradle-extensions-plugin" } publish = { id = "io.github.gradle-nexus.publish-plugin", version.ref = "publish-plugin" }