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

8285726: [11u, 17u] Unify fix for JDK-8284548 with version from head #3

Closed
wants to merge 1 commit into from

Conversation

yan-too
Copy link

@yan-too yan-too commented May 16, 2022

This fix is different from versions 8+: first, in Lexer.java there's no LastModified and a usual copyright, so it is dropped from the change. Second, a new XPathExceptionTest is hard to compile in 7: to run with jdk7 we'd need an older than usual version of testng which, in turn, doesn't work with asserts like that in the test, there are lambdas, and XPathExpression has no used or similar method. Instead of of backporting the test, I'm doing a simple change in existing one.

Thus, test-only update change. Test pass.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed (1 review required, with at least 1 reviewer)

Issue

  • JDK-8285726: [11u, 17u] Unify fix for JDK-8284548 with version from head ⚠️ Issue is not open.

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 3

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented May 16, 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 added the rfr label May 16, 2022
@mlbridge
Copy link

mlbridge bot commented May 16, 2022

Webrevs

bae
bae approved these changes May 16, 2022
@openjdk
Copy link

openjdk bot commented May 16, 2022

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

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

8285726: [11u, 17u] Unify fix for JDK-8284548 with version from head

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

  • ec0598f: 8285579: Bump update version of OpenJDK: 7u351

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 label May 16, 2022
@yan-too
Copy link
Author

yan-too commented May 16, 2022

/integrate

@openjdk
Copy link

openjdk bot commented May 16, 2022

Going to push as commit c83eb83.
Since your change was applied there has been 1 commit pushed to the master branch:

  • ec0598f: 8285579: Bump update version of OpenJDK: 7u351

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated label May 16, 2022
@openjdk openjdk bot closed this May 16, 2022
@openjdk openjdk bot removed ready rfr labels May 16, 2022
@openjdk
Copy link

openjdk bot commented May 16, 2022

@yan-too Pushed as commit c83eb83.

💡 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 xml8285726 branch May 16, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
integrated
2 participants