8296329: jar validator doesn't account for minor class file version #11153

blindpirate · 2022-11-15T01:52:14Z

As described in JDK-8296329, previously, the jar validator compare the "version" to validate a multi-release jar. The "version" is a mix of the major and minor version fused into a single int, which might be a negative number with --enable-preview - this result in wrong comparison.

This PR fixes it by only comparing major versions.

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-8296329: jar validator doesn't account for minor class file version

Reviewers

Jorn Vernee (@JornVernee - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 11153

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

Using diff file

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

bridgekeeper · 2022-11-15T01:54:33Z

👋 Welcome back blindpirate! 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 · 2022-11-15T01:58:10Z

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

compiler
core-libs

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.

mlbridge · 2022-11-15T02:01:13Z

Webrevs

01: Full - Incremental (b293cbfe)
00: Full (93ec7fb8)

AlanBateman · 2022-11-15T12:03:22Z

See also JDK-8296119. I don't know how common it will be for someone to publish a MR JAR containing classes compiled to use preview features. It would be a bit inconvenient for users as they would need to know to run with --enable-preview on some releases. This shouldn't impact the API compatibility checking that the jar tool does so dropping the minor version and just checking the major version might be okay.

JornVernee

Please assign the JBS ticket to yourself as well.

JornVernee · 2022-11-15T02:14:46Z

test/jdk/tools/jar/multiRelease/VersionValidatorTest.java

My concern with this is that this will need to be updated after each release. Looks like there are also ways to directly alter the minor version of a class file, and I recommend doing that instead. See: https://github.com/openjdk/jdk/blob/master/test/hotspot/jtreg/runtime/ClassFile/PreviewVersion.java#L51

Also, there's one more negative case missing where the base version uses 20 + preview features, and the other version is 19.

Thanks @JornVernee . I have updated the test, PTAL!

Please assign the JBS ticket to yourself as well.

Sorry, I don't have permission to update JBS ticket.

openjdk-notifier · 2022-11-16T00:42:19Z

@blindpirate Please do not rebase or force-push to an active PR as it invalidates existing review comments. All changes will be squashed into a single commit automatically when integrating. See OpenJDK Developers’ Guide for more information.

JornVernee

This looks good to me. Thanks for fixing.

I'm running a test job for tier 1-4 as well

openjdk · 2022-11-16T13:24:38Z

@blindpirate 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:

8296329: jar validator doesn't account for minor class file version

Reviewed-by: jvernee

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

09f70da: 8296265: Use modern HTML in the JVMTI spec
e661c5a: 8296323: JVMTI can_support_virtual_threads not available for agents loaded into running VM
974cb83: 8297310: Remove unimplemented HeapInspection::iterate_over_heap
e174558: 8296742: Illegal X509 Extension should not be created
a6c418e: 8297168: Provide a bulk OopHandle release mechanism with the ServiceThread
4a544bb: 8297091: New langtools test jdk/javadoc/doclet/testValueTag/TestValueFormats.java fails on machines with unexpected number format
b6dddf4: 8239801: [macos] java/awt/Focus/UnaccessibleChoice/AccessibleChoiceTest.java fails
260e4dc: 8295011: EC point multiplication improvement for secp256r1
fb6c992: 8296957: One more cast in SAFE_SIZE_NEW_ARRAY2
ccc6e16: 8291067: macOS should use O_CLOEXEC instead of FD_CLOEXEC
... and 163 more: https://git.openjdk.org/jdk/compare/8eb90e2d9c4ab5975f4301dbfdb0a6d9fa036af3...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 (@JornVernee) 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).

blindpirate · 2022-11-23T02:50:26Z

@JornVernee can you please sponsor this PR?

JornVernee · 2022-11-23T03:01:51Z

@blindpirate Yes. If you /integrate it, I can then /sponsor.

blindpirate · 2022-11-23T03:05:06Z

/integrate

openjdk · 2022-11-23T03:06:39Z

@blindpirate
Your change (at version b293cbf) is now ready to be sponsored by a Committer.

JornVernee · 2022-11-23T03:06:47Z

/sponsor

blindpirate · 2022-11-23T03:08:12Z

Thanks @JornVernee !

openjdk · 2022-11-23T03:09:25Z

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

09f70da: 8296265: Use modern HTML in the JVMTI spec
e661c5a: 8296323: JVMTI can_support_virtual_threads not available for agents loaded into running VM
974cb83: 8297310: Remove unimplemented HeapInspection::iterate_over_heap
e174558: 8296742: Illegal X509 Extension should not be created
a6c418e: 8297168: Provide a bulk OopHandle release mechanism with the ServiceThread
4a544bb: 8297091: New langtools test jdk/javadoc/doclet/testValueTag/TestValueFormats.java fails on machines with unexpected number format
b6dddf4: 8239801: [macos] java/awt/Focus/UnaccessibleChoice/AccessibleChoiceTest.java fails
260e4dc: 8295011: EC point multiplication improvement for secp256r1
fb6c992: 8296957: One more cast in SAFE_SIZE_NEW_ARRAY2
ccc6e16: 8291067: macOS should use O_CLOEXEC instead of FD_CLOEXEC
... and 163 more: https://git.openjdk.org/jdk/compare/8eb90e2d9c4ab5975f4301dbfdb0a6d9fa036af3...master

Your commit was automatically rebased without conflicts.

openjdk · 2022-11-23T03:09:45Z

@JornVernee @blindpirate Pushed as commit faf48e6.

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

openjdk bot added the rfr Pull request is ready for review label Nov 15, 2022

openjdk bot added core-libs core-libs-dev@openjdk.org compiler compiler-dev@openjdk.org labels Nov 15, 2022

blindpirate changed the title ~~8296329: Only compare major versions in jar validator~~ 8296329: jar validator doesn't account for minor class file version Nov 15, 2022

JornVernee reviewed Nov 15, 2022

View reviewed changes

8296329: Only compare major versions in jar validator

b293cbf

blindpirate force-pushed the jdk-8296329 branch from 93ec7fb to b293cbf Compare November 16, 2022 00:38

JornVernee reviewed Nov 16, 2022

View reviewed changes

JornVernee approved these changes Nov 16, 2022

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Nov 16, 2022

openjdk bot added the sponsor Pull request is ready to be sponsored label Nov 23, 2022

openjdk bot added the integrated Pull request has been integrated label Nov 23, 2022

openjdk bot closed this Nov 23, 2022

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review sponsor Pull request is ready to be sponsored labels Nov 23, 2022

blindpirate deleted the jdk-8296329 branch November 23, 2022 03:15

8296329: jar validator doesn't account for minor class file version #11153

8296329: jar validator doesn't account for minor class file version #11153

Uh oh!

Conversation

blindpirate commented Nov 15, 2022 • edited by openjdk bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Progress

Issue

Reviewers

Reviewing

Uh oh!

bridgekeeper bot commented Nov 15, 2022

Uh oh!

openjdk bot commented Nov 15, 2022

Uh oh!

mlbridge bot commented Nov 15, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Webrevs

Uh oh!

AlanBateman commented Nov 15, 2022

Uh oh!

JornVernee left a comment

Choose a reason for hiding this comment

Uh oh!

JornVernee Nov 15, 2022

Choose a reason for hiding this comment

Uh oh!

blindpirate Nov 16, 2022

Choose a reason for hiding this comment

Uh oh!

openjdk-notifier bot commented Nov 16, 2022

Uh oh!

JornVernee left a comment

Choose a reason for hiding this comment

Uh oh!

openjdk bot commented Nov 16, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

blindpirate commented Nov 23, 2022

Uh oh!

JornVernee commented Nov 23, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

blindpirate commented Nov 23, 2022

Uh oh!

openjdk bot commented Nov 23, 2022

Uh oh!

JornVernee commented Nov 23, 2022

Uh oh!

blindpirate commented Nov 23, 2022

Uh oh!

openjdk bot commented Nov 23, 2022

Uh oh!

openjdk bot commented Nov 23, 2022

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

3 participants

blindpirate commented Nov 15, 2022 •

edited by openjdk bot

Loading

mlbridge bot commented Nov 15, 2022 •

edited

Loading

openjdk bot commented Nov 16, 2022 •

edited

Loading

JornVernee commented Nov 23, 2022 •

edited

Loading