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

8283277: ISO 4217 Amendment 171 Update #202

Closed

Conversation

dimitryc
Copy link
Contributor

@dimitryc dimitryc commented Dec 2, 2022

Please review the currency data update (ISO 4217 Amendment 171 Update)

CurrencyData.properties - conflict in copyright year
ValidateISO4217.java - conflict in copyright year and bug id list
tablea1.txt - conflict in FILEVERSION
LocaleDataTest.java - conflict in bug id list

Testing: jdk/test/java/util/Currency and jdk/test/sun/text/resources passed


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

Issue

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 202

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 2, 2022

👋 Welcome back dcherepanov! 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 openjdk bot changed the title Backport c4dc58e12e197562dce90c0027aa74c29047cea6 8283277: ISO 4217 Amendment 171 Update Dec 2, 2022
@openjdk
Copy link

openjdk bot commented Dec 2, 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 Dec 2, 2022
@mlbridge
Copy link

mlbridge bot commented Dec 2, 2022

Webrevs

@phohensee
Copy link
Member

Does the FILEVERSION conflict point to another backport to do?

Copy link
Member

@phohensee phohensee left a comment

Choose a reason for hiding this comment

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

Lgtm, but see comment.

@openjdk
Copy link

openjdk bot commented Dec 2, 2022

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

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

8283277: ISO 4217 Amendment 171 Update

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

  • c5751e6: 8229182: [TESTBUG] runtime/containers/docker/TestMemoryAwareness.java test fails on SLES12
  • 47090d6: 8297996: [8u] generated images are broken due to renaming of MSVC runtime DLL's
  • b4a745d: 8284977: MetricsTesterCgroupV2.getLongValueEntryFromFile fails when named value doesn't exist
  • b4ef3d3: 8292083: Detected container memory limit may exceed physical machine memory
  • 78cdc41: 8234484: Add ability to configure third port for remote JMX
  • 06546d7: 8284102: [TESTBUG] [11u] Retroactively add regression test for JDK-8272124
  • 9f76da9: 8284756: [11u] Remove unused isUseContainerSupport in CgroupV1Subsystem
  • d6101df: 8254717: isAssignableFrom checks in KeyFactorySpi.engineGetKeySpec appear to be backwards
  • 99ff02e: 8266391: Replace use of reflection in jdk.internal.platform.Metrics
  • 0662db2: 8252957: Wrong comment in CgroupV1Subsystem::cpu_quota
  • ... and 31 more: https://git.openjdk.org/jdk8u-dev/compare/5510145420117f1f3c4a933021c3675cd2a99051...master

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 Dec 2, 2022
@dimitryc
Copy link
Contributor Author

dimitryc commented Dec 2, 2022

Does the FILEVERSION conflict point to another backport to do?

yes, it points to another bug (https://bugs.openjdk.org/browse/JDK-7102969) but I'm not really sure it makes sense to port this second patch.

@dimitryc
Copy link
Contributor Author

dimitryc commented Dec 2, 2022

Lgtm, but see comment.

Thanks for the review. Added jdk8u-fix-request label.

@phohensee
Copy link
Member

Imo worth backporting JDK-7102969 because it covers 3 issues that are worth fixing.

7102969: currency.properties supercede not working correctly
8149452: j.t.SimpleDateFormat.getDateFormatSymbols().getZoneStrings() returns incorrect result for some time zones
8157138: Error while fetching currency instance by Currency.getInstance(currencycode)

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 30, 2022

@dimitryc This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

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, just a few adjustments for metadata and header differences.

Looks like the bug already has approval, so can we get this integrated please? I'd like to follow it up with the remaining data updates, including the recent Croatian adoption of the Euro, and include them with the security bundle for the upcoming release.

@gnu-andrew
Copy link
Member

Imo worth backporting JDK-7102969 because it covers 3 issues that are worth fixing.

7102969: currency.properties supercede not working correctly 8149452: j.t.SimpleDateFormat.getDateFormatSymbols().getZoneStrings() returns incorrect result for some time zones 8157138: Error while fetching currency instance by Currency.getInstance(currencycode)

I agree this looks worth backporting, though it's largely separate to the pending data updates which are more critical. I'll look into this for 8u372 once those are in.

@dimitryc
Copy link
Contributor Author

dimitryc commented Jan 5, 2023

/integrate

@openjdk
Copy link

openjdk bot commented Jan 5, 2023

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

  • c5751e6: 8229182: [TESTBUG] runtime/containers/docker/TestMemoryAwareness.java test fails on SLES12
  • 47090d6: 8297996: [8u] generated images are broken due to renaming of MSVC runtime DLL's
  • b4a745d: 8284977: MetricsTesterCgroupV2.getLongValueEntryFromFile fails when named value doesn't exist
  • b4ef3d3: 8292083: Detected container memory limit may exceed physical machine memory
  • 78cdc41: 8234484: Add ability to configure third port for remote JMX
  • 06546d7: 8284102: [TESTBUG] [11u] Retroactively add regression test for JDK-8272124
  • 9f76da9: 8284756: [11u] Remove unused isUseContainerSupport in CgroupV1Subsystem
  • d6101df: 8254717: isAssignableFrom checks in KeyFactorySpi.engineGetKeySpec appear to be backwards
  • 99ff02e: 8266391: Replace use of reflection in jdk.internal.platform.Metrics
  • 0662db2: 8252957: Wrong comment in CgroupV1Subsystem::cpu_quota
  • ... and 31 more: https://git.openjdk.org/jdk8u-dev/compare/5510145420117f1f3c4a933021c3675cd2a99051...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jan 5, 2023

@dimitryc Pushed as commit 7ad517d.

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

@gnu-andrew
Copy link
Member

PR for the next ISO 4217 update: #224

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
3 participants