This is an automated email from the ASF dual-hosted git repository.
yufei 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 c00472881 fix: Only include project LICENSE and NOTICE in Spark Client
Jar (#1950)
c00472881 is described below
commit c00472881aa410f26855dd668db9cf351ceb764c
Author: Russell Spitzer <russell.spit...@gmail.com>
AuthorDate: Fri Jun 27 11:58:04 2025 -0500
fix: Only include project LICENSE and NOTICE in Spark Client Jar (#1950)
---
plugins/spark/v3.5/spark/build.gradle.kts | 97 ++++++++++++++++++++++++++++---
1 file changed, 89 insertions(+), 8 deletions(-)
diff --git a/plugins/spark/v3.5/spark/build.gradle.kts
b/plugins/spark/v3.5/spark/build.gradle.kts
index d61c5fd5b..e0e8488b4 100644
--- a/plugins/spark/v3.5/spark/build.gradle.kts
+++ b/plugins/spark/v3.5/spark/build.gradle.kts
@@ -1,7 +1,7 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
+ * distributed with this work for additional debugrmation
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
@@ -85,12 +85,6 @@ tasks.register<ShadowJar>("createPolarisSparkJar") {
archiveClassifier = "bundle"
isZip64 = true
- // include the LICENSE and NOTICE files for the shadow Jar
- from(projectDir) {
- include("LICENSE")
- include("NOTICE")
- }
-
// pack both the source code and dependencies
from(sourceSets.main.get().output)
configurations = listOf(project.configurations.runtimeClasspath.get())
@@ -99,9 +93,96 @@ tasks.register<ShadowJar>("createPolarisSparkJar") {
// The iceberg-spark-runtime plugin is always packaged along with our
polaris-spark plugin,
// therefore excluded from the optimization.
minimize {
exclude(dependency("org.apache.iceberg:iceberg-spark-runtime-*.*")) }
+
+ // Always run the license file addition after this task completes
+ finalizedBy("addLicenseFilesToJar")
+}
+
+// Post-processing task to add our project's LICENSE and NOTICE files to the
jar and remove any
+// other LICENSE or NOTICE files that were shaded in.
+tasks.register("addLicenseFilesToJar") {
+ dependsOn("createPolarisSparkJar")
+
+ doLast {
+ val shadowTask = tasks.named("createPolarisSparkJar",
ShadowJar::class.java).get()
+ val jarFile = shadowTask.archiveFile.get().asFile
+ val tempDir =
+ File(
+
"${project.layout.buildDirectory.get().asFile}/tmp/jar-cleanup-${shadowTask.archiveBaseName.get()}-${shadowTask.archiveClassifier.get()}"
+ )
+ val projectLicenseFile = File(projectDir, "LICENSE")
+ val projectNoticeFile = File(projectDir, "NOTICE")
+
+ // Validate that required license files exist
+ if (!projectLicenseFile.exists()) {
+ throw GradleException("Project LICENSE file not found at:
${projectLicenseFile.absolutePath}")
+ }
+ if (!projectNoticeFile.exists()) {
+ throw GradleException("Project NOTICE file not found at:
${projectNoticeFile.absolutePath}")
+ }
+
+ logger.info("Processing jar: ${jarFile.absolutePath}")
+ logger.info("Using temp directory: ${tempDir.absolutePath}")
+
+ // Clean up temp directory
+ if (tempDir.exists()) {
+ tempDir.deleteRecursively()
+ }
+ tempDir.mkdirs()
+
+ // Extract the jar
+ copy {
+ from(zipTree(jarFile))
+ into(tempDir)
+ }
+
+ fileTree(tempDir)
+ .matching {
+ include("**/*LICENSE*")
+ include("**/*NOTICE*")
+ }
+ .forEach { file ->
+ logger.info("Removing license file: ${file.relativeTo(tempDir)}")
+ file.delete()
+ }
+
+ // Remove META-INF/licenses directory if it exists
+ val licensesDir = File(tempDir, "META-INF/licenses")
+ if (licensesDir.exists()) {
+ licensesDir.deleteRecursively()
+ logger.info("Removed META-INF/licenses directory")
+ }
+
+ // Copy our project's license files to root
+ copy {
+ from(projectLicenseFile)
+ into(tempDir)
+ }
+ logger.info("Added project LICENSE file")
+
+ copy {
+ from(projectNoticeFile)
+ into(tempDir)
+ }
+ logger.info("Added project NOTICE file")
+
+ // Delete the original jar
+ jarFile.delete()
+
+ // Create new jar with only project LICENSE and NOTICE files
+ ant.withGroovyBuilder {
+ "jar"("destfile" to jarFile.absolutePath) { "fileset"("dir" to
tempDir.absolutePath) }
+ }
+
+ logger.info("Recreated jar with only project LICENSE and NOTICE files")
+
+ // Clean up temp directory
+ tempDir.deleteRecursively()
+ }
}
-// ensure the ShadowJar job is run for both `assemble` and `build` task
+// ensure the shadow jar job (which will automatically run license addition)
is run for both
+// `assemble` and `build` task
tasks.named("assemble") { dependsOn("createPolarisSparkJar") }
tasks.named("build") { dependsOn("createPolarisSparkJar") }
