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

[24.0] Backport: Better handling of MANIFEST.MF attributes #438

Merged
merged 1 commit into from
Jul 17, 2024

Conversation

zakkak
Copy link
Collaborator

@zakkak zakkak commented Jul 17, 2024

Backport of #435

Previously, the build script would add these two attributes irrespective
whether or not they'd exist in the Graal artefacts:

Specification-Version
Implementation-Version

With this patch, only updates to the Implementation-Version attribute
are done based on the maven version in use. Specification-Version is
only added if it's not yet there in a jar or source jar file.

(cherry picked from commit 48c154e)

Previously, the build script would add these two attributes irrespective
whether or not they'd exist in the Graal artefacts:

  Specification-Version
  Implementation-Version

With this patch, only updates to the Implementation-Version attribute
are done based on the maven version in use. Specification-Version is
only added if it's not yet there in a jar or source jar file.

Closes: Karm/mandrel-integration-tests#270
(cherry picked from commit 48c154e)
@zakkak zakkak requested a review from jerboaa July 17, 2024 14:07
@oracle-contributor-agreement oracle-contributor-agreement bot added the OCA Verified All contributors have signed the Oracle Contributor Agreement. label Jul 17, 2024
Copy link
Collaborator

@jerboaa jerboaa left a comment

Choose a reason for hiding this comment

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

OK.

@jerboaa
Copy link
Collaborator

jerboaa commented Jul 17, 2024

@zakkak Since we need it in 24.0, we probably also need it in 24.1. Otherwise, we'd have 24.0 and 24.2 fixed and 24.1 not.

@zakkak
Copy link
Collaborator Author

zakkak commented Jul 17, 2024

@jerboaa In 24.0 we need it due to oracle/graal@d2bba8f and graalvm/mx@5eb6d6f

24.1 is still using mx 7.25.5 which doesn't include graalvm/mx@bafad62 so for the time being we don't need the backport (except for consistency).

@zakkak zakkak merged commit 2a5d027 into graalvm:24.0 Jul 17, 2024
5 checks passed
@zakkak zakkak deleted the 2024-07-17-backport-435 branch July 17, 2024 22:07
@jerboaa
Copy link
Collaborator

jerboaa commented Jul 18, 2024

24.1 is still using mx 7.25.5 which doesn't include graalvm/mx@bafad62 so for the time being we don't need the backport (except for consistency).

@zakkak We should also provide the backport in 24.1. There is a good chance the same will happen there. Lets fix it before it's an issue. The backport is low-risk enough.

@zakkak
Copy link
Collaborator Author

zakkak commented Jul 18, 2024

Done in #439

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
OCA Verified All contributors have signed the Oracle Contributor Agreement.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants