Re: RFR [15] 8241014: Miscellaneous typos in documentation comments

2020-03-13 Thread Weijun Wang



> On Mar 13, 2020, at 11:42 PM, Pavel Rappo  wrote:
> 
> Hello,
> 
> Please review the change for https://bugs.openjdk.java.net/browse/JDK-8241014:
> 
>  http://cr.openjdk.java.net/~prappo/8241014/webrev.00/
> 
> This is a documentation cleanup. There are no code changes involved,
> and the changes in documentation are mostly trivial.
> 
> The following packages are affected:
> 
>java.lang,
>java.nio.file,
>java.nio.file.attribute,
>java.security,
>java.time.chrono,
>java.time.temporal,
>java.util,
>java.util.regex,
>java.util.stream,
>javax.crypto,
>javax.security.cert,
>javax.tools
> 
> That said, there are two changes that I'd prefer to be carefully reviewed by
> the experts in the corresponding areas.
> 
> The first one is for a suspected typo in the javax.crypto.CryptoPolicyParser
> class, "AlgrithomParameterSpec". It is not unheard-of for typos to be kept and
> supported for the sake of backward compatibility. Sadly, we have a number of
> those in OpenJDK. Even though I performed reasonable checks, the proposed fix
> should better be verified by the security folk.

This is indeed a typo.

Other changes (including Ivan's) also look fine to me.

Thanks,
Max


> 
> The second one is for the doc comment for the java.util.stream.Stream.collect 
> method.
> 
> @apiNote
> The following will accumulate strings into an ArrayList:
> 
> List asList = stringStream.collect(Collectors.toList());
> 
> Given that the spec for Collectors.toList() clearly says that
> 
>...There are no guarantees on the type, mutability, serializability, or
>thread-safety of the List returned;...
> 
> I'd assume that @apiNote should be fixed as proposed.
> 
> -Pavel
> 
> P.S. Apologies for spamming multiple mailing lists. 
> 



Re: RFR[15]: 8186143: keytool -ext option doesn’t accept wildcards for DNS subject alternatives names

2020-03-13 Thread Hai-May Chao
Hi Jamil,

Thanks for your review! Reply inline.

> On Mar 13, 2020, at 12:24 PM, Jamil Nimeh  wrote:
> 
> Hello Hai-May,
> 
> The fix overall looks good.  One or two comments about the test:
> 
> 103: I think the comment might be more clear saying something like "partial 
> wildcard disallowed" since it's not the "*" in and of itself that's the 
> issue, it's that the next character following it isn't a domain separator 
> (".”).

Agree. Will update the comment.

> A similar badSanNames test case (I think) that walks a different code path 
> would be something like "a*.com".  Although the test on line 95 might walk 
> the same codepath...If so then no need to add anything else.

I’ll add “a*.com” to badSanNames test case as it will detect the error for 
‘DNSName components must consist of letters, digits, and hyphens’.
Line 95 test case will give us a different error from “a*.com”. That is, 
‘DNSName with blank components is not permitted’.
The existing badNames test case does not have “a*.com”, and I will add it too. 

Thanks,
Hai-May

> --Jamil
> 
> On 3/13/2020 9:25 AM, Hai-May Chao wrote:
>> Hi,
>> 
>> I need a code review for -
>> 
>> Bug: https://bugs.openjdk.java.net/browse/JDK-8186143 
>> 
>> Webrev: http://cr.openjdk.java.net/~weijun/8186143/webrev.00/ 
>> 
>> 
>> The keytool -ext option doesn’t accept wildcards for DNS subject 
>> alternatives names in certificates. Certificates with wildcarded domains are 
>> useful for allowing domain names under a common subdomain to share the same 
>> certificate.
>> 
>> The fix involves adding a new DNSName constructor with an additional boolean 
>> flag ‘allowWildcard’.
>> 
>> Thank you,
>> Hai-May
>> 



Re: RFR[15]: 8186143: keytool -ext option doesn’t accept wildcards for DNS subject alternatives names

2020-03-13 Thread Jamil Nimeh

Hello Hai-May,

The fix overall looks good.  One or two comments about the test:

 * 103: I think the comment might be more clear saying something like
   "partial wildcard disallowed" since it's not the "*" in and of
   itself that's the issue, it's that the next character following it
   isn't a domain separator (".").
 * A similar badSanNames test case (I think) that walks a different
   code path would be something like "a*.com".  Although the test on
   line 95 might walk the same codepath...If so then no need to add
   anything else.

--Jamil

On 3/13/2020 9:25 AM, Hai-May Chao wrote:

Hi,

I need a code review for -

Bug: https://bugs.openjdk.java.net/browse/JDK-8186143
Webrev: http://cr.openjdk.java.net/~weijun/8186143/webrev.00/

The keytool -ext option doesn’t accept wildcards for DNS subject alternatives 
names in certificates. Certificates with wildcarded domains are useful for 
allowing domain names under a common subdomain to share the same certificate.

The fix involves adding a new DNSName constructor with an additional boolean 
flag ‘allowWildcard’.

Thank you,
Hai-May



Re: RFR [15] 8241014: Miscellaneous typos in documentation comments

2020-03-13 Thread Roger Riggs

Looks fine.

On 3/13/20 11:42 AM, Pavel Rappo wrote:

Hello,

Please review the change for https://bugs.openjdk.java.net/browse/JDK-8241014:

   http://cr.openjdk.java.net/~prappo/8241014/webrev.00/

This is a documentation cleanup. There are no code changes involved,
and the changes in documentation are mostly trivial.

The following packages are affected:

 java.lang,
 java.nio.file,
 java.nio.file.attribute,
 java.security,
 java.time.chrono,
 java.time.temporal,
 java.util,
 java.util.regex,
 java.util.stream,
 javax.crypto,
 javax.security.cert,
 javax.tools

That said, there are two changes that I'd prefer to be carefully reviewed by
the experts in the corresponding areas.

The first one is for a suspected typo in the javax.crypto.CryptoPolicyParser
class, "AlgrithomParameterSpec". It is not unheard-of for typos to be kept and
supported for the sake of backward compatibility. Sadly, we have a number of
those in OpenJDK. Even though I performed reasonable checks, the proposed fix
should better be verified by the security folk.

The second one is for the doc comment for the java.util.stream.Stream.collect 
method.

  @apiNote
  The following will accumulate strings into an ArrayList:

  List asList = stringStream.collect(Collectors.toList());

Given that the spec for Collectors.toList() clearly says that

 ...There are no guarantees on the type, mutability, serializability, or
 thread-safety of the List returned;...

I'd assume that @apiNote should be fixed as proposed.

-Pavel

P.S. Apologies for spamming multiple mailing lists.





RFR[15]: 8186143: keytool -ext option doesn’t accept wildcards for DNS subject alternatives names

2020-03-13 Thread Hai-May Chao
Hi,

I need a code review for -

Bug: https://bugs.openjdk.java.net/browse/JDK-8186143
Webrev: http://cr.openjdk.java.net/~weijun/8186143/webrev.00/

The keytool -ext option doesn’t accept wildcards for DNS subject alternatives 
names in certificates. Certificates with wildcarded domains are useful for 
allowing domain names under a common subdomain to share the same certificate.

The fix involves adding a new DNSName constructor with an additional boolean 
flag ‘allowWildcard’.

Thank you,
Hai-May



Re: RFR 8240983: Incorrect copyright header in Apache Santuario files

2020-03-13 Thread Weijun Wang
noreg-doc added. I thought about noreg-cleanup, but this is much safer than a 
normal cleanup.

--Max


> On Mar 13, 2020, at 8:17 PM, Sean Mullan  wrote:
> 
> One comment actually - you need to add a noreg label to the bug.
> 
> --Sean
> 
> On 3/13/20 8:13 AM, Sean Mullan wrote:
>> Looks fine.
>> --Sean
>> On 3/13/20 5:44 AM, Weijun Wang wrote:
>>> Please review the patch below. Unlike Sun, Oracle has no "Portions" 
>>> copyright notice for Third Party source file changes, just add the standard 
>>> Oracle copyright notice if a file has been modified.
>>> 
>>> *diff --git 
>>> a/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMReference.java
>>>  
>>> b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMReference.java*
>>>  
>>> *--- 
>>> a/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMReference.java*
>>>  
>>> *+++ 
>>> b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMReference.java*
>>>  
>>> @@ -21,7 +21,7 @@
>>>* under the License.
>>>*/
>>>   /*
>>> - * Portions copyright (c) 2005, 2019, Oracle and/or its affiliates. All 
>>> rights reserved.
>>> + * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights 
>>> reserved.
>>>*/
>>>   /*
>>>* 
>>> === 
>>> *diff --git 
>>> a/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java
>>>  
>>> b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java*
>>>  
>>> *--- 
>>> a/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java*
>>>  
>>> *+++ 
>>> b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java*
>>>  
>>> @@ -21,7 +21,7 @@
>>>* under the License.
>>>*/
>>>   /*
>>> - * Portions copyright (c) 2005, 2019, Oracle and/or its affiliates. All 
>>> rights reserved.
>>> + * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights 
>>> reserved.
>>>*/
>>>   /*
>>>* 
>>> === 
>>> *diff --git 
>>> a/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMXMLSignature.java
>>>  
>>> b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMXMLSignature.java*
>>>  
>>> *--- 
>>> a/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMXMLSignature.java*
>>>  
>>> *+++ 
>>> b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMXMLSignature.java*
>>>  
>>> @@ -21,7 +21,7 @@
>>>* under the License.
>>>*/
>>>   /*
>>> - * Portions copyright (c) 2005, 2019, Oracle and/or its affiliates. All 
>>> rights reserved.
>>> + * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights 
>>> reserved.
>>>*/
>>>   /*
>>>* 
>>> === 
>>> *diff --git 
>>> a/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMXPathFilter2Transform.java
>>>  
>>> b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMXPathFilter2Transform.java*
>>>  
>>> *--- 
>>> a/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMXPathFilter2Transform.java*
>>>  
>>> *+++ 
>>> b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMXPathFilter2Transform.java*
>>>  
>>> @@ -28,7 +28,7 @@
>>>* 
>>> === 
>>>*/
>>>   /*
>>> - * Portions copyright (c) 2005, 2019, Oracle and/or its affiliates. All 
>>> rights reserved.
>>> + * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights 
>>> reserved.
>>>*/
>>>   /*
>>>* $Id: DOMXPathFilter2Transform.java 1854026 2019-02-21 09:30:01Z 
>>> coheigea $
>>> *diff --git 
>>> a/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/XMLDSigRI.java
>>>  
>>> b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/XMLDSigRI.java*
>>>  
>>> *--- 
>>> a/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/XMLDSigRI.java*
>>>  
>>> *+++ 
>>> b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/XMLDSigRI.java*
>>>  
>>> @@ -28,7 +28,7 @@
>>>* 
>>> === 
>>>*/
>>>   /*
>>> - * Portions copyright (c) 2005, 2019, Oracle and/or its affiliates. All 
>>> rights reserved.
>>> + * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights 
>>> reserved.
>>>*/
>>>   /*
>>>* $Id: XMLDSigRI.java 1833618 2018-06-15 17:36:20Z mullan $
>>> 
>>> Thanks,
>>> Max
>>> 



Re: RFR 8240983: Incorrect copyright header in Apache Santuario files

2020-03-13 Thread Sean Mullan

One comment actually - you need to add a noreg label to the bug.

--Sean

On 3/13/20 8:13 AM, Sean Mullan wrote:

Looks fine.

--Sean

On 3/13/20 5:44 AM, Weijun Wang wrote:
Please review the patch below. Unlike Sun, Oracle has no "Portions" 
copyright notice for Third Party source file changes, just add the 
standard Oracle copyright notice if a file has been modified.


*diff --git 
a/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMReference.java 
b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMReference.java* 

*--- 
a/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMReference.java* 

*+++ 
b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMReference.java* 


@@ -21,7 +21,7 @@
   * under the License.
   */
  /*
- * Portions copyright (c) 2005, 2019, Oracle and/or its affiliates. 
All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights 
reserved.

   */
  /*
   * 
=== 

*diff --git 
a/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java 
b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java* 

*--- 
a/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java* 

*+++ 
b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java* 


@@ -21,7 +21,7 @@
   * under the License.
   */
  /*
- * Portions copyright (c) 2005, 2019, Oracle and/or its affiliates. 
All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights 
reserved.

   */
  /*
   * 
=== 

*diff --git 
a/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMXMLSignature.java 
b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMXMLSignature.java* 

*--- 
a/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMXMLSignature.java* 

*+++ 
b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMXMLSignature.java* 


@@ -21,7 +21,7 @@
   * under the License.
   */
  /*
- * Portions copyright (c) 2005, 2019, Oracle and/or its affiliates. 
All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights 
reserved.

   */
  /*
   * 
=== 

*diff --git 
a/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMXPathFilter2Transform.java 
b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMXPathFilter2Transform.java* 

*--- 
a/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMXPathFilter2Transform.java* 

*+++ 
b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMXPathFilter2Transform.java* 


@@ -28,7 +28,7 @@
   * 
=== 


   */
  /*
- * Portions copyright (c) 2005, 2019, Oracle and/or its affiliates. 
All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights 
reserved.

   */
  /*
   * $Id: DOMXPathFilter2Transform.java 1854026 2019-02-21 09:30:01Z 
coheigea $
*diff --git 
a/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/XMLDSigRI.java 
b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/XMLDSigRI.java* 

*--- 
a/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/XMLDSigRI.java* 

*+++ 
b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/XMLDSigRI.java* 


@@ -28,7 +28,7 @@
   * 
=== 


   */
  /*
- * Portions copyright (c) 2005, 2019, Oracle and/or its affiliates. 
All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights 
reserved.

   */
  /*
   * $Id: XMLDSigRI.java 1833618 2018-06-15 17:36:20Z mullan $

Thanks,
Max



Re: RFR 8240983: Incorrect copyright header in Apache Santuario files

2020-03-13 Thread Sean Mullan

Looks fine.

--Sean

On 3/13/20 5:44 AM, Weijun Wang wrote:
Please review the patch below. Unlike Sun, Oracle has no "Portions" 
copyright notice for Third Party source file changes, just add the 
standard Oracle copyright notice if a file has been modified.


*diff --git 
a/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMReference.java 
b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMReference.java*
*--- 
a/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMReference.java*
*+++ 
b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMReference.java*

@@ -21,7 +21,7 @@
   * under the License.
   */
  /*
- * Portions copyright (c) 2005, 2019, Oracle and/or its affiliates. All 
rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights 
reserved.

   */
  /*
   * 
===
*diff --git 
a/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java 
b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java*
*--- 
a/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java*
*+++ 
b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java*

@@ -21,7 +21,7 @@
   * under the License.
   */
  /*
- * Portions copyright (c) 2005, 2019, Oracle and/or its affiliates. All 
rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights 
reserved.

   */
  /*
   * 
===
*diff --git 
a/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMXMLSignature.java 
b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMXMLSignature.java*
*--- 
a/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMXMLSignature.java*
*+++ 
b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMXMLSignature.java*

@@ -21,7 +21,7 @@
   * under the License.
   */
  /*
- * Portions copyright (c) 2005, 2019, Oracle and/or its affiliates. All 
rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights 
reserved.

   */
  /*
   * 
===
*diff --git 
a/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMXPathFilter2Transform.java 
b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMXPathFilter2Transform.java*
*--- 
a/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMXPathFilter2Transform.java*
*+++ 
b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMXPathFilter2Transform.java*

@@ -28,7 +28,7 @@
   * 
===

   */
  /*
- * Portions copyright (c) 2005, 2019, Oracle and/or its affiliates. All 
rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights 
reserved.

   */
  /*
   * $Id: DOMXPathFilter2Transform.java 1854026 2019-02-21 09:30:01Z 
coheigea $
*diff --git 
a/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/XMLDSigRI.java 
b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/XMLDSigRI.java*
*--- 
a/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/XMLDSigRI.java*
*+++ 
b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/XMLDSigRI.java*

@@ -28,7 +28,7 @@
   * 
===

   */
  /*
- * Portions copyright (c) 2005, 2019, Oracle and/or its affiliates. All 
rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights 
reserved.

   */
  /*
   * $Id: XMLDSigRI.java 1833618 2018-06-15 17:36:20Z mullan $

Thanks,
Max



RFR 8240983: Incorrect copyright header in Apache Santuario files

2020-03-13 Thread Weijun Wang
Please review the patch below. Unlike Sun, Oracle has no "Portions" copyright 
notice for Third Party source file changes, just add the standard Oracle 
copyright notice if a file has been modified.

diff --git 
a/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMReference.java
 
b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMReference.java
--- 
a/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMReference.java
+++ 
b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMReference.java
@@ -21,7 +21,7 @@
  * under the License.
  */
 /*
- * Portions copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights 
reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
  */
 /*
  * ===
diff --git 
a/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java
 
b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java
--- 
a/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java
+++ 
b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java
@@ -21,7 +21,7 @@
  * under the License.
  */
 /*
- * Portions copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights 
reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
  */
 /*
  * ===
diff --git 
a/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMXMLSignature.java
 
b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMXMLSignature.java
--- 
a/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMXMLSignature.java
+++ 
b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMXMLSignature.java
@@ -21,7 +21,7 @@
  * under the License.
  */
 /*
- * Portions copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights 
reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
  */
 /*
  * ===
diff --git 
a/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMXPathFilter2Transform.java
 
b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMXPathFilter2Transform.java
--- 
a/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMXPathFilter2Transform.java
+++ 
b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMXPathFilter2Transform.java
@@ -28,7 +28,7 @@
  * ===
  */
 /*
- * Portions copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights 
reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
  */
 /*
  * $Id: DOMXPathFilter2Transform.java 1854026 2019-02-21 09:30:01Z coheigea $
diff --git 
a/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/XMLDSigRI.java
 
b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/XMLDSigRI.java
--- 
a/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/XMLDSigRI.java
+++ 
b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/XMLDSigRI.java
@@ -28,7 +28,7 @@
  * ===
  */
 /*
- * Portions copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights 
reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
  */
 /*
  * $Id: XMLDSigRI.java 1833618 2018-06-15 17:36:20Z mullan $

Thanks,
Max