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

8210732: remove jdk.testlibrary.Utils #957

Closed
wants to merge 3 commits into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Mar 28, 2022

I want to backport this ot simplify follow-up test backports.

Change already applied in previous backport
test/hotspot/jtreg/runtime/Dictionary/ProtectionDomainCacheTest.java

Change not applicable, other changes removed the import:
test/jdk/com/sun/jdi/BasicJDWPConnectionTest.java
test/jdk/com/sun/jdi/ExclusiveBind.java
test/jdk/java/lang/ClassLoader/forNameLeak/ClassForNameLeak.java

Merged:
test/jdk/sun/tools/jstatd/JstatdTest.java


Progress

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

Issue

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk11u-dev pull/957/head:pull/957
$ git checkout pull/957

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 957

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk11u-dev/pull/957.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 28, 2022

👋 Welcome back goetz! A progress list of the required criteria for merging this PR into pr/951 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 8b28ad6efe68b076bdbd6ca0043a0fddd8847230 8210732: remove jdk.testlibrary.Utils Mar 28, 2022
@openjdk
Copy link

openjdk bot commented Mar 28, 2022

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 Mar 28, 2022
@mlbridge
Copy link

mlbridge bot commented Mar 28, 2022

Webrevs

@GoeLin
Copy link
Member Author

GoeLin commented Mar 29, 2022

Pre-submti failur: dependencies missing. Fixed in jdk11u. Unrelated.

@openjdk-notifier openjdk-notifier bot changed the base branch from pr/951 to master Mar 29, 2022
@openjdk-notifier
Copy link

openjdk-notifier bot commented Mar 29, 2022

The dependent pull request 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 goetz_backport_8182404
git fetch https://git.openjdk.java.net/jdk11u-dev 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

@TheRealMDoerr TheRealMDoerr left a comment

Thanks for the description. Fortunately, not too many edits. LGTM.

@openjdk
Copy link

openjdk bot commented Mar 29, 2022

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

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

8210732: remove jdk.testlibrary.Utils

Reviewed-by: mdoerr

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 32 new commits pushed to 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 added the ready Pull request is ready to be integrated label Mar 29, 2022
@GoeLin
Copy link
Member Author

GoeLin commented Mar 30, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Mar 30, 2022

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

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Mar 30, 2022
@openjdk openjdk bot closed this Mar 30, 2022
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Mar 30, 2022
@GoeLin GoeLin deleted the goetz_backport_8210732-2 branch Mar 30, 2022
@openjdk
Copy link

openjdk bot commented Mar 30, 2022

@GoeLin Pushed as commit b6f4e3e.

💡 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
2 participants