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

8277429: Conflicting jpackage static library name #560

Closed
wants to merge 1 commit into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Jul 18, 2022

I backport this for parity with 17.0.5-oracle.


Progress

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

Issue

  • JDK-8277429: Conflicting jpackage static library name

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk17u-dev pull/560/head:pull/560
$ git checkout pull/560

Update a local copy of the PR:
$ git checkout pull/560
$ git pull https://git.openjdk.org/jdk17u-dev pull/560/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 560

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk17u-dev/pull/560.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Jul 18, 2022

👋 Welcome back goetz! 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 openjdk bot changed the title Backport e3911a8532e9b93ba5e65c613bd79864485db5ce 8277429: Conflicting jpackage static library name Jul 18, 2022
@openjdk
Copy link

openjdk bot commented Jul 18, 2022

This backport pull request has now been updated with issue from the original commit.

@openjdk
Copy link

openjdk bot commented Jul 18, 2022

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

8277429: Conflicting jpackage static library name

Reviewed-by: asemenyuk

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 1 new commit pushed to the master branch:

  • bebb612: 8288499: Restore cancel-in-progress in GHA

Please see this link for an up-to-date comparison between the source branch of this pull request and 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 ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jul 18, 2022
@mlbridge
Copy link

mlbridge bot commented Jul 18, 2022

Webrevs

@GoeLin
Copy link
Member Author

GoeLin commented Jul 19, 2022

Pre-submit test: xml_schema/msData/datatypes/Facets/Schemas/jaxp/ known to be shaky, unrelated.

@GoeLin
Copy link
Member Author

GoeLin commented Jul 19, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Jul 19, 2022

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

  • 9120f28: 8274856: Failing jpackage tests with fastdebug/release build
  • 4f79e18: 8285097: Duplicate XML keys in XPATHErrorResources.java and XSLTErrorResources.java
  • bebb612: 8288499: Restore cancel-in-progress in GHA

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jul 19, 2022

@GoeLin Pushed as commit aafb815.

💡 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
Labels
backport clean integrated Pull request has been integrated
2 participants