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

8310512: Cleanup indentation in jfc files #260

Closed

Conversation

RealCLanger
Copy link
Contributor

@RealCLanger RealCLanger commented Oct 17, 2023

Hi all,

This pull request contains a backport of JDK-8310512, commit 3be50da6 from the openjdk/jdk repository.

The commit being backported was authored by Christoph Langer on 21 Jun 2023 and was reviewed by Erik Gahlin.

Thanks!


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • JDK-8310512 needs maintainer approval

Issue

  • JDK-8310512: Cleanup indentation in jfc files (Bug - P4 - Approved)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 260

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk21u/pull/260.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Oct 17, 2023

👋 Welcome back clanger! 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 3be50da636b986b267d15c4caa0147c100b96111 8310512: Cleanup indentation in jfc files Oct 17, 2023
@openjdk
Copy link

openjdk bot commented Oct 17, 2023

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

@openjdk
Copy link

openjdk bot commented Oct 17, 2023

⚠️ @RealCLanger This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

@openjdk openjdk bot added the rfr Pull request is ready for review label Oct 17, 2023
@mlbridge
Copy link

mlbridge bot commented Oct 17, 2023

Webrevs

@RealCLanger
Copy link
Contributor Author

/approval request Simple cleanup change for JFR. Low risk. Tested in GHA and SAP nightlies.

@openjdk
Copy link

openjdk bot commented Oct 19, 2023

@RealCLanger
8310512: The approval request has been created successfully.

@openjdk openjdk bot added the approval label Oct 19, 2023
@openjdk
Copy link

openjdk bot commented Oct 24, 2023

@RealCLanger 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:

8310512: Cleanup indentation in jfc files

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

  • 5121ee6: 8316894: make test TEST="jtreg:test/jdk/..." fails on AIX
  • 0af96a8: 8317987: C2 recompilations cause high memory footprint
  • 418a199: 8314246: javax/swing/JToolBar/4529206/bug4529206.java fails intermittently on Linux
  • fd329f2: 8316880: AArch64: "stop: Header is not fast-locked" with -XX:-UseLSE since JDK-8315880
  • abfe950: 8317327: Remove JT_JAVA dead code in jib-profiles.js
  • b59b560: 8317818: Combinatorial explosion during 'this' escape analysis
  • c41fc4a: 8316181: Move the fast locking implementation out of the .ad files
  • 876f78e: 8316396: Endless loop in C2 compilation triggered by AddNode::IdealIL
  • 61ec985: 8316735: Print LockStack in hs_err files
  • 055cfe0: 8268916: Tests for AffirmTrust roots
  • ... and 17 more: https://git.openjdk.org/jdk21u/compare/a2092fe57371bfce26171715921d24789395b72b...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 ready Pull request is ready to be integrated and removed approval labels Oct 24, 2023
@RealCLanger
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Oct 25, 2023

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

  • b7e0c4a: 8315706: com/sun/tools/attach/warnings/DynamicLoadWarningTest.java real fix for failure on AIX
  • eb6ea91: 8316060: test/hotspot/jtreg/runtime/reflect/ReflectOutOfMemoryError.java may fail if heap is huge
  • 00698a4: 8317373: Add Telia Root CA v2
  • 0fc04fb: 8316741: BasicStroke.createStrokedShape miter-limits failing on small shapes
  • 2bf263d: 8312592: New parentheses warnings after HarfBuzz 7.2.0 update
  • 9f0d9ca: 8316778: test hprof lib: invalid array element type from JavaValueArray.elementSize
  • 294c19d: 8315088: C2: assert(wq.size() - before == EMPTY_LOOP_SIZE) failed: expect the EMPTY_LOOP_SIZE nodes of this body if empty
  • 2bef0bb: 8315869: UseHeavyMonitors not used
  • 5121ee6: 8316894: make test TEST="jtreg:test/jdk/..." fails on AIX
  • 0af96a8: 8317987: C2 recompilations cause high memory footprint
  • ... and 25 more: https://git.openjdk.org/jdk21u/compare/a2092fe57371bfce26171715921d24789395b72b...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Oct 25, 2023

@RealCLanger Pushed as commit bcd73c5.

💡 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
1 participant