This is an automated email from the ASF dual-hosted git repository.
jshao pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/gravitino.git
The following commit(s) were added to refs/heads/main by this push:
new 77b310fa18 [MINOR] fix(build): Fix part of the license issue and
dependencies conflicts (#8475)
77b310fa18 is described below
commit 77b310fa1817f9606f697b65b7ad7fdd465c5cdd
Author: Jerry Shao <[email protected]>
AuthorDate: Tue Sep 9 18:36:38 2025 +0800
[MINOR] fix(build): Fix part of the license issue and dependencies
conflicts (#8475)
### What changes were proposed in this pull request?
Fix the Java dependencies license issue and dependency conflicts
problem.
### Why are the changes needed?
To prepare for the release.
### Does this PR introduce _any_ user-facing change?
No.
### How was this patch tested?
CI.
---
LICENSE.bin | 7 +++++++
build.gradle.kts | 6 ++++--
core/build.gradle.kts | 5 ++++-
gradle/libs.versions.toml | 6 ++----
server-common/build.gradle.kts | 1 +
5 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/LICENSE.bin b/LICENSE.bin
index 1120dae1c2..170ff65639 100644
--- a/LICENSE.bin
+++ b/LICENSE.bin
@@ -379,6 +379,11 @@
npgall concurrent-trees
reyerizo jcstress-gradle-plugin
melix jmh-gradle-plugin
+ Lance
+ JCasbin
+ OGNL
+ Google FlatBuffers
+ IPAddress
This product bundles various third-party components also under the
Apache Software Foundation License 1.1
@@ -486,3 +491,5 @@
AOP Alliance
XZ For Java
+ HdrHistogram
+ LatencyUtils
diff --git a/build.gradle.kts b/build.gradle.kts
index d95202e6a8..bf45d6d889 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -867,7 +867,8 @@ tasks {
it.name != "hive-metastore-common" &&
it.name != "integration-test" &&
it.name != "trino-connector" &&
- it.parent?.name != "bundles"
+ it.parent?.name != "bundles" &&
+ it.name != "mcp-server"
) {
from(it.configurations.runtimeClasspath)
into("distribution/package/libs")
@@ -898,7 +899,8 @@ tasks {
it.name != "hive-metastore-common" &&
it.name != "docs" &&
it.name != "hadoop-common" &&
- it.parent?.name != "bundles"
+ it.parent?.name != "bundles" &&
+ it.name != "mcp-server"
) {
dependsOn("${it.name}:build")
from("${it.name}/build/libs") {
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index 00663ea6ab..c0660acdbc 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -41,7 +41,10 @@ dependencies {
implementation(libs.concurrent.trees)
implementation(libs.guava)
implementation(libs.h2db)
- implementation(libs.lance)
+ implementation(libs.lance) {
+ exclude(group = "com.fasterxml.jackson.core", module = "*")
+ exclude(group = "com.fasterxml.jackson.datatype", module = "*")
+ }
implementation(libs.mybatis)
annotationProcessor(libs.lombok)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 0c76685fba..d09d2cb845 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -23,11 +23,10 @@ azure-storage-file-datalake = "12.20.0"
reactor-netty-http = "1.2.1"
reactor-netty-core = "1.2.1"
junit = "5.8.1"
-protoc = "3.24.4"
jackson = "2.15.2"
guava = "32.1.3-jre"
lombok = "1.18.20"
-slf4j = "2.0.9"
+slf4j = "2.0.16"
log4j = "2.24.3"
lance = "0.31.0"
jetty = "9.4.51.v20230217"
@@ -47,7 +46,6 @@ httpclient = "4.4.1"
httpclient5 = "5.4.4"
httpcore5 = "5.3.4"
micrometer-core = "1.12.2"
-jackson-dataformat-yaml = "2.16.1"
mockserver = "5.15.0"
commons-csv = "1.12.0"
commons-lang3 = "3.14.0"
@@ -144,7 +142,7 @@ jackson-databind = { group = "com.fasterxml.jackson.core",
name = "jackson-datab
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" }
jackson-datatype-jsr310 = { group = "com.fasterxml.jackson.datatype", name =
"jackson-datatype-jsr310", version.ref = "jackson" }
-jackson-dataformat-yaml = { group = "com.fasterxml.jackson.dataformat", name =
"jackson-dataformat-yaml", version.ref = "jackson-dataformat-yaml" }
+jackson-dataformat-yaml = { group = "com.fasterxml.jackson.dataformat", name =
"jackson-dataformat-yaml", version.ref = "jackson" }
guava = { group = "com.google.guava", name = "guava", version.ref = "guava" }
kerby-core = { group = "org.apache.kerby", name = "kerb-core", version.ref =
"kerby"}
kerby-simplekdc = { group = "org.apache.kerby", name = "kerb-simplekdc",
version.ref = "kerby"}
diff --git a/server-common/build.gradle.kts b/server-common/build.gradle.kts
index d209acb9e1..e883902a84 100644
--- a/server-common/build.gradle.kts
+++ b/server-common/build.gradle.kts
@@ -45,6 +45,7 @@ dependencies {
implementation(libs.jackson.databind)
implementation(libs.jcasbin) {
exclude(group = "com.fasterxml.jackson.core", module = "jackson-databind")
+ exclude(group = "org.slf4j", module = "slf4j-api")
}
implementation(libs.ognl)
implementation(libs.prometheus.servlet)
