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

CLDR-18212 Update copyright to 2025 #4271

Merged
merged 2 commits into from
Jan 14, 2025

Conversation

conradarcturus
Copy link
Contributor

Ran the following scripts to re-generate the year in copyright stamps or update

mvn package -DskipTests=true
java -jar tools/cldr-code/target/cldr-code.jar GenerateDtd
java -jar tools/cldr-code/target/cldr-code.jar GenerateTestData
java -jar tools/cldr-code/target/cldr-code.jar GenerateValidityXML
java -jar tools/cldr-code/target/cldr-code.jar CLDRModify -d common/main/

Unfortunately GenerateDerivedAnnotations did not work on my computer so I did not run that.

All other files updated with sed 's/© 1991-2024/© 1991-2025/g' *

CLDR-18212

  • This PR completes the ticket.

ALLOW_MANY_COMMITS=true

Ran the following scripts to re-generate the year in copyright stamps

```
mvn package -DskipTests=true
java -jar tools/cldr-code/target/cldr-code.jar GenerateDtd
java -jar tools/cldr-code/target/cldr-code.jar GenerateTestData
java -jar tools/cldr-code/target/cldr-code.jar GenerateValidityXML
java -jar tools/cldr-code/target/cldr-code.jar CLDRModify -d common/main/
```
pedberg-icu
pedberg-icu previously approved these changes Jan 9, 2025
srl295
srl295 previously requested changes Jan 9, 2025
Copy link
Member

@srl295 srl295 left a comment

Choose a reason for hiding this comment

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

we do not need to bump all copyrights

@srl295
Copy link
Member

srl295 commented Jan 9, 2025

All other files updated with sed 's/© 1991-2024/© 1991-2025/g' *

We don't need to update ALL files!! Only files that actually change.

@srl295
Copy link
Member

srl295 commented Jan 9, 2025

we don't need to update the © on generated files unless they are actually regenerated.

We do need to update the top README copyright. but not every single copyright.

@conradarcturus conradarcturus dismissed srl295’s stale review January 10, 2025 00:05

Removed the changes from SED and am just doing the ones from the generating scripts

@conradarcturus conradarcturus force-pushed the CLDR-18212-update-copyright-to-2025 branch from 56f2a3e to 3cae8a3 Compare January 10, 2025 00:07
@jira-pull-request-webhook
Copy link

Notice: the branch changed across the force-push!

  • common/annotationsDerived/af.xml is no longer changed in the branch
  • common/annotationsDerived/ak.xml is no longer changed in the branch
  • common/annotationsDerived/am.xml is no longer changed in the branch
  • common/annotationsDerived/ar_SA.xml is different
  • common/annotationsDerived/ar.xml is no longer changed in the branch
  • common/annotationsDerived/as.xml is no longer changed in the branch
  • common/annotationsDerived/ast.xml is no longer changed in the branch
  • common/annotationsDerived/az.xml is no longer changed in the branch
  • common/annotationsDerived/be.xml is no longer changed in the branch
  • common/annotationsDerived/bew.xml is no longer changed in the branch
  • common/annotationsDerived/bg.xml is no longer changed in the branch
  • common/annotationsDerived/bgn.xml is no longer changed in the branch
  • common/main/en_PR.xml is now changed in the branch
  • common/main/en_PW.xml is now changed in the branch
  • common/main/en_RW.xml is now changed in the branch
  • common/main/en_SB.xml is now changed in the branch
  • common/main/en_SC.xml is now changed in the branch
  • common/main/en_SD.xml is now changed in the branch
  • common/main/en_SE.xml is now changed in the branch
  • common/main/en_SG.xml is now changed in the branch
  • common/main/en_SH.xml is now changed in the branch
  • common/main/en_SI.xml is now changed in the branch
  • common/main/en_SL.xml is now changed in the branch

View Diff Across Force-Push

~ Your Friendly Jira-GitHub PR Checker Bot

Copy link
Member

@srl295 srl295 left a comment

Choose a reason for hiding this comment

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

I'm RSLGTM for now.

I think in the future it would be better to fix all tools to only bump copyright if something actually changes, and otherwise revert. That would help us see more accurately if a file really changes

@conradarcturus conradarcturus merged commit 24e1132 into main Jan 14, 2025
13 checks passed
@conradarcturus conradarcturus deleted the CLDR-18212-update-copyright-to-2025 branch January 14, 2025 16:08
@conradarcturus
Copy link
Contributor Author

@srl295 Yea, that makes sense. It would be good to add "only update year if file changed" to the generating output is different. IMHO it also would be good to add checksums to generated files to help protect against manual changes (the changes should be overrides during generation).

The reason I preferred doing this (bulk copyright update) is that these scripts today will update copyrights all over the place if we run them, polluting other PRs. This isolates the unrelated changes in 1 PR. However I understand that we don't need to update the copyright if we have not updated the code inside...

@srl295
Copy link
Member

srl295 commented Jan 14, 2025

@srl295 Yea, that makes sense. It would be good to add "only update year if file changed" to the generating output is different. IMHO it also would be good to add checksums to generated files to help protect against manual changes (the changes should be overrides during generation).

CLDRModify -R … claims to do that and many other tools do as well.

Checksums - hm. Actually, what I would propose instead would be automation - CI jobs that do the regeneration and error and/or make a PR if something would changes.

The reason I preferred doing this (bulk copyright update) is that these scripts today will update copyrights all over the place if we run them, polluting other PRs. This isolates the unrelated changes in 1 PR. However I understand that we don't need to update the copyright if we have not updated the code inside...

And I 100% agree for the supplemental data pieces, etc. we don't need those conflicting more than they already do. I'm referring to common/main/* and similar, which normally only change when there's a manual update or a ST change, but aren't normally regenerated

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