[jdk8u-dev] RFR: 8087283: Add support for the XML Signature here() function to the JDK XPath implementation [v2]

[Andrew John Hughes]

On Wed, 1 Jun 2022 02:25:45 GMT, Andrew John Hughes <andrew at openjdk.org> wrote:

>> Yuri Nesterenko has updated the pull request incrementally with one additional commit since the last revision:
>> 
>>   Added XalanXPathAPI checking part of 8087283
>
> 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](https://github.com/openjdk/jdk11u/commit/b05b9cbefad137c5e2802942de6e77d3994f4315)

> 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.

-------------

PR: https://git.openjdk.java.net/jdk8u-dev/pull/67