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

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

Closed

Conversation

TheRealMDoerr
Copy link
Contributor

@TheRealMDoerr TheRealMDoerr commented Jul 23, 2021

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.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

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

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 155

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Jul 23, 2021

👋 Welcome back mdoerr! 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 cb742f956078f420be328d7899fcba768939020f 8255255: Update Apache Santuario (XML Signature) to version 2.2.1 Jul 23, 2021
@openjdk
Copy link

openjdk bot commented Jul 23, 2021

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 Jul 23, 2021
@mlbridge
Copy link

mlbridge bot commented Jul 23, 2021

Webrevs

Copy link
Contributor

@RealCLanger RealCLanger left a comment

Choose a reason for hiding this comment

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

Looks good to me.

@openjdk
Copy link

openjdk bot commented Jul 27, 2021

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

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

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

Reviewed-by: clanger

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

  • d7a6e51: 8253899: Make IsClassUnloadingEnabled signature match specification
  • 293d44f: 8262017: C2: assert(n != __null) failed: Bad immediate dominator info.
  • 2a3d908: 8269661: JNI_GetStringCritical does not lock char array

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 Jul 27, 2021
@TheRealMDoerr
Copy link
Contributor Author

Thanks for the review!
/integrate

@openjdk
Copy link

openjdk bot commented Jul 27, 2021

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

  • 227610d: 8267348: Rewrite gc/epsilon/TestClasses.java to use Metaspace with less classes
  • d7a6e51: 8253899: Make IsClassUnloadingEnabled signature match specification
  • 293d44f: 8262017: C2: assert(n != __null) failed: Bad immediate dominator info.
  • 2a3d908: 8269661: JNI_GetStringCritical does not lock char array

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Jul 27, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jul 27, 2021
@openjdk
Copy link

openjdk bot commented Jul 27, 2021

@TheRealMDoerr Pushed as commit f700d37.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

@TheRealMDoerr TheRealMDoerr deleted the 8255255_Apache_Santuario branch July 27, 2021 10:18
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