You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@polaris.apache.org by aj...@apache.org on 2026/10/26 07:25:14 UTC
(polaris) branch main updated: fix(build): avoid empty directories in JARs (#5487)
This is an automated email from the ASF dual-hosted git repository.
ajantha-bhat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/polaris.git
The following commit(s) were added to refs/heads/main by this push:
new 65befed840 fix(build): avoid empty directories in JARs (#5487)
65befed840 is described below
commit 65befed8407eb8e6a1a5bb0d1a242fcdf5e82c2d
Author: Ajantha Bhat <aj...@gmail.com>
AuthorDate: Mon Oct 26 07:25:09 2026 +0000
fix(build): avoid empty directories in JARs (#5487)
Avoid adding empty gradle/ and gradle/jar-licenses/ directories to JARs when copying LICENSE and NOTICE into META-INF.
---
build-logic/src/main/kotlin/polaris-java.gradle.kts | 8 ++------
plugins/spark/v3.5/spark/build.gradle.kts | 5 ++---
plugins/spark/v4.0/spark/build.gradle.kts | 5 ++---
3 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/build-logic/src/main/kotlin/polaris-java.gradle.kts b/build-logic/src/main/kotlin/polaris-java.gradle.kts
index 1177419a98..4081f8c62d 100644
--- a/build-logic/src/main/kotlin/polaris-java.gradle.kts
+++ b/build-logic/src/main/kotlin/polaris-java.gradle.kts
@@ -222,16 +222,12 @@ tasks.withType<Jar>().configureEach {
if (!project.file("src/main/no-license-notice-marker").exists()) {
if (!project.file("src/main/resources/META-INF/LICENSE").exists()) {
- from(rootProject.rootDir) {
- include("gradle/jar-licenses/LICENSE").eachFile { path = "META-INF/$sourceName" }
- }
+ from(rootProject.file("gradle/jar-licenses/LICENSE")) { into("META-INF") }
} else if (name == "javadocJar") {
from("src/main/resources") { include("META-INF/LICENSE") }
}
if (!project.file("src/main/resources/META-INF/NOTICE").exists()) {
- from(rootProject.rootDir) {
- include("gradle/jar-licenses/NOTICE").eachFile { path = "META-INF/$sourceName" }
- }
+ from(rootProject.file("gradle/jar-licenses/NOTICE")) { into("META-INF") }
} else if (name == "javadocJar") {
from("src/main/resources") { include("META-INF/NOTICE") }
}
diff --git a/plugins/spark/v3.5/spark/build.gradle.kts b/plugins/spark/v3.5/spark/build.gradle.kts
index ff3a89bdae..36279f3ffc 100644
--- a/plugins/spark/v3.5/spark/build.gradle.kts
+++ b/plugins/spark/v3.5/spark/build.gradle.kts
@@ -272,9 +272,8 @@ tasks.named("build") { dependsOn(createPolarisSparkJar) }
// bundle jar is intentionally left untouched here).
listOf("jar", "sourcesJar", "javadocJar").forEach { jarTask ->
tasks.named<Jar>(jarTask) {
- from(layout.settingsDirectory) {
- include("gradle/jar-licenses/LICENSE", "gradle/jar-licenses/NOTICE")
- eachFile { path = "META-INF/$sourceName" }
+ into("META-INF") {
+ from(layout.settingsDirectory.dir("gradle/jar-licenses")) { include("LICENSE", "NOTICE") }
}
}
}
diff --git a/plugins/spark/v4.0/spark/build.gradle.kts b/plugins/spark/v4.0/spark/build.gradle.kts
index 718c3d967f..f3791bfaaf 100644
--- a/plugins/spark/v4.0/spark/build.gradle.kts
+++ b/plugins/spark/v4.0/spark/build.gradle.kts
@@ -275,9 +275,8 @@ tasks.named("build") { dependsOn(createPolarisSparkJar) }
// bundle jar is intentionally left untouched here).
listOf("jar", "sourcesJar", "javadocJar").forEach { jarTask ->
tasks.named<Jar>(jarTask) {
- from(layout.settingsDirectory) {
- include("gradle/jar-licenses/LICENSE", "gradle/jar-licenses/NOTICE")
- eachFile { path = "META-INF/$sourceName" }
+ into("META-INF") {
+ from(layout.settingsDirectory.dir("gradle/jar-licenses")) { include("LICENSE", "NOTICE") }
}
}
}