[jdk11u-dev] Integrated: 8255255: Update Apache Santuario (XML Signature) to version 2.2.1

[Martin Doerr]

On Fri, 23 Jul 2021 14:17:17 GMT, Martin Doerr <mdoerr at openjdk.org> wrote:

> Backport of JDK-8255255. Only 2 hunks didn't apply cleanly:
> 
> --- src/java.xml.crypto/share/classes/com/sun/org/slf4j/internal/Logger.java
> +++ src/java.xml.crypto/share/classes/com/sun/org/slf4j/internal/Logger.java
> @@ -96,6 +96,10 @@ public void warn(String s, Throwable e) {
>          log0(Level.WARNING, s, e);
>      }
>  
> +    public void warn(String s, Object... o) {
> +        log0(Level.WARNING, s, o);
> +    }
> +
>      private void log0(Level level, String s) {
>          if (impl.isLoggable(level)) {
>              var sf = WALKER.walk(f -> f.skip(2).findFirst()).get();
> --- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/UnsyncByteArrayOutputStream.java
> +++ src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/UnsyncByteArrayOutputStream.java
> @@ -111,9 +111,9 @@ private void expandSize(int newPos) {
>                  newSize = VM_ARRAY_INDEX_MAX_VALUE;
>              }
>          }
> -        byte newBuf[] = new byte[newSize];
> +        byte[] newBuf = new byte[newSize];
>          System.arraycopy(buf, 0, newBuf, 0, pos);
>          buf = newBuf;
>          size = newSize;
>      }
> -}
> 
> I've reimplemented the 1st one because JDK-8247907 is not in 11u. The 2nd one didn't apply automatically because JDK-8230744 broke the line ending at the end and is not in 11u. Applied manually.

This pull request has now been integrated.

Changeset: f700d37d
Author:    Martin Doerr <mdoerr at openjdk.org>
URL:       https://git.openjdk.java.net/jdk11u-dev/commit/f700d37d2b3d8c23d50defc19853c68bb60027ab
Stats:     7972 lines in 186 files changed: 2632 ins; 3944 del; 1396 mod

8255255: Update Apache Santuario (XML Signature) to version 2.2.1

Reviewed-by: clanger
Backport-of: cb742f956078f420be328d7899fcba768939020f

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

PR: https://git.openjdk.java.net/jdk11u-dev/pull/155