You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@polaris.apache.org by jb...@apache.org on 2026/07/30 04:26:09 UTC

(polaris) branch release/1.7.x updated: Fix missing META-INF/LICENSE+NOTICE in test-fixtures/Spark jars and stale Python version (#5180)

This is an automated email from the ASF dual-hosted git repository.

jbonofre pushed a commit to branch release/1.7.x
in repository https://gitbox.apache.org/repos/asf/polaris.git


The following commit(s) were added to refs/heads/release/1.7.x by this push:
     new 4ac2f059d1 Fix missing META-INF/LICENSE+NOTICE in test-fixtures/Spark jars and stale Python version (#5180)
4ac2f059d1 is described below

commit 4ac2f059d1cce149453d0a5f1ff1dff980ec97cc
Author: JB Onofré <jb...@apache.org>
AuthorDate: Thu Jul 30 06:23:18 2026 +0200

    Fix missing META-INF/LICENSE+NOTICE in test-fixtures/Spark jars and stale Python version (#5180)
    
    * Fix missing META-INF/LICENSE+NOTICE in test-fixtures/Spark jars and stale Python version
    
    The 1.7.0-rc0 release vote surfaced two licensing-documentation issues in the
    staged Maven artifacts:
    
    - 32 test-fixtures artifacts (the `test-fixtures-sources` and
      `test-fixtures-javadoc` jars, across 16 modules) were missing
      `META-INF/LICENSE` and `META-INF/NOTICE`. These jars are registered in
      `PublishingHelperPlugin`, after the `polaris-java` `Jar.configureEach` block
      that injects the license files has already run, so they never received them.
      Add a reusable `addJarLicenseAndNotice()` helper and apply it to both jars.
    
    - The Spark `sources` and `javadoc` jars were missing the files too. The
      `no-license-notice-marker` disables the standard injection for the whole
      Spark module (the shadow bundle jar carries its own root-level
      BUNDLE-LICENSE/BUNDLE-NOTICE), which also stripped them from the sources and
      javadoc jars. Add the ASF LICENSE/NOTICE back under META-INF for those two
      jars only; the bundle jar is left unchanged.
    
    Also bump `client/python/pyproject.toml` from 1.6.0 to 1.7.0: the release
    tooling does not update the Python package version, so it had drifted.
    
    * Add META-INF/LICENSE+NOTICE to the Spark main jar
    
    The previous change only re-added the ASF LICENSE and NOTICE (under
    META-INF) to the Spark `sources` and `javadoc` jars. The main
    (no-classifier) jar is also published and was still missing them, since
    the `no-license-notice-marker` disables the standard injection for every
    jar task in the module.
    
    Include the `jar` task in the injection loop for both the v3.5 and v4.0
    Spark build scripts so the main jar gets META-INF/LICENSE+NOTICE too. The
    shadow bundle jar is unchanged: it packs sourceSets.main.output rather
    than the jar task output and keeps its own root-level
    BUNDLE-LICENSE/BUNDLE-NOTICE.
    
    * Update build.gradle.kts
    
    Co-authored-by: Robert Stupp <sn...@snazy.de>
    
    * Update build.gradle.kts
    
    Co-authored-by: Robert Stupp <sn...@snazy.de>
    
    * Address review comments: simplify LICENSE/NOTICE handling and bump stale versions
    
    - Import org.gradle.jvm.tasks.Jar in polaris-java convention plugin so the
      Jar.configureEach block matches the test-fixtures sources/javadoc jars
      registered by PublishingHelperPlugin, and drop the now-unneeded
      addJarLicenseAndNotice helper (per review feedback).
    - Bump apache-polaris version in client/python/uv.lock to 1.7.0.
    - Bump Helm chart version/appVersion to 1.7.0-SNAPSHOT.
    
    ---------
    
    Co-authored-by: Robert Stupp <sn...@snazy.de>
---
 build-logic/src/main/kotlin/polaris-java.gradle.kts |  1 +
 client/python/pyproject.toml                        |  2 +-
 client/python/uv.lock                               |  2 +-
 plugins/spark/v3.5/spark/build.gradle.kts           | 13 +++++++++++++
 plugins/spark/v4.0/spark/build.gradle.kts           | 13 +++++++++++++
 5 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/build-logic/src/main/kotlin/polaris-java.gradle.kts b/build-logic/src/main/kotlin/polaris-java.gradle.kts
index 5af8ce21dc..4068a8770e 100644
--- a/build-logic/src/main/kotlin/polaris-java.gradle.kts
+++ b/build-logic/src/main/kotlin/polaris-java.gradle.kts
@@ -28,6 +28,7 @@ import org.gradle.api.services.BuildServiceParameters
 import org.gradle.api.tasks.Classpath
 import org.gradle.api.tasks.compile.JavaCompile
 import org.gradle.api.tasks.testing.Test
+import org.gradle.jvm.tasks.Jar
 import org.gradle.kotlin.dsl.named
 import org.gradle.process.CommandLineArgumentProvider
 import org.kordamp.gradle.plugin.jandex.JandexExtension
diff --git a/client/python/pyproject.toml b/client/python/pyproject.toml
index ceb689bc69..4b13868f4a 100644
--- a/client/python/pyproject.toml
+++ b/client/python/pyproject.toml
@@ -19,7 +19,7 @@
 
 [project]
 name = "apache-polaris"
-version = "1.6.0"
+version = "1.7.0"
 description = "Apache Polaris"
 authors = [{ name = "Apache Software Foundation", email = "dev@polaris.apache.org" }]
 requires-python = ">=3.10,<3.15"
diff --git a/client/python/uv.lock b/client/python/uv.lock
index fa6f393261..b233e37d30 100644
--- a/client/python/uv.lock
+++ b/client/python/uv.lock
@@ -13,7 +13,7 @@ wheels = [
 
 [[package]]
 name = "apache-polaris"
-version = "1.6.0"
+version = "1.7.0"
 source = { editable = "." }
 dependencies = [
     { name = "boto3" },
diff --git a/plugins/spark/v3.5/spark/build.gradle.kts b/plugins/spark/v3.5/spark/build.gradle.kts
index 09887e4104..c5e37f97cb 100644
--- a/plugins/spark/v3.5/spark/build.gradle.kts
+++ b/plugins/spark/v3.5/spark/build.gradle.kts
@@ -258,6 +258,19 @@ tasks.named("assemble") { dependsOn(createPolarisSparkJar) }
 
 tasks.named("build") { dependsOn(createPolarisSparkJar) }
 
+// The `src/main/no-license-notice-marker` file disables the standard META-INF/LICENSE+NOTICE
+// injection for this module, because the shadow bundle jar carries its own root-level
+// BUNDLE-LICENSE/BUNDLE-NOTICE. The main, sources and javadoc jars still need the ASF LICENSE and
+// NOTICE under META-INF, so add them back explicitly for those jars (the bundle jar is left as-is).
+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" }
+    }
+  }
+}
+
 publishing {
   publications.named<MavenPublication>("maven") {
     artifact(createPolarisSparkJar)
diff --git a/plugins/spark/v4.0/spark/build.gradle.kts b/plugins/spark/v4.0/spark/build.gradle.kts
index f569dabdaf..4edd438415 100644
--- a/plugins/spark/v4.0/spark/build.gradle.kts
+++ b/plugins/spark/v4.0/spark/build.gradle.kts
@@ -261,6 +261,19 @@ tasks.named("assemble") { dependsOn(createPolarisSparkJar) }
 
 tasks.named("build") { dependsOn(createPolarisSparkJar) }
 
+// The `src/main/no-license-notice-marker` file disables the standard META-INF/LICENSE+NOTICE
+// injection for this module, because the shadow bundle jar carries its own root-level
+// BUNDLE-LICENSE/BUNDLE-NOTICE. The main, sources and javadoc jars still need the ASF LICENSE and
+// NOTICE under META-INF, so add them back explicitly for those jars (the bundle jar is left as-is).
+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" }
+    }
+  }
+}
+
 publishing {
   publications.named<MavenPublication>("maven") {
     artifact(createPolarisSparkJar)