-
Notifications
You must be signed in to change notification settings - Fork 152
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
Conversation
👋 Welcome back Karm! A progress list of the required criteria for merging this PR into |
@Karm This change now passes all automated pre-integration checks. After integration, the commit message for the final commit will be:
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
Please see this link for an up-to-date comparison between the source branch of this pull request and the 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 |
This backport pull request has now been updated with issue from the original commit. |
Webrevs
|
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 |
@Karm this pull request can not be integrated into 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 |
@Karm Please merge master into this PR, resolve conflicts etc. Thanks! |
…1-amendment-175-176-177
Cleaned, reconfigured, rebuilt, tested:
|
/approval request Backporting regular ISO 4217 update from JDK 11. The backport adds only the new currency update, keeping the |
@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. |
There was a problem hiding this 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 | |||
|
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Will amend presently.
i.e. yes I have, the Currency package. |
There was a problem hiding this 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
@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. |
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. |
There was a problem hiding this 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.
/approve yes |
@gnu-andrew |
/integrate |
/sponsor |
Going to push as commit 89697c3.
Your commit was automatically rebased without conflicts. |
@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. |
backport b05f58e JDK11 JDK-8334653 ISO 4217 Amendment 177 Update
depends on #561
Progress
Issue
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