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

8299378: sprintf is deprecated in Xcode 14 #2661

Closed
wants to merge 3 commits into from
Closed

Conversation

gdams
Copy link
Member

@gdams gdams commented Jul 4, 2024

Backport applies cleanly except for the missing test/hotspot/gtest/utilities/test_unsigned5.cpp in JDK17u.

I had to manually add the runtime/os.hpp import which was added as part of openjdk/jdk@df6cf1e


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
  • JDK-8299378 needs maintainer approval

Issue

  • JDK-8299378: sprintf is deprecated in Xcode 14 (Enhancement - P4 - Approved)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2661

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jul 4, 2024

👋 Welcome back gdams! 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 Jul 4, 2024

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

8299378: sprintf is deprecated in Xcode 14

Reviewed-by: sgehwolf, andrew

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

  • e191f94: 8299397: Remove metaprogramming/isFloatingPoint.hpp
  • a1ae58e: 8299399: Remove metaprogramming/isArray.hpp
  • e661861: 8299402: Remove metaprogramming/isVolatile.hpp
  • 8b9d876: 8299398: Remove metaprogramming/isConst.hpp
  • f87aa30: 8328238: Convert few closed manual applet tests to main

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
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 changed the title Backport 38cfc591725de478879266584280562f0ba4b42f 8299378: sprintf is deprecated in Xcode 14 Jul 4, 2024
@openjdk
Copy link

openjdk bot commented Jul 4, 2024

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

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Jul 4, 2024
@mlbridge
Copy link

mlbridge bot commented Jul 4, 2024

Webrevs

Copy link
Contributor

@jerboaa jerboaa left a comment

Choose a reason for hiding this comment

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

test_unsigned5.cpp got added with JDK-8292758 only in JDK 20. OK.

@openjdk
Copy link

openjdk bot commented Jul 4, 2024

⚠️ @gdams 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.

Copy link
Contributor

@jerboaa jerboaa left a comment

Choose a reason for hiding this comment

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

Looking at GHA, the builds fail, though. Please check.

@gdams gdams changed the base branch from master to pr/2662 July 4, 2024 14:01
@openjdk-notifier openjdk-notifier bot changed the base branch from pr/2662 to master July 5, 2024 07:14
@openjdk-notifier
Copy link

The parent pull request that this pull request depends on has now been integrated and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork:

git checkout sprintf
git fetch https://git.openjdk.org/jdk17u-dev.git master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push

Copy link
Contributor

@jerboaa jerboaa left a comment

Choose a reason for hiding this comment

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

LGTM.

@gdams
Copy link
Member Author

gdams commented Jul 5, 2024

/approval request This change applies cleanly other than a single file missing in JDK17u. I also added a single import command to avoid backporting a 180+ line commit. All tests pass. This is also crucial to allow us to upgrade the GH actions workflow to move away from the deprecated macos-11 VMs.

@openjdk
Copy link

openjdk bot commented Jul 5, 2024

@gdams
8299378: The approval request has been created successfully.

Copy link
Member

@gnu-andrew gnu-andrew left a comment

Choose a reason for hiding this comment

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

Backport looks good to me too. No issue with adding imports as needed rather than backporting where they were added in a later JDK version.

@gnu-andrew
Copy link
Member

/approve yes

@openjdk
Copy link

openjdk bot commented Jul 5, 2024

@gnu-andrew
8299378: The approval request has been approved.

@openjdk openjdk bot added ready Pull request is ready to be integrated and removed approval labels Jul 5, 2024
@gdams
Copy link
Member Author

gdams commented Jul 5, 2024

/integrate

@openjdk
Copy link

openjdk bot commented Jul 5, 2024

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

  • e191f94: 8299397: Remove metaprogramming/isFloatingPoint.hpp
  • a1ae58e: 8299399: Remove metaprogramming/isArray.hpp
  • e661861: 8299402: Remove metaprogramming/isVolatile.hpp
  • 8b9d876: 8299398: Remove metaprogramming/isConst.hpp
  • f87aa30: 8328238: Convert few closed manual applet tests to main

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jul 5, 2024

@gdams Pushed as commit 8d974ea.

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

Successfully merging this pull request may close these issues.

3 participants