Skip to content
This repository has been archived by the owner on Apr 21, 2023. It is now read-only.

8289907: Add missed jdk/src/share part of 8087283 #7

Closed
wants to merge 2 commits into from

Conversation

yan-too
Copy link

@yan-too yan-too commented Jun 2, 2022

It is a missed part of 8087283 cleanup fix. It has in head the same bug id and synopsis: I hope Skara jcheck would process it.
... UPDATE: bugid changed to a new 8289907 to keep it more conventional


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-8289907: Add missed jdk/src/share part of 8087283

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 7

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk7u/pull/7.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 2, 2022

👋 Welcome back yan! 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 b05b9cbefad137c5e2802942de6e77d3994f4315 8087283: Add support for the XML Signature here() function to the JDK XPath implementation Jun 2, 2022
@openjdk
Copy link

openjdk bot commented Jun 2, 2022

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

@openjdk openjdk bot added the backport label Jun 2, 2022
@openjdk openjdk bot added the rfr Pull request is ready for review label Jun 2, 2022
@mlbridge
Copy link

mlbridge bot commented Jun 2, 2022

Webrevs

@erikj79
Copy link
Member

erikj79 commented Jun 2, 2022

In general, OpenJDK projects require a new bug for this kind of thing, but the jdk7u project is of course free to define their own rules. I believe Skara will just add another commit message to the same bug if you choose to go through with this.

@yan-too
Copy link
Author

yan-too commented Jun 2, 2022

Two bugs with the same bugid but different content and hashes are apparently a result of the forest consolidation: 8087283 has changed two different parts of the forest. I should perhaps combine both fixes in the previous commit but missed that one at the moment. I hope this crude approach would work.

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 30, 2022

@yan-too This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

@yan-too
Copy link
Author

yan-too commented Jul 4, 2022

Hope to see it integrated for October release.

@yan-too yan-too changed the title 8087283: Add support for the XML Signature here() function to the JDK XPath implementation 8289907: Add missed jdk/src/share part of 8087283 Jul 7, 2022
@openjdk
Copy link

openjdk bot commented Jul 7, 2022

@yan-too This change now passes all automated pre-integration checks.

After integration, the commit message for the final commit will be:

8289907: Add missed jdk/src/share part of 8087283

Reviewed-by: bae

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

  • c05358d: 8285523: Improve test java/io/FileOutputStream/OpenNUL.java
  • cb07ad2: 8285445: cannot open file "NUL:"
  • acb737f: 8285591: [11] add signum checks in DSA.java engineVerify

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 the ready Pull request is ready to be integrated label Jul 7, 2022
@yan-too
Copy link
Author

yan-too commented Jul 7, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Jul 7, 2022

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

  • c05358d: 8285523: Improve test java/io/FileOutputStream/OpenNUL.java
  • cb07ad2: 8285445: cannot open file "NUL:"
  • acb737f: 8285591: [11] add signum checks in DSA.java engineVerify

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jul 7, 2022

@yan-too Pushed as commit 2af5704.

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

@yan-too yan-too deleted the second8087283 branch July 7, 2022 09:57
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport integrated Pull request has been integrated
3 participants