Skip to content

Update headers for files copied from non ASF projects and update LICENSE #1562

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 14, 2025

Conversation

jbonofre
Copy link
Member

This PR removes the ASF header in the files copied from non ASF projects (but ASLv2 licensed).

It also updates LICENSE with files not actually copied (but created in Apache Polaris).

@jbonofre
Copy link
Member Author

@justinmclean Can you please take a look, regarding your comment on Incubator general mailing list ? Thanks !

@jbonofre
Copy link
Member Author

I will update spotless configuration to avoid to "force" ASF header (that's the reason why the header has been changed).

@@ -37,7 +37,7 @@ if (!project.extra.has("duplicated-project-sources")) {
spotless {
kotlinGradle {
ktfmt().googleStyle()
licenseHeaderFile(rootProject.file("codestyle/copyright-header-java.txt"), "$")
// licenseHeaderFile(rootProject.file("codestyle/copyright-header-java.txt"), "$")
Copy link
Contributor

Choose a reason for hiding this comment

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

Accidental?

Copy link
Member

Choose a reason for hiding this comment

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

JB explained to me that this is to prevent spotlessApply from changing the headers back to ASF from dremio. We'll need to figure out how to get the plugin to allow for multiple headers.

Copy link
Member Author

Choose a reason for hiding this comment

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

It's intentional: with that, spotless:apply "overwrites" all header with ASF header, which is wrong as we have to keep the original header in case of code copy.

@jbonofre jbonofre requested a review from singhpk234 as a code owner May 14, 2025 11:21
@github-project-automation github-project-automation bot moved this from PRs In Progress to Ready to merge in Basic Kanban Board May 14, 2025
@jbonofre jbonofre merged commit 1baef0e into apache:main May 14, 2025
6 checks passed
@github-project-automation github-project-automation bot moved this from Ready to merge to Done in Basic Kanban Board May 14, 2025
@jbonofre jbonofre deleted the fix-asf-header branch May 14, 2025 19:06
jbonofre added a commit that referenced this pull request May 14, 2025
@jbonofre jbonofre added this to the 0.10.0-beta milestone May 14, 2025
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