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

8345799: Update copyright year to 2024 for core-libs in files where it was missed #22640

Closed
wants to merge 3 commits into from

Conversation

magicus
Copy link
Member

@magicus magicus commented Dec 9, 2024

Some files have been modified in 2024, but the copyright year has not been properly updated. This should be fixed.

I have located these modified files using:

git log --since="Jan 1" --name-only --pretty=format: | sort -u > file.list

and then run a script to update the copyright year to 2024 on these files.

I have made a manual sampling of files in the list to verify that they have indeed been modified in 2024.


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8345799: Update copyright year to 2024 for core-libs in files where it was missed (Bug - P4)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/22640/head:pull/22640
$ git checkout pull/22640

Update a local copy of the PR:
$ git checkout pull/22640
$ git pull https://git.openjdk.org/jdk.git pull/22640/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 22640

View PR using the GUI difftool:
$ git pr show -t 22640

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/22640.diff

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 9, 2024

👋 Welcome back ihse! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk
Copy link

openjdk bot commented Dec 9, 2024

@magicus This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8345799: Update copyright year to 2024 for core-libs in files where it was missed

Reviewed-by: joehw, jlu, mli, lancea, kevinw

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 40 new commits pushed to the master branch:

  • c9ec271: 8345800: Update copyright year to 2024 for serviceability in files where it was missed
  • 8e0f929: 8345805: Update copyright year to 2024 for other files where it was missed
  • f88c1c6: 8345773: Class-File API debug printing capability
  • e88e793: 8343148: C2: Refactor uses of "PhaseValue::con() + PhaseIdealLoop::set_ctrl()" into separate method
  • 1e9204f: 8345273: Fix -Wzero-as-null-pointer-constant warnings in s390 code
  • c40140e: 8334581: Remove no-arg constructor BasicSliderUI()
  • 8de0622: 8345767: javax/swing/JSplitPane/4164779/JSplitPaneKeyboardNavigationTest.java fails in ubuntu22.04
  • abcd23f: 8334756: javac crashed on call to non-existent generic method with explicit annotated type arg
  • 2ddaa46: 8305010: Test vmTestbase/nsk/jvmti/scenarios/sampling/SP05/sp05t003/TestDescription.java timed out: thread not suspended
  • c631719: 8343170: java/awt/Cursor/JPanelCursorTest/JPanelCursorTest.java does not show the default cursor
  • ... and 30 more: https://git.openjdk.org/jdk/compare/830173fcb08b004ea3932d47cb522c589feec0b5...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the rfr Pull request is ready for review label Dec 9, 2024
@openjdk
Copy link

openjdk bot commented Dec 9, 2024

@magicus The following labels will be automatically applied to this pull request:

  • client
  • compiler
  • core-libs
  • hotspot-runtime
  • i18n
  • net
  • nio
  • security
  • serviceability

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added security security-dev@openjdk.org serviceability serviceability-dev@openjdk.org hotspot-runtime hotspot-runtime-dev@openjdk.org nio nio-dev@openjdk.org client client-libs-dev@openjdk.org core-libs core-libs-dev@openjdk.org net net-dev@openjdk.org compiler compiler-dev@openjdk.org i18n i18n-dev@openjdk.org labels Dec 9, 2024
@mlbridge
Copy link

mlbridge bot commented Dec 9, 2024

Webrevs

@dfuch
Copy link
Member

dfuch commented Dec 9, 2024

changes to sun.net and java.naming/jdk.naming.* look ok

Copy link
Contributor

@kevinjwalls kevinjwalls left a comment

Choose a reason for hiding this comment

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

Looks good.
They all seem to follow the pattern, I looked at some and yes they have changes in 2024 but no year update. One of them was mine I noticed!

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Dec 9, 2024
@RogerRiggs
Copy link
Contributor

That git query isn't correct for all the files in the repo. In particular, the copyrights on third party files are NOT updated uniformly when new versions are applied. In particular, XML files are NOT updated.

Copy link
Contributor

@RogerRiggs RogerRiggs left a comment

Choose a reason for hiding this comment

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

Copyright dates in third party files are not updated uniformly. See the previous comment.

@kevinjwalls
Copy link
Contributor

I also meant to note that there are updates to binaries, src/java.base/share/classes/jdk/internal/icu/impl/data/icudt76b/... which maybe isn't intentional, or I just don't understand?

@magicus
Copy link
Member Author

magicus commented Dec 9, 2024

I also meant to note that there are updates to binaries, src/java.base/share/classes/jdk/internal/icu/impl/data/icudt76b/... which maybe isn't intentional, or I just don't understand?

That was certainly not intentional! I'm not sure how that happened, I need to look at my copyright update script again...

@openjdk openjdk bot removed the ready Pull request is ready to be integrated label Dec 9, 2024
@magicus
Copy link
Member Author

magicus commented Dec 9, 2024

That git query isn't correct for all the files in the repo. In particular, the copyrights on third party files are NOT updated uniformly when new versions are applied. In particular, XML files are NOT updated.

I'm not sure I understand what you mean. Are you saying that I did not update files that should have been updated, or that I updated files that should not have been updated?

The only 3rd party XML files I know about are the ones in make/data/cldr. They have certainly been updated in 2024 from upstream, but they do not carry an Oracle copyright header, so there is nothing there to update.

@JoeWang-Java
Copy link
Member

JoeWang-Java commented Dec 9, 2024

The change to the java.xml part looks good. Thanks.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Dec 9, 2024
@RogerRiggs
Copy link
Contributor

@magicus My question was about third party (xml) code used from Apache.
Joe's review and approval resolved that question.

Copy link
Member

@justin-curtis-lu justin-curtis-lu left a comment

Choose a reason for hiding this comment

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

Looked at the i18n changes (src, test, and 3rd party icu files w/ Oracle header) and they look correct to me.

@prsadhuk
Copy link
Contributor

not sure why client label is added, no java.desktop/accessibility files are in there

@prrace
Copy link
Contributor

prrace commented Dec 10, 2024

not sure why client label is added, no java.desktop/accessibility files are in there

I was puzzling over that too.

Copy link

@Hamlin-Li Hamlin-Li left a comment

Choose a reason for hiding this comment

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

Nice batch cleanup.

@magicus
Copy link
Member Author

magicus commented Dec 11, 2024

@prsadhuk @prrace src/java.base/share/classes/jdk/internal/access/JavaAWTFontAccess.java matches the pattern "src/java.base/share/classes/jdk/internal/access/\\w+AWT" which is setup for client in the Skara jdk.json label configuration.

@magicus
Copy link
Member Author

magicus commented Dec 11, 2024

/integrate

@openjdk
Copy link

openjdk bot commented Dec 11, 2024

Going to push as commit ddf0461.
Since your change was applied there have been 56 commits pushed to the master branch:

  • cbab40b: 8345683: Remove special flags for files compiled for static libraries
  • 08bdeed: 8345269: Fix -Wzero-as-null-pointer-constant warnings in ppc code
  • e4a34e9: 8345616: Unnecessary Hashtable usage in javax.swing.text.html.parser.Element
  • cce5808: 8345421: (bf) Create specific test for temporary direct buffers and the buffer size limit
  • cf0e1aa: 8345335: Add excluded jdk_foreign tests to manual group
  • 2c4567a: 8342651: Refactor array constant to use an array of jbyte
  • 72c6daf: 8346007: Incorrect copyright header in UModLNodeIdealizationTests.java
  • cc47918: 8345040: Clean up unused variables and code in generate_native_wrapper
  • c34b87c: 8345659: Fix broken alignment after ReservedSpace splitting in GC code
  • e294899: 8345647: Fix recent NULL usage backsliding in Shenandoah
  • ... and 46 more: https://git.openjdk.org/jdk/compare/830173fcb08b004ea3932d47cb522c589feec0b5...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Dec 11, 2024
@openjdk openjdk bot closed this Dec 11, 2024
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Dec 11, 2024
@openjdk
Copy link

openjdk bot commented Dec 11, 2024

@magicus Pushed as commit ddf0461.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

@magicus magicus deleted the year-2024-core branch December 11, 2024 21:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
client client-libs-dev@openjdk.org compiler compiler-dev@openjdk.org core-libs core-libs-dev@openjdk.org hotspot-runtime hotspot-runtime-dev@openjdk.org i18n i18n-dev@openjdk.org integrated Pull request has been integrated net net-dev@openjdk.org nio nio-dev@openjdk.org security security-dev@openjdk.org serviceability serviceability-dev@openjdk.org
Development

Successfully merging this pull request may close these issues.

10 participants