This is an automated email from the ASF dual-hosted git repository.
jshao pushed a commit to branch branch-1.2
in repository https://gitbox.apache.org/repos/asf/gravitino.git
The following commit(s) were added to refs/heads/branch-1.2 by this push:
new 99b7633c70 [Cherry-pick to branch-1.2] [#10331] fix(build): The
package shouldn't contain the test jar (#10386) (#10418)
99b7633c70 is described below
commit 99b7633c70849045a99ceee2f8b7111916c4af02
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Fri Mar 13 14:24:59 2026 +0800
[Cherry-pick to branch-1.2] [#10331] fix(build): The package shouldn't
contain the test jar (#10386) (#10418)
**Cherry-pick Information:**
- Original commit: db40dc6876fefef41fe5072142fb59c6c7eb0e0b
- Target branch: `branch-1.2`
- Status: ⚠️ **Has conflicts - manual resolution required**
Please review and resolve the conflicts before merging.
Co-authored-by: roryqi <[email protected]>
---
build.gradle.kts | 7 +++++--
.../catalog-jdbc-clickhouse/build.gradle.kts | 1 +
.../build.gradle.kts | 16 ++++++++--------
catalogs-contrib/catalog-jdbc-oceanbase/build.gradle.kts | 1 +
catalogs/catalog-fileset/build.gradle.kts | 4 ++--
catalogs/catalog-hive/build.gradle.kts | 1 +
catalogs/catalog-jdbc-doris/build.gradle.kts | 1 +
catalogs/catalog-jdbc-mysql/build.gradle.kts | 1 +
catalogs/catalog-jdbc-postgresql/build.gradle.kts | 1 +
catalogs/catalog-jdbc-starrocks/build.gradle.kts | 1 +
catalogs/catalog-kafka/build.gradle.kts | 1 +
catalogs/catalog-lakehouse-generic/build.gradle.kts | 1 +
catalogs/catalog-lakehouse-hudi/build.gradle.kts | 1 +
catalogs/catalog-lakehouse-iceberg/build.gradle.kts | 1 +
catalogs/catalog-lakehouse-paimon/build.gradle.kts | 1 +
catalogs/catalog-model/build.gradle.kts | 1 +
16 files changed, 28 insertions(+), 12 deletions(-)
diff --git a/build.gradle.kts b/build.gradle.kts
index c09bbe17c7..bf601c5b70 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1086,10 +1086,13 @@ tasks {
it.parent?.name != "maintenance" &&
it.name != "mcp-server"
) {
- from(it.configurations.runtimeClasspath)
+ from(it.configurations.runtimeClasspath) {
+ exclude("error_prone_annotations-*.jar")
+ }
into("distribution/package/libs")
}
}
+ setDuplicatesStrategy(DuplicatesStrategy.EXCLUDE)
}
register("copyCliLib", Copy::class) {
@@ -1137,7 +1140,7 @@ tasks {
dependsOn("${it.name}:build")
from("${it.name}/build/libs") {
include("*.jar")
- exclude("*-jcstress.jar", "*-jmh.jar")
+ exclude("*-jcstress.jar", "*-jmh.jar",
"error_prone_annotations-*.jar")
}
into("distribution/package/libs")
setDuplicatesStrategy(DuplicatesStrategy.INCLUDE)
diff --git a/catalogs-contrib/catalog-jdbc-clickhouse/build.gradle.kts
b/catalogs-contrib/catalog-jdbc-clickhouse/build.gradle.kts
index 8f1ddb8796..65ec197473 100644
--- a/catalogs-contrib/catalog-jdbc-clickhouse/build.gradle.kts
+++ b/catalogs-contrib/catalog-jdbc-clickhouse/build.gradle.kts
@@ -73,6 +73,7 @@ tasks {
exclude("guava-*.jar")
exclude("log4j-*.jar")
exclude("slf4j-*.jar")
+ exclude("error_prone_annotations-*.jar")
}
into("$rootDir/distribution/package/catalogs/jdbc-clickhouse/libs")
}
diff --git a/catalogs-contrib/catalog-jdbc-oceanbase/build.gradle.kts
b/catalogs-contrib/catalog-jdbc-hologres/build.gradle.kts
similarity index 90%
copy from catalogs-contrib/catalog-jdbc-oceanbase/build.gradle.kts
copy to catalogs-contrib/catalog-jdbc-hologres/build.gradle.kts
index 41640afc7d..37eda346f7 100644
--- a/catalogs-contrib/catalog-jdbc-oceanbase/build.gradle.kts
+++ b/catalogs-contrib/catalog-jdbc-hologres/build.gradle.kts
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-description = "catalog-jdbc-oceanbase"
+description = "catalog-jdbc-hologres"
plugins {
`maven-publish`
@@ -41,11 +41,11 @@ dependencies {
implementation(libs.commons.lang3)
implementation(libs.guava)
- testImplementation(project(":catalogs:catalog-jdbc-common", "testArtifacts"))
testImplementation(project(":api"))
+ testImplementation(project(":catalogs:catalog-jdbc-common", "testArtifacts"))
+ testImplementation(project(":clients:client-java"))
testImplementation(project(":common"))
testImplementation(project(":core"))
- testImplementation(project(":clients:client-java"))
testImplementation(project(":integration-test-common", "testArtifacts"))
testImplementation(project(":server"))
testImplementation(project(":server-common"))
@@ -53,10 +53,9 @@ dependencies {
testImplementation(libs.awaitility)
testImplementation(libs.junit.jupiter.api)
testImplementation(libs.junit.jupiter.params)
- testImplementation(libs.mysql.driver)
testImplementation(libs.postgresql.driver)
testImplementation(libs.testcontainers)
- testImplementation(libs.testcontainers.mysql)
+ testImplementation(libs.testcontainers.postgresql)
testRuntimeOnly(libs.junit.jupiter.engine)
}
@@ -73,15 +72,16 @@ tasks {
exclude("guava-*.jar")
exclude("log4j-*.jar")
exclude("slf4j-*.jar")
+ exclude("error_prone_annotations-*.jar")
}
- into("$rootDir/distribution/package/catalogs/jdbc-oceanbase/libs")
+ into("$rootDir/distribution/package/catalogs/jdbc-hologres/libs")
}
val copyCatalogConfig by registering(Copy::class) {
from("src/main/resources")
- into("$rootDir/distribution/package/catalogs/jdbc-oceanbase/conf")
+ into("$rootDir/distribution/package/catalogs/jdbc-hologres/conf")
- include("jdbc-oceanbase.conf")
+ include("jdbc-hologres.conf")
exclude { details ->
details.file.isDirectory()
diff --git a/catalogs-contrib/catalog-jdbc-oceanbase/build.gradle.kts
b/catalogs-contrib/catalog-jdbc-oceanbase/build.gradle.kts
index 41640afc7d..812c5bcd94 100644
--- a/catalogs-contrib/catalog-jdbc-oceanbase/build.gradle.kts
+++ b/catalogs-contrib/catalog-jdbc-oceanbase/build.gradle.kts
@@ -73,6 +73,7 @@ tasks {
exclude("guava-*.jar")
exclude("log4j-*.jar")
exclude("slf4j-*.jar")
+ exclude("error_prone_annotations-*.jar")
}
into("$rootDir/distribution/package/catalogs/jdbc-oceanbase/libs")
}
diff --git a/catalogs/catalog-fileset/build.gradle.kts
b/catalogs/catalog-fileset/build.gradle.kts
index 8b4b4305d6..6e048200dc 100644
--- a/catalogs/catalog-fileset/build.gradle.kts
+++ b/catalogs/catalog-fileset/build.gradle.kts
@@ -38,7 +38,6 @@ dependencies {
exclude(group = "*")
}
- implementation(libs.awaitility)
implementation(libs.caffeine)
implementation(libs.cglib)
implementation(libs.commons.io)
@@ -60,7 +59,7 @@ dependencies {
testImplementation(project(":integration-test-common", "testArtifacts"))
testImplementation(project(":server"))
testImplementation(project(":server-common"))
-
+ testImplementation(libs.awaitility)
testImplementation(libs.bundles.log4j)
testImplementation(libs.hadoop3.gcs)
testImplementation(libs.hadoop3.minicluster)
@@ -88,6 +87,7 @@ tasks {
from("build/libs") {
exclude("slf4j-*.jar")
exclude("guava-*.jar")
+ exclude("error_prone_annotations-*.jar")
exclude("curator-*.jar")
exclude("netty-*.jar")
exclude("snappy-*.jar")
diff --git a/catalogs/catalog-hive/build.gradle.kts
b/catalogs/catalog-hive/build.gradle.kts
index e7cdae04b8..45b136fdf7 100644
--- a/catalogs/catalog-hive/build.gradle.kts
+++ b/catalogs/catalog-hive/build.gradle.kts
@@ -133,6 +133,7 @@ tasks {
exclude("guava-*.jar")
exclude("log4j-*.jar")
exclude("slf4j-*.jar")
+ exclude("error_prone_annotations-*.jar")
// Exclude the following jars to avoid conflict with the jars in
authorization-gcp
exclude("protobuf-java-*.jar")
}
diff --git a/catalogs/catalog-jdbc-doris/build.gradle.kts
b/catalogs/catalog-jdbc-doris/build.gradle.kts
index 9f0cf2f3ee..79420bf7d0 100644
--- a/catalogs/catalog-jdbc-doris/build.gradle.kts
+++ b/catalogs/catalog-jdbc-doris/build.gradle.kts
@@ -70,6 +70,7 @@ tasks {
exclude("guava-*.jar")
exclude("log4j-*.jar")
exclude("slf4j-*.jar")
+ exclude("error_prone_annotations-*.jar")
}
into("$rootDir/distribution/package/catalogs/jdbc-doris/libs")
}
diff --git a/catalogs/catalog-jdbc-mysql/build.gradle.kts
b/catalogs/catalog-jdbc-mysql/build.gradle.kts
index 3b4c990abb..712e0b5282 100644
--- a/catalogs/catalog-jdbc-mysql/build.gradle.kts
+++ b/catalogs/catalog-jdbc-mysql/build.gradle.kts
@@ -73,6 +73,7 @@ tasks {
exclude("guava-*.jar")
exclude("log4j-*.jar")
exclude("slf4j-*.jar")
+ exclude("error_prone_annotations-*.jar")
}
into("$rootDir/distribution/package/catalogs/jdbc-mysql/libs")
}
diff --git a/catalogs/catalog-jdbc-postgresql/build.gradle.kts
b/catalogs/catalog-jdbc-postgresql/build.gradle.kts
index 4d48218762..16c4d2dca3 100644
--- a/catalogs/catalog-jdbc-postgresql/build.gradle.kts
+++ b/catalogs/catalog-jdbc-postgresql/build.gradle.kts
@@ -71,6 +71,7 @@ tasks {
exclude("guava-*.jar")
exclude("log4j-*.jar")
exclude("slf4j-*.jar")
+ exclude("error_prone_annotations-*.jar")
}
into("$rootDir/distribution/package/catalogs/jdbc-postgresql/libs")
}
diff --git a/catalogs/catalog-jdbc-starrocks/build.gradle.kts
b/catalogs/catalog-jdbc-starrocks/build.gradle.kts
index 8ec780d984..03b7d260bb 100644
--- a/catalogs/catalog-jdbc-starrocks/build.gradle.kts
+++ b/catalogs/catalog-jdbc-starrocks/build.gradle.kts
@@ -69,6 +69,7 @@ tasks {
exclude("guava-*.jar")
exclude("log4j-*.jar")
exclude("slf4j-*.jar")
+ exclude("error_prone_annotations-*.jar")
}
into("$rootDir/distribution/package/catalogs/jdbc-starrocks/libs")
}
diff --git a/catalogs/catalog-kafka/build.gradle.kts
b/catalogs/catalog-kafka/build.gradle.kts
index d750dbd4a5..4bfd96d25a 100644
--- a/catalogs/catalog-kafka/build.gradle.kts
+++ b/catalogs/catalog-kafka/build.gradle.kts
@@ -69,6 +69,7 @@ tasks {
exclude("guava-*.jar")
exclude("log4j-*.jar")
exclude("slf4j-*.jar")
+ exclude("error_prone_annotations-*.jar")
}
into("$rootDir/distribution/package/catalogs/kafka/libs")
}
diff --git a/catalogs/catalog-lakehouse-generic/build.gradle.kts
b/catalogs/catalog-lakehouse-generic/build.gradle.kts
index da81a437a6..babe7b3144 100644
--- a/catalogs/catalog-lakehouse-generic/build.gradle.kts
+++ b/catalogs/catalog-lakehouse-generic/build.gradle.kts
@@ -85,6 +85,7 @@ tasks {
exclude("guava-*.jar")
exclude("log4j-*.jar")
exclude("slf4j-*.jar")
+ exclude("error_prone_annotations-*.jar")
}
into("$rootDir/distribution/package/catalogs/lakehouse-generic/libs")
}
diff --git a/catalogs/catalog-lakehouse-hudi/build.gradle.kts
b/catalogs/catalog-lakehouse-hudi/build.gradle.kts
index 1076204580..b03b9495df 100644
--- a/catalogs/catalog-lakehouse-hudi/build.gradle.kts
+++ b/catalogs/catalog-lakehouse-hudi/build.gradle.kts
@@ -139,6 +139,7 @@ tasks {
exclude("guava-*.jar")
exclude("log4j-*.jar")
exclude("slf4j-*.jar")
+ exclude("error_prone_annotations-*.jar")
}
into("$rootDir/distribution/package/catalogs/lakehouse-hudi/libs")
}
diff --git a/catalogs/catalog-lakehouse-iceberg/build.gradle.kts
b/catalogs/catalog-lakehouse-iceberg/build.gradle.kts
index 71dd4f7a1f..f3a69c10fd 100644
--- a/catalogs/catalog-lakehouse-iceberg/build.gradle.kts
+++ b/catalogs/catalog-lakehouse-iceberg/build.gradle.kts
@@ -110,6 +110,7 @@ tasks {
exclude("guava-*.jar")
exclude("log4j-*.jar")
exclude("slf4j-*.jar")
+ exclude("error_prone_annotations-*.jar")
}
into("$rootDir/distribution/package/catalogs/lakehouse-iceberg/libs")
}
diff --git a/catalogs/catalog-lakehouse-paimon/build.gradle.kts
b/catalogs/catalog-lakehouse-paimon/build.gradle.kts
index 7a40255bc4..dfb35e61fe 100644
--- a/catalogs/catalog-lakehouse-paimon/build.gradle.kts
+++ b/catalogs/catalog-lakehouse-paimon/build.gradle.kts
@@ -181,6 +181,7 @@ tasks {
exclude("guava-*.jar")
exclude("log4j-*.jar")
exclude("slf4j-*.jar")
+ exclude("error_prone_annotations-*.jar")
}
into("$rootDir/distribution/package/catalogs/lakehouse-paimon/libs")
}
diff --git a/catalogs/catalog-model/build.gradle.kts
b/catalogs/catalog-model/build.gradle.kts
index da2cc3c4fa..056cdaf9de 100644
--- a/catalogs/catalog-model/build.gradle.kts
+++ b/catalogs/catalog-model/build.gradle.kts
@@ -72,6 +72,7 @@ tasks {
exclude("guava-*.jar")
exclude("log4j-*.jar")
exclude("slf4j-*.jar")
+ exclude("error_prone_annotations-*.jar")
}
into("$rootDir/distribution/package/catalogs/model/libs")
}
