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

8240235: jdk.test.lib.util.JarUtils updates jar files incorrectly #2215

Closed
wants to merge 2 commits into from

Conversation

tabjy
Copy link
Member

@tabjy tabjy commented Oct 24, 2023

a clean backport of JDK-8240235.


Progress

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

Issue

  • JDK-8240235: jdk.test.lib.util.JarUtils updates jar files incorrectly (Bug - P4 - Approved)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2215

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

Using diff file

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

Webrev

Link to Webrev Comment

Sorry, something went wrong.

@bridgekeeper
Copy link

bridgekeeper bot commented Oct 24, 2023

👋 Welcome back kxu! 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.

@tabjy
Copy link
Member Author

tabjy commented Oct 24, 2023

/backport jdk15u

@openjdk openjdk bot changed the title Backport 2a791467919c9df9869e6fe1e57df0a5caa90d8f 8240235: jdk.test.lib.util.JarUtils updates jar files incorrectly Oct 24, 2023
@openjdk
Copy link

openjdk bot commented Oct 24, 2023

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

@openjdk
Copy link

openjdk bot commented Oct 24, 2023

⚠️ @tabjy 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 24, 2023
@openjdk
Copy link

openjdk bot commented Oct 24, 2023

@tabjy The target repository jdk15u is not a valid target for backports.
List of valid target repositories: openjdk/jdk, openjdk/jdk11u, openjdk/jdk11u-dev, openjdk/jdk17u, openjdk/jdk17u-dev, openjdk/jdk19u, openjdk/jdk20u, openjdk/jdk21, openjdk/jdk21u, openjdk/jdk7u, openjdk/jdk8u, openjdk/jdk8u-dev, openjdk/jfx, openjdk/jfx20u, openjdk/jfx21u, openjdk/lilliput-jdk17u, openjdk/lilliput-jdk21u, openjdk/shenandoah-jdk8u, openjdk/shenandoah-jdk8u-dev.
Supplying the organization/group prefix is optional.

@tabjy
Copy link
Member Author

tabjy commented Oct 24, 2023

/backport jdk

@openjdk
Copy link

openjdk bot commented Oct 24, 2023

@tabjy Backport for repo openjdk/jdk on branch master was successfully enabled and will be performed once this pull request has been integrated. Further instructions will be provided at that time.

@mlbridge
Copy link

mlbridge bot commented Oct 24, 2023

Webrevs

@tabjy
Copy link
Member Author

tabjy commented Oct 24, 2023

/approval request Fix Request (jdk11u)
Cleanly backported to match Oracle parity 11.0.22-oracle. Low risk for test library fixes. All tests pass on GHA.

@openjdk
Copy link

openjdk bot commented Oct 24, 2023

@tabjy
8240235: The approval request has been created successfully.

@openjdk openjdk bot added the approval label Oct 24, 2023
@GoeLin
Copy link
Member

GoeLin commented Oct 25, 2023

/approve yes

@openjdk
Copy link

openjdk bot commented Oct 25, 2023

@GoeLin
8240235: The approval request has been approved.

@openjdk
Copy link

openjdk bot commented Oct 25, 2023

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

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

8240235: jdk.test.lib.util.JarUtils updates jar files incorrectly

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

  • 365dacc: 8309095: Remove UTF-8 character from TaskbarPositionTest.java
  • f6a05cf: 8307165: java/awt/dnd/NoFormatsDropTest/NoFormatsDropTest.java timed out
  • c922821: 8301167: Update VerifySignedJar to actually exercise and test verification
  • a28f66b: 8288415: java/awt/PopupMenu/PopupMenuLocation.java is unstable in MacOS machines
  • ce38b3e: 8273804: Platform.isTieredSupported should handle the no-compiler case
  • 2835c6a: 8254711: Add java.security.Provider.getService JFR Event
  • 129e856: 8266249: javax/swing/JPopupMenu/7156657/bug7156657.java fails on macOS

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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added ready Pull request is ready to be integrated and removed approval labels Oct 25, 2023
@tabjy
Copy link
Member Author

tabjy commented Oct 25, 2023

/sponsor

@openjdk
Copy link

openjdk bot commented Oct 25, 2023

@tabjy Only Committers are allowed to sponsor changes.

@tabjy
Copy link
Member Author

tabjy commented Oct 25, 2023

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Oct 25, 2023
@openjdk
Copy link

openjdk bot commented Oct 25, 2023

@tabjy
Your change (at version 537c4f2) is now ready to be sponsored by a Committer.

@phohensee
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented Oct 25, 2023

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

  • 365dacc: 8309095: Remove UTF-8 character from TaskbarPositionTest.java
  • f6a05cf: 8307165: java/awt/dnd/NoFormatsDropTest/NoFormatsDropTest.java timed out
  • c922821: 8301167: Update VerifySignedJar to actually exercise and test verification
  • a28f66b: 8288415: java/awt/PopupMenu/PopupMenuLocation.java is unstable in MacOS machines
  • ce38b3e: 8273804: Platform.isTieredSupported should handle the no-compiler case
  • 2835c6a: 8254711: Add java.security.Provider.getService JFR Event
  • 129e856: 8266249: javax/swing/JPopupMenu/7156657/bug7156657.java fails on macOS

Your commit was automatically rebased without conflicts.

@openjdk
Copy link

openjdk bot commented Oct 25, 2023

Creating backport for repo openjdk/jdk on branch master

/backport openjdk/jdk master

@openjdk openjdk bot added integrated Pull request has been integrated and removed backport=openjdk/jdk:master labels 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 sponsor Pull request is ready to be sponsored labels Oct 25, 2023
@openjdk
Copy link

openjdk bot commented Oct 25, 2023

@phohensee @tabjy Pushed as commit a6ee5aa.

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

@openjdk
Copy link

openjdk bot commented Oct 25, 2023

@openjdk[bot] @tabjy Could not apply backport a6ee5aa7 to openjdk/jdk because the change is already present in the target.

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
Development

Successfully merging this pull request may close these issues.

None yet

3 participants