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

8334653: ISO 4217 Amendment 177 Update #562

Closed
wants to merge 5 commits into from

Conversation

Karm
Copy link
Contributor

@Karm Karm commented Aug 14, 2024

backport b05f58e JDK11 JDK-8334653 ISO 4217 Amendment 177 Update
depends on #561


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-8334653 needs maintainer approval

Issue

  • JDK-8334653: ISO 4217 Amendment 177 Update (Bug - P3 - Approved)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 562

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 14, 2024

👋 Welcome back Karm! A progress list of the required criteria for merging this PR into pr/561 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 Aug 14, 2024

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

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

8334653: ISO 4217 Amendment 177 Update

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

  • 9a426ad: 8318951: Additional negative value check in JPEG decoding
  • aa44346: 7188098: TEST_BUG: closed/javax/sound/midi/Synthesizer/Receiver/bug6186488.java fails
  • fc33f51: 8266248: Compilation failure in PLATFORM_API_MacOSX_MidiUtils.c with Xcode 12.5
  • 8867d01: 8193682: Infinite loop in ZipOutputStream.close()
  • 5c7f201: 8021775: compiler/8009761/Test8009761.java "Failed: init recursive calls: 51. After deopt 50"
  • 933c78e: 8309138: Fix container tests for jdks with symlinked conf dir

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. Possible candidates are the reviewers of this PR (@gnu-andrew, @jerboaa) but any other Committer may sponsor as well.

➡️ 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 changed the title Backport b05f58e9ec57ce7f140ad47df3b5bdf4cc42f5f9 8334653: ISO 4217 Amendment 177 Update Aug 14, 2024
@openjdk
Copy link

openjdk bot commented Aug 14, 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 Aug 14, 2024
@mlbridge
Copy link

mlbridge bot commented Aug 14, 2024

Webrevs

@openjdk-notifier openjdk-notifier bot changed the base branch from pr/561 to master August 20, 2024 17:04
@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 pr-561-amendment-175-176-177
git fetch https://git.openjdk.org/jdk8u-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

@openjdk
Copy link

openjdk bot commented Aug 20, 2024

@Karm this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout pr-561-amendment-175-176-177
git fetch https://git.openjdk.org/jdk8u-dev.git master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk openjdk bot added the merge-conflict Pull request has merge conflict with target branch label Aug 20, 2024
@jerboaa
Copy link
Contributor

jerboaa commented Aug 21, 2024

@Karm Please merge master into this PR, resolve conflicts etc. Thanks!

…1-amendment-175-176-177
@openjdk openjdk bot removed the merge-conflict Pull request has merge conflict with target branch label Aug 21, 2024
@Karm
Copy link
Contributor Author

Karm commented Aug 21, 2024

Cleaned, reconfigured, rebuilt, tested:

$ TIME=`date +%s`;mkdir -p test.${TIME}/jdk/JTwork test.${TIME}/jdk/JTreport; jtreg -a -ignore:quiet -w:test.${TIME}/jdk/JTwork -r:test.${TIME}/jdk/JTreport -jdk:/home/karm/workspaceRH/jdk8u/build/linux-x86_64-normal-server-release/images/j2sdk-image/ /home/karm/workspaceRH/jdk8u/jdk/test/java/util/Currency/
Test results: passed: 5
Report written to /home/karm/Tools/jtreg/build/images/jtreg/bin/test.1724236868/jdk/JTreport/html/report.html
Results written to /home/karm/Tools/jtreg/build/images/jtreg/bin/test.1724236868/jdk/JTwork

@Karm
Copy link
Contributor Author

Karm commented Aug 21, 2024

/approval request Backporting regular ISO 4217 update from JDK 11. The backport adds only the new currency update, keeping the FILEVERSION=2, i.e. not dragging along other updates. Tests in jdk/test/java/util/Currency/ pass.

@openjdk
Copy link

openjdk bot commented Aug 21, 2024

@Karm
8334653: The approval request has been created successfully.

@openjdk openjdk bot added the approval label Aug 21, 2024
@jerboaa
Copy link
Contributor

jerboaa commented Aug 21, 2024

/approval request Backporting regular ISO 4217 update from JDK 11. The backport adds only the new currency update, keeping the FILEVERSION=2, i.e. not dragging along other updates. Tests in jdk/test/java/util/Currency/ pass.

@Karm In general, please only apply for approval once you have a successful review. I.e. review first, then approval. Thanks! It's OK this time.

@Karm
Copy link
Contributor Author

Karm commented Aug 21, 2024

/approval request Backporting regular ISO 4217 update from JDK 11. The backport adds only the new currency update, keeping the FILEVERSION=2, i.e. not dragging along other updates. Tests in jdk/test/java/util/Currency/ pass.

@Karm In general, please only apply for approval once you have a successful review. I.e. review first, then approval. Thanks! It's OK this time.

Ack. Thx.

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.

An additional blank line is removed in CurrencyData.properties and the bug ID line change is missing for ValidateISO4217.java. Otherwise, the backport matches the changes in the 11u version.

Have you verified that the updated Currency tests pass against the patched build?

@@ -55,9 +55,8 @@ all=ADP020-AED784-AFA004-AFN971-ALL008-AMD051-ANG532-AOA973-ARS032-ATS040-AUD036
TPE626-TRL792-TRY949-TTD780-TWD901-TZS834-UAH980-UGX800-USD840-USN997-USS998-UYI940-\
UYU858-UZS860-VEB862-VED926-VEF937-VES928-VND704-VUV548-WST882-XAF950-XAG961-XAU959-XBA955-\
XBB956-XBC957-XBD958-XCD951-XCG532-XDR960-XFO000-XFU000-XOF952-XPD964-XPF953-\
XPT962-XSU994-XTS963-XUA965-XXX999-YER886-YUM891-ZAR710-ZMK894-ZMW967-ZWD716-ZWL932-\
ZWN942-ZWR935

Copy link
Member

Choose a reason for hiding this comment

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

This blank line should not be removed here.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Will amend presently.

@Karm
Copy link
Contributor Author

Karm commented Aug 21, 2024

An additional blank line is removed in CurrencyData.properties and the bug ID line change is missing for ValidateISO4217.java. Otherwise, the backport matches the changes in the 11u version.

Have you verified that the updated Currency tests pass against the patched build?

#562 (comment)

i.e. yes I have, the Currency package.

@Karm Karm requested a review from gnu-andrew August 22, 2024 12:28
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.

CurrencyTest.java is missing this hunk:

@@ -60,7 +60,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows;

 public class CurrencyTest {

-    // 'tablea1.txt' should be up-to-date before testing
+    // 'ISO4217-list-one.txt' should be up-to-date before testing
     @Test
     public void dataVersionTest() {
         CheckDataVersion.check();

See: openjdk/jdk11u-dev@b05f58e#diff-9b35965750742d3e80baa3c18194cd60156bf561990636e49fa0f6eadf4854dfR63

@Karm
Copy link
Contributor Author

Karm commented Aug 22, 2024

CurrencyTest.java is missing this hunk:

@@ -60,7 +60,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows;

 public class CurrencyTest {

-    // 'tablea1.txt' should be up-to-date before testing
+    // 'ISO4217-list-one.txt' should be up-to-date before testing
     @Test
     public void dataVersionTest() {
         CheckDataVersion.check();

See: openjdk/jdk11u-dev@b05f58e#diff-9b35965750742d3e80baa3c18194cd60156bf561990636e49fa0f6eadf4854dfR63

@jerboaa Why do you think that? I did not port the tests to JUnit, I left that in its original state. The data file is loaded in CheckDataVersion. No point in bringing the comment that belongs to a JUnit that does not exist here IMHO.

@Karm
Copy link
Contributor Author

Karm commented Aug 22, 2024

Or perhaps I misunderstood something.

@gnu-andrew
Copy link
Member

gnu-andrew commented Aug 23, 2024

Or perhaps I misunderstood something.

No, this is the same conclusion I came to. 8u does not have JDK-8310923 which completely refactors this test and is part of a bigger task to move to a newer version of JTreg across the testsuite. We don't intend to backport that to 8u.

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.

Thanks for correcting those two issues. Looks good to me now.

@gnu-andrew
Copy link
Member

/approve yes

@openjdk
Copy link

openjdk bot commented Aug 23, 2024

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

@openjdk openjdk bot added ready Pull request is ready to be integrated and removed approval labels Aug 23, 2024
@Karm
Copy link
Contributor Author

Karm commented Aug 23, 2024

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Aug 23, 2024
@openjdk
Copy link

openjdk bot commented Aug 23, 2024

@Karm
Your change (at version 71a321f) is now ready to be sponsored by a Committer.

@gnu-andrew
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented Aug 23, 2024

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

  • 9a426ad: 8318951: Additional negative value check in JPEG decoding
  • aa44346: 7188098: TEST_BUG: closed/javax/sound/midi/Synthesizer/Receiver/bug6186488.java fails
  • fc33f51: 8266248: Compilation failure in PLATFORM_API_MacOSX_MidiUtils.c with Xcode 12.5
  • 8867d01: 8193682: Infinite loop in ZipOutputStream.close()
  • 5c7f201: 8021775: compiler/8009761/Test8009761.java "Failed: init recursive calls: 51. After deopt 50"
  • 933c78e: 8309138: Fix container tests for jdks with symlinked conf dir

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Aug 23, 2024
@openjdk openjdk bot closed this Aug 23, 2024
@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 Aug 23, 2024
@openjdk
Copy link

openjdk bot commented Aug 23, 2024

@gnu-andrew @Karm Pushed as commit 89697c3.

💡 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.

None yet

3 participants