7102969: currency.properties supercede not working correctly

[jerboaa]

This is a backport of JDK-7102969 and JDK-8157138 both of which were done as a single patch in JDK 9 (and also included JDK-8149452 which isn't part of this backport because it changes CLDR related things which I think are too risky to backport and only applying those hunks fails the newly added test for it). The reason why I propose to backport this is:

1. Oracle backported it to 8u461
2. It's a more thorough fix of JDK-8353433 which got added to avoid a test failure for an ISO 4217 Amendment 176 update. See JDK-8353579 and this comment for details.

I've mostly applied hunks manually and omitted the test for JDK-8149452 and the related jdk/make/src/classes/build/tools/cldrconverter/CLDRConverter.java changes.

Since this also fixes JDK-8353433, the change to the CurrencyData.properties has been revered (see separate commit). Backports of JDK-7102969 and JDK-8157138 fix the java/util/Currency/ValidateISO4217.java test as well.

Testing:

• jdk/test/java/util/Currency/ tests

Thoughts? Please review! Thanks in advance.

---

Progress

• Change must be properly reviewed (1 review required, with at least 1 Reviewer)
• JDK-7102969 needs maintainer approval
• Change must not contain extraneous whitespace
• Commit message must refer to an issue
• JDK-8157138 needs maintainer approval

Issues

• JDK-7102969: currency.properties supercede not working correctly (Bug - P3)
• JDK-8157138: Error while fetching currency instance by Currency.getInstance(currencycode) (Bug - P4)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 660

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

Using diff file

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

Using Webrev

Link to Webrev Comment

[bridgekeeper]

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

[jerboaa]

Passed: java/util/Currency/Bug4512215.java
Passed: java/util/Currency/Bug6807534.java
Passed: java/util/Currency/CurrencyTest.java
Passed: java/util/Currency/PropertiesTest.sh
Passed: java/util/Currency/ValidateISO4217.java
Test results: passed: 5

[openjdk]

❗ This change is not yet ready to be integrated.
See the Progress checklist in the description for automated requirements.

[openjdk]

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

[jerboaa]

/issue remove JDK-8149452

[openjdk]

@jerboaa
Removing additional issue from issue list: 8149452.

[mlbridge]

Webrevs

• 00: Full (4c91ba02)

[jerboaa]

@gnu-andrew Could you please review this? Thanks!