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

8280373: Update Xalan serializer / SystemIDResolver to align with JDK-8270492 #1008

Closed

Conversation

gnu-andrew
Copy link
Member

@gnu-andrew gnu-andrew commented Apr 6, 2022

Hi all,

This pull request contains a backport of commit c180070c from the openjdk/jdk repository.

The commit being backported was authored by Matthias Baesken on 26 Jan 2022 and was reviewed by Yuri Nesterenko and Joe Wang.

JDK-8270492 was a security fix in the January security update which was backported to 8u, 11u & 17u. This fix synchronises src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SystemIDResolver.java to match the change in src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/SystemIDResolver.java made in JDK-8270492. The fix has already been backported to 17u.

Thanks!


Progress

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

Issue

  • JDK-8280373: Update Xalan serializer / SystemIDResolver to align with JDK-8270492

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1008

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 6, 2022

👋 Welcome back andrew! 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 c180070cb59b8e075376ae913c5db9a4ed868303 8280373: Update Xalan serializer / SystemIDResolver to align with JDK-8270492 Apr 6, 2022
@openjdk
Copy link

openjdk bot commented Apr 6, 2022

This backport pull request has now been updated with issue from the original commit.

@openjdk
Copy link

openjdk bot commented Apr 6, 2022

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

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

8280373: Update Xalan serializer / SystemIDResolver to align with JDK-8270492

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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 ready Pull request is ready to be integrated rfr Pull request is ready for review labels Apr 6, 2022
@mlbridge
Copy link

mlbridge bot commented Apr 6, 2022

Webrevs

@gnu-andrew
Copy link
Member Author

I see the bug now has jdk11u-fix-yes.

@gnu-andrew
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Apr 8, 2022

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

  • 5a66c8e: 8283408: Fix a C2 crash when filling arrays with unsafe
  • 5d1718f: 8283451: C2: assert(_base == Long) failed: Not a Long
  • 1f011cb: 8272493: Suboptimal code generation around Preconditions.checkIndex intrinsic with AVX2
  • 6aa09f0: 8282312: Minor corrections to evbroadcasti32x4 intrinsic on x86
  • 3e833fb: 8282172: CompileBroker::log_metaspace_failure is called from non-Java/compiler threads
  • b271964: 8271055: Crash during deoptimization with "assert(bb->is_reachable()) failed: getting result from unreachable basicblock" with -XX:+VerifyStack
  • 67c4882: 8265297: javax/net/ssl/SSLSession/TestEnabledProtocols.java failed with "RuntimeException: java.net.SocketException: Connection reset"
  • 6cc8d69: 8229210: [TESTBUG] Move gc stress tests from JFR directory tree to gc/stress
  • b6f59f5: 8273655: content-types.properties files are missing some common types
  • b9d0a03: 8283350: (tz) Update Timezone Data to 2022a

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Apr 8, 2022
@openjdk openjdk bot closed this Apr 8, 2022
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Apr 8, 2022
@openjdk
Copy link

openjdk bot commented Apr 8, 2022

@gnu-andrew Pushed as commit aeeab3d.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport clean integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

1 participant