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

8288928: Incorrect GPL header in pnglibconf.h (backport of JDK-8185041) #1169

Closed
wants to merge 1 commit into from

Conversation

mrserb
Copy link
Member

@mrserb mrserb commented Jun 21, 2022

Hi all,
This pull request contains a backport of commit 70762d39 from the openjdk/jdk repository.
The commit being backported was authored by Sergey Bylokhov on 7 Oct 2019 and was reviewed by Phil Race.
Thanks!

Backport is clean, but I have to create a new JBS issue, the initial one is closed.


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

Issue

  • JDK-8288928: Incorrect GPL header in pnglibconf.h (backport of JDK-8185041)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk11u-dev pull/1169/head:pull/1169
$ git checkout pull/1169

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1169

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk11u-dev/pull/1169.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 21, 2022

👋 Welcome back serb! 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 Jun 21, 2022

⚠️ @mrserb the issue with id 8185041 from commit 70762d397267f85ce81727ec0c89c9448967798e does not exist in project JDK.

@mrserb mrserb changed the title Backport 70762d397267f85ce81727ec0c89c9448967798e 8185041: Incorrect GPL header in pnglibconf.h Jun 22, 2022
@mrserb mrserb changed the title 8185041: Incorrect GPL header in pnglibconf.h 8288928: Incorrect GPL header in pnglibconf.h Jun 22, 2022
@mrserb
Copy link
Member Author

mrserb commented Jun 22, 2022

/clean Backport is clean, but I have to create a new JBS issue, the initial one is closed.

@openjdk
Copy link

openjdk bot commented Jun 22, 2022

@mrserb Can only mark backport pull requests, with an original hash, as clean

@mrserb mrserb marked this pull request as ready for review June 22, 2022 00:30
@openjdk openjdk bot added the rfr Pull request is ready for review label Jun 22, 2022
@mlbridge
Copy link

mlbridge bot commented Jun 22, 2022

Webrevs

Copy link
Member

@phohensee phohensee 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 Jun 28, 2022

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

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

8288928: Incorrect GPL header in pnglibconf.h (backport of JDK-8185041)

Reviewed-by: phh

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

  • 0106d84: 8285693: Create an automated test for JDK-4702199
  • 9180dcb: 8284077: Create an automated test for JDK-4170173
  • ce8367f: 8288781: C1: LIR_OpVisitState::maxNumberOfOperands too small
  • 1c96cac: 8289471: Issue in Initialization of keys in ErrorMsg.java and XPATHErrorResources.java
  • ac89673: 8290000: Bump macOS GitHub actions to macOS 11
  • d647021: 8283624: Create an automated regression test for RFE-4390885
  • 9796aac: 8223543: [TESTBUG] Regression test java/awt/Graphics2D/DrawString/LCDTextSrcEa.java has issues
  • 3210c99: 8283245: Create a test for JDK-4670319
  • 7318cdc: 8221871: javadoc should not set role=region on
    elements
  • 93666ae: 8218413: make reconfigure ignores configure-time AUTOCONF environment variable
  • ... and 128 more: https://git.openjdk.org/jdk11u-dev/compare/8242dd1044cc47e5f502ce8c775da4ca84f07d72...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 Jun 28, 2022
@mrserb
Copy link
Member Author

mrserb commented Jul 2, 2022

@kevinrushforth @prrace Do you know is it possible to open an initial JBS issue?
openjdk/jdk@70762d3

@GoeLin
Copy link
Member

GoeLin commented Jul 5, 2022

Can you please change the title to "Backport 70762d3"? Thanks.

@kevinrushforth
Copy link
Member

@GoeLin I don't think that will work unless we are able to make JDK-8185041 public. I'll discuss with @prrace and we'll let you know.

@kevinrushforth
Copy link
Member

@mrserb @GoeLin We have determined that we cannot make JBS bug JDK-8185041 public, so please proceed with this review under the new Bug ID, JDK-8288928, as you have done.

@RealCLanger
Copy link
Contributor

Thanks @kevinrushforth for taking a look. I've approved JDK-8288928 now, please go ahead and integrate.

@jerboaa
Copy link
Contributor

jerboaa commented Jul 11, 2022

/issue add 8185041

@openjdk
Copy link

openjdk bot commented Jul 11, 2022

@jerboaa Only the author (@mrserb) is allowed to issue the /issue command.

@jerboaa
Copy link
Contributor

jerboaa commented Jul 11, 2022

@mrserb For traceability we should try to mention the original, closed issue, in the commit message of the backport. Either try /issue add or use /summary or change the issue title to refer to the original issue in its title. Thanks!

@RealCLanger
Copy link
Contributor

Also, the title of the JBS issue has changed. Please check that this is reflected correctly in the title of this PR before integrating. If it isn't, please correct the PR title manually. Thanks

@GoeLin
Copy link
Member

GoeLin commented Aug 3, 2022

@mrserb, could you please handle above remarks and integrate? Thanks!

@mrserb
Copy link
Member Author

mrserb commented Aug 3, 2022

/issue add 8288928

@openjdk openjdk bot changed the title 8288928: Incorrect GPL header in pnglibconf.h 8288928: Incorrect GPL header in pnglibconf.h (backport of JDK-8185041) Aug 3, 2022
@openjdk
Copy link

openjdk bot commented Aug 3, 2022

@mrserb This issue is referenced in the PR title - it will now be updated.

@mrserb
Copy link
Member Author

mrserb commented Aug 3, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Aug 3, 2022

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

  • 0106d84: 8285693: Create an automated test for JDK-4702199
  • 9180dcb: 8284077: Create an automated test for JDK-4170173
  • ce8367f: 8288781: C1: LIR_OpVisitState::maxNumberOfOperands too small
  • 1c96cac: 8289471: Issue in Initialization of keys in ErrorMsg.java and XPATHErrorResources.java
  • ac89673: 8290000: Bump macOS GitHub actions to macOS 11
  • d647021: 8283624: Create an automated regression test for RFE-4390885
  • 9796aac: 8223543: [TESTBUG] Regression test java/awt/Graphics2D/DrawString/LCDTextSrcEa.java has issues
  • 3210c99: 8283245: Create a test for JDK-4670319
  • 7318cdc: 8221871: javadoc should not set role=region on
    elements
  • 93666ae: 8218413: make reconfigure ignores configure-time AUTOCONF environment variable
  • ... and 128 more: https://git.openjdk.org/jdk11u-dev/compare/8242dd1044cc47e5f502ce8c775da4ca84f07d72...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Aug 3, 2022

@mrserb Pushed as commit 39ec436.

💡 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
integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

6 participants