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

8087283: Add support for the XML Signature here() function to the JDK XPath implementation #67

Closed
wants to merge 3 commits into from

Conversation

yan-too
Copy link
Contributor

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

I'd like to backport this jdk9 change to jdk8 because it would make backporting future important fixes and related tests easier. It is marked as Enhancement, however with time the absence of it would become nuisance.
I've tested it so far with various XML-related tests. Tier tests are running.


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-8087283: Add support for the XML Signature here() function to the JDK XPath implementation

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk8u-dev pull/67/head:pull/67
$ git checkout pull/67

Update a local copy of the PR:
$ git checkout pull/67
$ git pull https://git.openjdk.java.net/jdk8u-dev pull/67/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 67

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk8u-dev/pull/67.diff

@bridgekeeper
Copy link

bridgekeeper bot commented May 30, 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 22fad64529a890dd3ae8b07c7981d9a720cf8e96 8087283: Add support for the XML Signature here() function to the JDK XPath implementation May 30, 2022
@openjdk
Copy link

openjdk bot commented May 30, 2022

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

@openjdk openjdk bot added backport rfr Pull request is ready for review labels May 30, 2022
@mlbridge
Copy link

mlbridge bot commented May 30, 2022

Webrevs

Copy link
Member

@gnu-andrew gnu-andrew left a comment

Choose a reason for hiding this comment

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

What is present in this backport looks ok. However, there are a couple of omissions from the version in 11u:

  • The copyright changes to jaxp/src/com/sun/org/apache/xpath/internal/compiler/Keywords.java are missing. Comparing the current 8u & 11u versions show the change is needed.
  • This fix actually spans two commits, because it was done under the old split repository / forest setup. The other commit is b05b9cb

@yan-too
Copy link
Contributor Author

yan-too commented Jun 1, 2022

Thank you @gnu-andrew ! As to the copyright, in the current (before the fix) version of jdk8u it is virtually the same as in 22fad6452 new part of the 1st Keywords.java hunk (and in 11u) barring some formatting difference (lines are shorter in 11u). I've used 22fad6452 so decided to skip the hunk altogether (the old part of the hunk differs significantly).

The fixupFunctionTable() part, yes, I've missed it, thank you, retesting locally first...

@gnu-andrew
Copy link
Member

Thank you @gnu-andrew ! As to the copyright, in the current (before the fix) version of jdk8u it is virtually the same as in 22fad6452 new part of the 1st Keywords.java hunk (and in 11u) barring some formatting difference (lines are shorter in 11u). I've used 22fad6452 so decided to skip the hunk altogether (the old part of the hunk differs significantly).

Right, what I'd suggest is just copying over Keywords.java from 11u. After this patch, they are the same bar minor formatting differences which came after this patch, which means FUNC_HERE_STRING is formatted differently to all the other constant declarations in the file (thank JDK-8068842 for this) I don't see any reason to keep these differences and they will only make any future patches which touch the file more difficult to apply.

The fixupFunctionTable() part, yes, I've missed it, thank you, retesting locally first...

Easy to miss as it was in a different commit. Version here looks fine with the logging changes.

@yan-too
Copy link
Contributor Author

yan-too commented Jun 2, 2022

You are right: this current state of copyright preamble etc. is a result of some reformatting in before-10 jdk, and nobody will backport that cleanup -- perhaps several of them -- as such. Updated.
macOS pre-submit failure is clearly infra issue.

Copy link
Member

@gnu-andrew gnu-andrew left a comment

Choose a reason for hiding this comment

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

Thanks for persisting with these changes. The new version looks fine to me (and I agree the Mac failure is a very odd infra issue!)

Please flag the bug with jdk8u-fix-request and I'll approve.

@openjdk
Copy link

openjdk bot commented Jun 3, 2022

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

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

8087283: Add support for the XML Signature here() function to the JDK XPath implementation

Reviewed-by: andrew

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

  • 820ab13: 8235385: Crash on aarch64 JDK due to long offset
  • f3c87ce: 8287521: Bump update version of OpenJDK: 8u352

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 Jun 3, 2022
@gnu-andrew
Copy link
Member

Approved.

@yan-too
Copy link
Contributor Author

yan-too commented Jun 30, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Jun 30, 2022

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

  • 1b4f32d: 8173361: various crashes in JvmtiExport::post_compiled_method_load
  • cf6b628: 8260589: Crash in JfrTraceIdLoadBarrier::load(_jclass*)
  • 83e9095: 8280963: Incorrect PrintFlags formatting on Windows
  • 820ab13: 8235385: Crash on aarch64 JDK due to long offset
  • f3c87ce: 8287521: Bump update version of OpenJDK: 8u352

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jun 30, 2022

@yan-too Pushed as commit a3c0ed2.

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