Skip to content

8294806: jpackaged-app ignores splash screen from jar file #13413

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.

Sign up for GitHub

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

Jump to bottom
Closed
wants to merge 1 commit into from
Closed

8294806: jpackaged-app ignores splash screen from jar file #13413

wants to merge 1 commit into from

Conversation

alexeysemenyukoracle
Copy link
Member

@alexeysemenyukoracle alexeysemenyukoracle commented Apr 10, 2023 •
edited by openjdk bot
Loading

When --main-jar is specified and the name of the main class is picked from the jar's manifest, set app.jarfile property in launcher cfg file instead of app.mainclass and app.classpath properties to make app launcher run the app from the jar and not as a class from the classpath.

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-8294806: jpackaged-app ignores splash screen from jar file

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 13413

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 10, 2023

👋 Welcome back asemenyuk! 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.

alexeysemenyukoracle
alexeysemenyukoracle commented Apr 10, 2023
View reviewed changes
src/jdk.jpackage/share/classes/jdk/jpackage/internal/Arguments.java
Comment on lines -510 to -518
if (hasMainJar && !hasMainClass) {
// try to get main-class from manifest
String mainClass = getMainClassFromManifest();
if (mainClass != null) {
CLIOptions.setOptionValue(
CLIOptions.APPCLASS.getId(), mainClass);
}
}

Copy link
Member Author

@alexeysemenyukoracle alexeysemenyukoracle Apr 10, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

This duplicates functionality from https://github.com/openjdk/jdk/pull/13413/files#diff-50e3f4f576df4f85d94258043607539f7ec5d55705e7092c00f47432309747a6R210-R218 and hence was deleted

@openjdk openjdk bot added the rfr Pull request is ready for review label Apr 10, 2023
@openjdk
Copy link

openjdk bot commented Apr 10, 2023

@alexeysemenyukoracle The following label will be automatically applied to this pull request:

  • core-libs

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

@openjdk openjdk bot added the core-libs core-libs-dev@openjdk.org label Apr 10, 2023
@mlbridge
Copy link

mlbridge bot commented Apr 10, 2023

Webrevs

sashamatveev
sashamatveev approved these changes Apr 10, 2023
View reviewed changes
Copy link
Member

@sashamatveev sashamatveev 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.

@openjdk
Copy link

openjdk bot commented Apr 10, 2023

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

8294806: jpackaged-app ignores splash screen from jar file

Reviewed-by: almatvee

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

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 ready Pull request is ready to be integrated label Apr 10, 2023
@alexeysemenyukoracle
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Apr 11, 2023

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

  • d9db906: 8305368: G1 remset chunk claiming may use relaxed memory ordering
  • c789d24: 8305370: Inconsistent use of for_young_only_phase parameter in G1 predictions
  • c6d7cf6: 8305663: Wrong iteration order of pause array in g1MMUTracker
  • ce4b995: 8305761: Resolve multiple definition of 'jvm' when statically linking with JDK native libraries
  • 12946f5: 8305419: JDK-8301995 broke building libgraal
  • 9486969: 8302696: Revert API signature changes made in JDK-8285504 and JDK-8285263
  • 628a3f1: 8304738: UnregisteredClassesTable_lock never created
  • 7a5597c: 8277573: VmObjectAlloc is not generated by intrinsics methods which allocate objects
  • e5ce7d9: 8284871: Use covariant overrides for the resolveConstantDesc(Lookup) method in sub‑interfaces of java.lang.constant.ConstantDesc
  • cd7d53c: 8304717: Declaration aliasing between boolean and jboolean is wrong
  • ... and 20 more: https://git.openjdk.org/jdk/compare/a8871f5d26e5cb42c031c7b736ec30b1b147a2bc...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Apr 11, 2023

@alexeysemenyukoracle Pushed as commit 1de772c.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sashamatveev sashamatveev sashamatveev approved these changes

Assignees
No one assigned
Labels
core-libs core-libs-dev@openjdk.org integrated Pull request has been integrated
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@alexeysemenyukoracle @sashamatveev