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

8343004: Adjust JAXP limits #22337

Closed
wants to merge 2 commits into from

Conversation

JoeWang-Java
Copy link
Member

@JoeWang-Java JoeWang-Java commented Nov 22, 2024

Adjust JAXP Limits. Limits are adjusted as specified in the CSR.

Tests:
Updated the config test with the new settings.

 Removed obsolete tests Bug6309988.java and Bug4674384_MAX_OCCURS_Test.java, and files used by these tests. These tests verified legacy properties. They came into the JDK from the JAXP and SJSXP standalone libraries. Improvements were made before the integration into the JDK via for example, SJSXP Issue 30. Though the issue tracker is no longer accessible, the tests, e.g. IssueTracker30, are in the JAXP test suite.

Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change requires CSR request JDK-8343006 to be approved

Issues

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/22337/head:pull/22337
$ git checkout pull/22337

Update a local copy of the PR:
$ git checkout pull/22337
$ git pull https://git.openjdk.org/jdk.git pull/22337/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 22337

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/22337.diff

Using Webrev

Link to Webrev Comment

Sorry, something went wrong.

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 22, 2024

👋 Welcome back joehw! 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
Copy link

openjdk bot commented Nov 22, 2024

@JoeWang-Java 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:

8343004: Adjust JAXP limits

Reviewed-by: lancea, rriggs

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

  • 9458a43: 8318416: Superscript marks should use consistent font style
  • c5de307: 8344992: Remove Security Manager dependencies from java.security.cert API and implementations
  • 65c98e5: 8344420: Remove Security Manager dependencies from javax.security package
  • 2465526: 8344821: Test CheckDefaultArchiveFile.java fails if classes_coh.jsa is not present
  • d752f19: 8343427: Class file load hook crashes on archived classes from multi-release JARs
  • f1b5a6e: 8344565: SM cleanup in jdk/internal and java/lang package private classes
  • d8a2337: 8344895: SM cleanup of module java.xml
  • c329f97: 8345015: Remove unused method lookup_time_t_function
  • 86d527f: 8344949: javax.security.auth.Subject.SecureSet.writeObject does not do a security check anymore
  • f0b72f7: 8342380: Implement JEP 498: Warn upon Use of Memory-Access Methods in sun.misc.Unsafe
  • ... and 60 more: https://git.openjdk.org/jdk/compare/21e0fb8648d61f041a04d44ad6c46fc5efd86261...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 rfr Pull request is ready for review label Nov 22, 2024
@openjdk
Copy link

openjdk bot commented Nov 22, 2024

@JoeWang-Java 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 Nov 22, 2024
@mlbridge
Copy link

mlbridge bot commented Nov 22, 2024

Webrevs

Copy link
Contributor

@LanceAndersen LanceAndersen left a comment

Choose a reason for hiding this comment

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

Hi Joe,

The changes look good overall

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Nov 25, 2024
Copy link
Contributor

@RogerRiggs RogerRiggs left a comment

Choose a reason for hiding this comment

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

Looks fine

*/
public class ImplProperties {
// JDK Implementation Specific Properties, refer to module description
public static final String[] PROPERTY_KEYS = {
Copy link
Contributor

Choose a reason for hiding this comment

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

This test would be easier to maintain if the Properties were defined as an enum, each with its related values.

Copy link
Member Author

Choose a reason for hiding this comment

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

Will look into that. Added to JDK-8344999.

@@ -100,23 +100,23 @@ public final class XMLSecurityManager {
@SuppressWarnings("deprecation")
public static enum Limit {
Copy link
Member

Choose a reason for hiding this comment

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

Is it necessary to have both a default and secure value anymore? All the values are the same for both AFACT.

Copy link
Member Author

Choose a reason for hiding this comment

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

I'll start a discussion as related to the JEP, whether to keep FSP as the approach has changed. For now, the values for enableExtensionFunctions are still different. If there's a conclusion, I can make the change via that PR.

@openjdk openjdk bot removed the ready Pull request is ready to be integrated label Nov 26, 2024
@openjdk openjdk bot added the ready Pull request is ready to be integrated label Nov 26, 2024
@JoeWang-Java
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Nov 26, 2024

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

  • 8c2b4f6: 8345057: ML_KEM NamedParameterSpec constants removed by ML-DSA integration
  • 8389e24: 8345058: Javac issues different error messages for the modifiers of the requires directive
  • 8da6435: 8343693: [JVMCI] Override ModifiersProvider.isConcrete in ResolvedJavaType to be isArray() || !isAbstract()
  • 7ae6069: 8344184: Remove sun.net.ResourceManager after JEP 486 integration
  • 1d5587b: 8344256: Clean up obsolete code in java.desktop/share/classes/sun/awt/datatransfer/DataTransferer.java
  • 5e15415: 8344654: Some client tests still expect a SecurityManager after JEP486
  • 3689f39: 8344013: "bad tag in log" assert with +LogCompilation +CITimeVerbose
  • 9458a43: 8318416: Superscript marks should use consistent font style
  • c5de307: 8344992: Remove Security Manager dependencies from java.security.cert API and implementations
  • 65c98e5: 8344420: Remove Security Manager dependencies from javax.security package
  • ... and 67 more: https://git.openjdk.org/jdk/compare/21e0fb8648d61f041a04d44ad6c46fc5efd86261...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Nov 26, 2024

@JoeWang-Java Pushed as commit 28c8729.

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

@JoeWang-Java JoeWang-Java deleted the JDK-8343004 branch November 27, 2024 00:07
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.

None yet

4 participants