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

8344611: Add missing classpath exception #22272

Closed
wants to merge 2 commits into from

Conversation

Sorna-Sarathi
Copy link
Contributor

@Sorna-Sarathi Sorna-Sarathi commented Nov 20, 2024

This PR adds missing Classpath exception in several files.

JBS Issue: JDK-8334611


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-8344611: Add missing classpath exception (Bug - P2)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 22272

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

Using diff file

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

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 20, 2024

👋 Welcome back Sorna-Sarathi! 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 Nov 20, 2024

@Sorna-Sarathi 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:

8344611: Add missing classpath exception

Reviewed-by: amitkumar, iris

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 368 new commits pushed to the master branch:

  • c517ffb: 8339910: RISC-V: crc32 intrinsic with carry-less multiplication
  • e0d6398: 8344575: Examine usage of ReflectUtil.forName() in java.sql.rowset - XmlReaderContentHandler
  • 470701f: 8340969: jdk/jfr/startupargs/TestStartDuration.java should be marked as flagless
  • 573bcb6: 8345664: Use simple parameter type names in @link and @see tags
  • 4966419: 8334733: Remove obsolete @enablePreview from tests after JDK-8334714
  • 0e2a285: 8344833: CTW: Make failing on zero classes optional
  • f6021a9: 8344668: Unnecessary array allocations and copying in TextLine
  • 874d68a: 8343747: C2: TestReplicateAtConv.java crashes with -XX:MaxVectorSize=8
  • d9a2213: 8345299: C2: some nodes can still have incorrect control after do_range_check()
  • 2286fae: 8345159: RISCV: Fix -Wzero-as-null-pointer-constant warning in emit_static_call_stub
  • ... and 358 more: https://git.openjdk.org/jdk/compare/cf158bc6cdadfdfa944b8ec1d3dc7069c8f055a9...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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@offamitkumar, @irisclark) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

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

openjdk bot commented Nov 20, 2024

@Sorna-Sarathi To determine the appropriate audience for reviewing this pull request, one or more labels corresponding to different subsystems will normally be applied automatically. However, no automatic labelling rule matches the changes in this pull request. In order to have an "RFR" email sent to the correct mailing list, you will need to add one or more applicable labels manually using the /label pull request command.

Applicable Labels
  • build
  • client
  • compiler
  • core-libs
  • graal
  • hotspot
  • hotspot-compiler
  • hotspot-gc
  • hotspot-jfr
  • hotspot-runtime
  • i18n
  • ide-support
  • javadoc
  • jdk
  • jmx
  • kulla
  • net
  • nio
  • security
  • serviceability
  • shenandoah

Copy link
Member

@offamitkumar offamitkumar left a comment

Choose a reason for hiding this comment

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

Do similar change for:

src/java.base/share/native/libjava/ub.h
src/jdk.jlink/share/classes/jdk/tools/jlink/internal/runtimelink/JimageDiffGenerator.java
src/jdk.jlink/share/classes/jdk/tools/jlink/internal/runtimelink/ResourcePoolReader.java

@Sorna-Sarathi
Copy link
Contributor Author

Do similar change for:

src/java.base/share/native/libjava/ub.h
src/jdk.jlink/share/classes/jdk/tools/jlink/internal/runtimelink/JimageDiffGenerator.java
src/jdk.jlink/share/classes/jdk/tools/jlink/internal/runtimelink/ResourcePoolReader.java

Added the changes for the above files.

@offamitkumar
Copy link
Member

/label core-libs

@openjdk openjdk bot added the core-libs core-libs-dev@openjdk.org label Nov 20, 2024
@openjdk
Copy link

openjdk bot commented Nov 20, 2024

@offamitkumar
The core-libs label was successfully added.

@mlbridge
Copy link

mlbridge bot commented Nov 20, 2024

Webrevs

@Sorna-Sarathi
Copy link
Contributor Author

Summary

This PR fixes JDK-8334611 and adds missing classpath exception in several files. It's now ready for review

Could someone from the community please review this PR and provide feedback?
Thank you!

@offamitkumar
Copy link
Member

@jerboaa can we get one more approval ?

@jerboaa
Copy link
Contributor

jerboaa commented Nov 28, 2024

src/java.base/share/native/libjava/ub.h
src/jdk.jlink/share/classes/jdk/tools/jlink/internal/runtimelink/JimageDiffGenerator.java
src/jdk.jlink/share/classes/jdk/tools/jlink/internal/runtimelink/ResourcePoolReader.java

Look OK. I'm not sure about the libsleef part. A reviewer of that PR, perhaps @theRealAph, might be able to help?

@offamitkumar
Copy link
Member

This only adds information about the classpath exception copyright. So can't we consider it trivial ? As there is not functionality change.

@dholmes-ora
Copy link
Member

It may be "trivial" in that sense but if "Oracle is designating ..." then it probably needs someone from Oracle to confirm it is an okay change to make. Like @jerboaa I am unclear about the libsleef files. @irisclark can you give the okay here?

@AlanBateman
Copy link
Contributor

If you want, you could separate the two areas so that you at least get the jlink source updated.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Dec 6, 2024
@Sorna-Sarathi
Copy link
Contributor Author

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Dec 8, 2024
@openjdk
Copy link

openjdk bot commented Dec 8, 2024

@Sorna-Sarathi
Your change (at version 84398cc) is now ready to be sponsored by a Committer.

@dholmes-ora
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented Dec 9, 2024

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

  • 83ea013: 8345629: Remove expired flags in JDK 25
  • c517ffb: 8339910: RISC-V: crc32 intrinsic with carry-less multiplication
  • e0d6398: 8344575: Examine usage of ReflectUtil.forName() in java.sql.rowset - XmlReaderContentHandler
  • 470701f: 8340969: jdk/jfr/startupargs/TestStartDuration.java should be marked as flagless
  • 573bcb6: 8345664: Use simple parameter type names in @link and @see tags
  • 4966419: 8334733: Remove obsolete @enablePreview from tests after JDK-8334714
  • 0e2a285: 8344833: CTW: Make failing on zero classes optional
  • f6021a9: 8344668: Unnecessary array allocations and copying in TextLine
  • 874d68a: 8343747: C2: TestReplicateAtConv.java crashes with -XX:MaxVectorSize=8
  • d9a2213: 8345299: C2: some nodes can still have incorrect control after do_range_check()
  • ... and 359 more: https://git.openjdk.org/jdk/compare/cf158bc6cdadfdfa944b8ec1d3dc7069c8f055a9...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Dec 9, 2024

@dholmes-ora @Sorna-Sarathi Pushed as commit 458979d.

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

pshipton added a commit to pshipton/openj9-openjdk-jdk21 that referenced this pull request Dec 10, 2024
Backport from openjdk/jdk#22272

Signed-off-by: Peter Shipton <Peter_Shipton@ca.ibm.com>
pshipton added a commit to pshipton/openj9-openjdk-jdk24 that referenced this pull request Dec 10, 2024
Backport from openjdk/jdk#22272

Signed-off-by: Peter Shipton <Peter_Shipton@ca.ibm.com>
keithc-ca pushed a commit to ibmruntimes/openj9-openjdk-jdk24 that referenced this pull request Dec 10, 2024
Backport from openjdk/jdk#22272

Signed-off-by: Peter Shipton <Peter_Shipton@ca.ibm.com>
@Sorna-Sarathi
Copy link
Contributor Author

/backport jdk24

@openjdk
Copy link

openjdk bot commented Dec 16, 2024

@Sorna-Sarathi To use the /backport command, you need to be in the OpenJDK census and your GitHub account needs to be linked with your OpenJDK username (how to associate your GitHub account with your OpenJDK username).

@Sorna-Sarathi
Copy link
Contributor Author

/backport jdk:jdk24

@openjdk
Copy link

openjdk bot commented Dec 17, 2024

@Sorna-Sarathi the backport was successfully created on the branch backport-Sorna-Sarathi-458979d8-jdk24 in my personal fork of openjdk/jdk. To create a pull request with this backport targeting openjdk/jdk:jdk24, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 458979d8 from the openjdk/jdk repository.

The commit being backported was authored by Sorna Sarathi on 9 Dec 2024 and was reviewed by Amit Kumar and Iris Clark.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk:

$ git fetch https://github.com/openjdk-bots/jdk.git backport-Sorna-Sarathi-458979d8-jdk24:backport-Sorna-Sarathi-458979d8-jdk24
$ git checkout backport-Sorna-Sarathi-458979d8-jdk24
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk.git backport-Sorna-Sarathi-458979d8-jdk24

⚠️ @Sorna-Sarathi You are not yet a collaborator in my fork openjdk-bots/jdk. An invite will be sent out and you need to accept it before you can proceed.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
core-libs core-libs-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

6 participants