Skip to content

Catalog Migrator: Fix META-INF legal files and exclude Hadoop webapps - #270

Merged
jbonofre merged 2 commits into
apache:release/iceberg-catalog-migrator/1.1.0from
ajantha-bhat:codex/catalog-migrator-meta-inf-legal-files
Sep 10, 2026
Merged

jbonofre merged 2 commits into
apache:release/iceberg-catalog-migrator/1.1.0from
ajantha-bhat:codex/catalog-migrator-meta-inf-legal-files

Conversation

@ajantha-bhat

Copy link
Copy Markdown
Member

Summary

  • add clean Apache LICENSE and project NOTICE files to every non-shadow Catalog Migrator JAR under META-INF
  • retain the curated bundle legal files in the shaded CLI JAR
  • exclude unused Hadoop webapps resources from the shaded CLI JAR
  • remove jQuery, jQuery UI, and DataTables entries that are no longer bundled

This addresses the 1.1.0 RC0 vote feedback about missing META-INF/LICENSE and META-INF/NOTICE files in the API artifacts and the bundled jquery.jstree.js resource.

The JAR-specific legal files follow the approach used by Apache Polaris and avoid including distribution-only Gradle wrapper licensing in Maven artifacts.

Verification

  • ./gradlew clean check -x spotlessKotlinCheck
  • ./gradlew assemble
  • ./gradlew spotlessKotlinGradleCheck
  • verified every API, API-test, CLI, source, and Javadoc JAR contains exactly one META-INF/LICENSE and META-INF/NOTICE
  • verified the shaded CLI JAR contains no webapps/** resources and its embedded legal files match BUNDLE-LICENSE and BUNDLE-NOTICE
  • git diff --check

The standalone spotlessKotlinCheck task is currently blocked locally by a ktfmt Parser initialization error affecting all buildSrc Kotlin files.

Version 2.0, January 2004
http://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Similar to main repo apache/polaris@0fe89ec

@ajantha-bhat
ajantha-bhat force-pushed the codex/catalog-migrator-meta-inf-legal-files branch from 24e84fe to e7f8200 Compare September 8, 2026 12:59
@ajantha-bhat

Copy link
Copy Markdown
Member Author

@snazy and @jbonofre : Please take a look, this should address RC0 issues.

@ajantha-bhat

Copy link
Copy Markdown
Member Author

ping @jbonofre, @snazy

@jbonofre

Copy link
Copy Markdown
Member

I'm reviewing it now.

Comment thread iceberg-catalog-migrator/buildSrc/src/main/kotlin/Java.kt Outdated
@ajantha-bhat

Copy link
Copy Markdown
Member Author

@jbonofre: Thanks for the review. Please take another look. Locally verified that no empty gradle folder exist now. I will fix the same in polaris main repo also.

@jbonofre
jbonofre merged commit 35898ec into apache:release/iceberg-catalog-migrator/1.1.0 Sep 10, 2026
2 checks passed
@ajantha-bhat

Copy link
Copy Markdown
Member Author

@jbonofre:
I used codex and didn't observe it created PR on release branch instead of main.
I can make a new RC from release branch. But we should have this fix on main branch too.

Please approve this clean cherry-pick: #271

ajantha-bhat added a commit that referenced this pull request Sep 10, 2026
…#270) (#271)

* Catalog Migrator: Fix META-INF legal files and exclude Hadoop webapps

* Catalog Migrator: Avoid empty directories in JARs
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants