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

8274346: Support for additional content in an app-image. #5780

Closed
wants to merge 4 commits into from

Conversation

@andyherrick
Copy link

@andyherrick andyherrick commented Sep 30, 2021


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8274346: Support for additional content in an app-image.

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/5780/head:pull/5780
$ git checkout pull/5780

Update a local copy of the PR:
$ git checkout pull/5780
$ git pull https://git.openjdk.java.net/jdk pull/5780/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 5780

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/5780.diff

@andyherrick
Copy link
Author

@andyherrick andyherrick commented Sep 30, 2021

/csr

Loading

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Sep 30, 2021

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

Loading

@openjdk openjdk bot changed the title JDK-8274346: Support for additional content in an app-image. 8274346: Support for additional content in an app-image. Sep 30, 2021
@openjdk openjdk bot added the csr label Sep 30, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Sep 30, 2021

@andyherrick has indicated that a compatibility and specification (CSR) request is needed for this pull request.
@andyherrick please create a CSR request for issue JDK-8274346. This pull request cannot be integrated until the CSR request is approved.

Loading

@openjdk
Copy link

@openjdk openjdk bot commented Sep 30, 2021

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

Loading

@openjdk openjdk bot added the core-libs label Sep 30, 2021
@andyherrick
Copy link
Author

@andyherrick andyherrick commented Oct 4, 2021

Loading

@andyherrick andyherrick marked this pull request as ready for review Oct 4, 2021
@openjdk openjdk bot added the rfr label Oct 4, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Oct 4, 2021

Webrevs

Loading

List<String> paths = Arrays.asList(arg.split(","));
for (String p : paths) {
Path name = Path.of(p).getFileName();
TKit.assertTrue(Files.exists(contentDir.resolve(name)),

Choose a reason for hiding this comment

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

I'd suggest to use TKit.assertPathExists() instead of TKit.assertTrue(Files.exists(...))

Loading

@openjdk openjdk bot removed the csr label Oct 15, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Oct 15, 2021

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

8274346: Support for additional content in an app-image.

Reviewed-by: asemenyuk, 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 231 new commits pushed to the master branch:

  • 831802d: 8275163: Deflater::deflate methods omit javadoc for ReadOnlyBufferException
  • ad9e234: 8275145: file.encoding system property has an incorrect value on Windows
  • f178185: 8275249: Suppress warnings on non-serializable array component types in jdk.jlink
  • ee64ce9: 8274937: Revert the timeout setting for DynamicLoaderConstraintsTest
  • 8c4da9c: 8275013: Improve discussion of serialization method declarations in java.io.Object{Input, Output}Stream
  • da8da3a: 8269698: Specification for methods of java.awt.im.InputContext should mention that they do nothing
  • 8e02064: 8049520: FileCredentialsCache loads cache once and is never refreshed
  • 172aed1: 8274338: com/sun/jdi/RedefineCrossEvent.java failed "assert(m != __null) failed: NULL mirror"
  • ced7909: 8275286: Check current thread when calling JRT methods that expect it
  • c0f3e1d: 8271071: accessibility of a table on macOS lacks cell navigation
  • ... and 221 more: https://git.openjdk.java.net/jdk/compare/7436a77e3d1232303264081cefb7166456601cac...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.

Loading

@openjdk openjdk bot added the ready label Oct 15, 2021
@andyherrick
Copy link
Author

@andyherrick andyherrick commented Oct 18, 2021

/integrate

Loading

@openjdk
Copy link

@openjdk openjdk bot commented Oct 18, 2021

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

  • a619f89: 8274721: UnixSystem fails to provide uid, gid or groups if no username is available
  • 1afddb2: 8275322: Change nested classes in java.management to static nested classes
  • 45ebf85: 8275333: Print count in "Too many recored phases?" assert
  • ebb1363: 8251513: Code around Parse::do_lookupswitch/do_tableswitch should be cleaned up
  • bb7dacd: 8275334: Move class loading Events to a separate section in hs_err files
  • 3150069: 8271949: dumppath in -XX:FlightRecorderOptions does not affect
  • bfcf6a2: 8275277: assert(dest_attr.is_in_cset() == (obj->forwardee() == obj)) failed: Only evac-failed objects must be in the collection set here but is not
  • 96fef40: 8189591: No way to locally suppress doclint warnings
  • 7fc3a8d: 8275149: (ch) ReadableByteChannel returned by Channels.newChannel(InputStream) throws ReadOnlyBufferException
  • 831802d: 8275163: Deflater::deflate methods omit javadoc for ReadOnlyBufferException
  • ... and 230 more: https://git.openjdk.java.net/jdk/compare/7436a77e3d1232303264081cefb7166456601cac...master

Your commit was automatically rebased without conflicts.

Loading

@openjdk openjdk bot closed this Oct 18, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Oct 18, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Oct 18, 2021

@andyherrick Pushed as commit d548f2f.

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

Loading

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