Skip to content
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

OF-2716: Fix Licences #2370

Merged
merged 12 commits into from
Dec 21, 2023
Merged

OF-2716: Fix Licences #2370

merged 12 commits into from
Dec 21, 2023

Conversation

Fishbowler
Copy link
Member

Replaces #2367 (because I accidentally deleted the branch)

@Fishbowler
Copy link
Member Author

Script moved to https://gist.github.com/Fishbowler/ed6a05c4e7b7ba539f814df3f54e5772
I wanted it in Ignite Realtime, but I can't see a way to create gists in organisations.

@Fishbowler
Copy link
Member Author

I'm going to rewrite history to remove the script.

For files that have copyright assigned to some variant of Ignite, and where it should be Ignite Realtime Foundation, fix it.

Mostly s/Community/Foundation
We want [YEAR] [OWNER], not the other way around
This file was missed in OF-65 / commit 324dd3b and was relicensed by Jive to Apache. This just fixes the header to reflect that decision.
…thers

Just to aid scriptable checking. Also adds Ignite's contributions.
For JSP or Java files in the repo, detect and add missing license headers. Copyright headers are reconstructed from git history.
…nse header

Via script, add Ignite to the copyright line for Java and JSP files, using git history to calculate the correct years.
Via script, use git history to amend years of edits of the file
Via script, amend any items missing the (C) after Copyright, amend any items missing 'All rights reserved' at the end of the copyright line, then run other fixes now that they're consistent.
The script's auto-fixes highlighted that some files had incorrect attributions.
Fix more files that the script worked out were wrong, but couldn't fix automatically
@Fishbowler
Copy link
Member Author

Done, ready for merge

@Fishbowler Fishbowler requested review from akrherz and guusdk December 20, 2023 18:54
Copy link
Member

@guusdk guusdk left a comment

Choose a reason for hiding this comment

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

I've skimmed over examples of the changes, with regards to years and legal entity references, which seems to be fine.

I've used (suboptimal) bash grepping to verify that all changes in this PR affect lines that are in comment, which turns out to be the case nearly everywhere (some JSP import statements got moved around too, which is fine):

git diff 68ecdf119e6f17e81f84bef84d5a2b2dcd2c0edf HEAD | grep "^[\+\-]" | grep -v "^---" | grep -v "^++" | grep -v -E '^[+-] \*' | grep -v "^[+-]  -"

That's all that I can think of to sensibly review this PR. Thanks for all of the effort that has gone into this, @Fishbowler !

@akrherz akrherz merged commit 9d9bd1e into igniterealtime:main Dec 21, 2023
16 checks passed
@Fishbowler Fishbowler deleted the licences branch February 8, 2025 14:14
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