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

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

Closed
wants to merge 3 commits into from

Conversation

MBaesken
Copy link
Member

@MBaesken MBaesken commented Jan 20, 2022

After 8270492
78b2c84
has been pushed, we should adjust src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SystemIDResolver.java getAbsoluteURI to what has been done in 8270492 to src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/SystemIDResolver.java


Progress

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

Issue

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

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/7155/head:pull/7155
$ git checkout pull/7155

Update a local copy of the PR:
$ git checkout pull/7155
$ git pull https://git.openjdk.java.net/jdk pull/7155/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 7155

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/7155.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 20, 2022

👋 Welcome back mbaesken! 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 added the rfr Pull request is ready for review label Jan 20, 2022
@openjdk
Copy link

openjdk bot commented Jan 20, 2022

@MBaesken The following label will be automatically applied to this pull request:

  • core-libs

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added the core-libs core-libs-dev@openjdk.org label Jan 20, 2022
@mlbridge
Copy link

mlbridge bot commented Jan 20, 2022

Webrevs

Copy link

@yan-too yan-too left a comment

Choose a reason for hiding this comment

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

LGTM!

@openjdk
Copy link

openjdk bot commented Jan 20, 2022

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

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

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

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

Reviewed-by: yan, joehw

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

  • cbe8395: 8280168: Add Objects.toIdentityString
  • f4575e4: 8279946: (ch) java.nio.channels.FileChannel tryLock and write methods are missing @throws NonWritableChannelException
  • 674a97b: 8280396: G1: Full gc mark stack draining should prefer to make work available to other threads
  • fe77250: 8280414: Memory leak in DefaultProxySelector
  • 496baad: 8280030: [REDO] Parallel: More precise boundary in ObjectStartArray::object_starts_in_range
  • 4503d04: 8280375: G1: Tighten mem region limit in G1RebuildRemSetHeapRegionClosure
  • 36fbec7: 8280241: (aio) AsynchronousSocketChannel init fails in IPv6 only Windows env
  • 28796cb: 8163921: HttpURLConnection default Accept header is malformed according to HTTP/1.1 RFC
  • c43ce85: 8278302: [s390] Implement fast-path for ASCII-compatible CharsetEncoders
  • 1b14157: 8280274: Guard printing code of Compile::print_method in PRODUCT
  • ... and 53 more: https://git.openjdk.java.net/jdk/compare/0bf95a1a7327cc4899863143e2dfdf3d87dbdf0c...master

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 Jan 20, 2022
@AlanBateman
Copy link
Contributor

It would be useful if Joe Wang can review this, just in case the security changes did not touch this code for some reason.

@MBaesken MBaesken changed the title JDK-8280373: adjust other SystemIDResolver.java after 8270492 JDK-8280373: Update Xalan serializer / SystemIDResolver to align with JDK-8270492 Jan 20, 2022
@JoeWang-Java
Copy link
Member

Thanks Alan for the reminder. The change looks good. Please add a copyright header and the LastModified tag as the other class did.

@MBaesken
Copy link
Member Author

Thanks Alan for the reminder. The change looks good. Please add a copyright header and the LastModified tag as the other class did.

Hi, I added the header and LastModified.
Best regards, Matthias

@MBaesken
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Jan 26, 2022

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

  • a24f44d: 8280526: x86_32 Math.sqrt performance regression with -XX:UseSSE={0,1}
  • e72eefd: 8280531: Remove unused DeferredCloseInputStream
  • 2c64a7f: 8280374: G1: Remove unnecessary prev bitmap mark
  • a183bfb: 8280377: MethodHandleProxies does not correctly invoke default methods with varags
  • 2eab86b: 8213905: reflection not working for type annotations applied to exception types in the inner class constructor
  • 295c047: 8279242: Reflection newInstance() error message when constructor has no access modifiers could use improvement
  • 841eae6: 8269542: JDWP: EnableCollection support is no longer spec compliant after JDK-8255987
  • 76fe03f: 8280166: Extend java/lang/instrument/GetObjectSizeIntrinsicsTest.java test cases
  • cebaad1: 8280041: Retry loop issues in java.io.ClassCache
  • cbe8395: 8280168: Add Objects.toIdentityString
  • ... and 62 more: https://git.openjdk.java.net/jdk/compare/0bf95a1a7327cc4899863143e2dfdf3d87dbdf0c...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jan 26, 2022

@MBaesken Pushed as commit c180070.

💡 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
core-libs core-libs-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

4 participants