-
Notifications
You must be signed in to change notification settings - Fork 172
8087283: Add support for the XML Signature here() function to the JDK XPath implementation #67
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
Conversation
|
👋 Welcome back yan! A progress list of the required criteria for merging this PR into |
|
This backport pull request has now been updated with issue from the original commit. |
Webrevs
|
gnu-andrew
left a comment
There was a problem hiding this 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.javaare 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
|
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... |
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
Easy to miss as it was in a different commit. Version here looks fine with the logging changes. |
|
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. |
gnu-andrew
left a comment
There was a problem hiding this 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.
|
@yan-too This change now passes all automated pre-integration checks. After integration, the commit message for the final commit will be: 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
Please see this link for an up-to-date comparison between the source branch of this pull request and the ➡️ To integrate this PR with the above commit message to the |
|
Approved. |
|
/integrate |
|
Going to push as commit a3c0ed2.
Your commit was automatically rebased without conflicts. |
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
Issue
Reviewers
Reviewing
Using
gitCheckout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk8u-dev pull/67/head:pull/67$ git checkout pull/67Update a local copy of the PR:
$ git checkout pull/67$ git pull https://git.openjdk.java.net/jdk8u-dev pull/67/headUsing Skara CLI tools
Checkout this PR locally:
$ git pr checkout 67View PR using the GUI difftool:
$ git pr show -t 67Using diff file
Download this PR as a diff file:
https://git.openjdk.java.net/jdk8u-dev/pull/67.diff