Index: /trunk/build.xml
===================================================================
--- /trunk/build.xml	(revision 19042)
+++ /trunk/build.xml	(revision 19043)
@@ -463,5 +463,5 @@
                         <jvmarg value="${jacocoagent@{testfamily}@{testITsuffix}}" if:set="jacocoagent@{testfamily}@{testITsuffix}" />
                         <jvmarg value="-Dfile.encoding=UTF-8"/>
-                        <jvmarg value="-Djava.locale.providers=SPI,JRE,CLDR" if:set="isJava9" />
+                        <jvmarg value="-Djava.locale.providers=SPI,CLDR" />
                         <jvmarg value="-Djava.security.manager=allow" if:set="isJava17" />
                         <jvmarg value="-javaagent:${test.dir}/lib/jmockit.jar"/>
Index: /trunk/src/org/openstreetmap/josm/tools/I18n.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/I18n.java	(revision 19042)
+++ /trunk/src/org/openstreetmap/josm/tools/I18n.java	(revision 19043)
@@ -378,8 +378,4 @@
     static String setupJavaLocaleProviders() {
         // Look up SPI providers first (for JosmDecimalFormatSymbolsProvider).
-        // Enable CLDR locale provider on Java 8 to get additional languages, such as Khmer.
-        // https://docs.oracle.com/javase/8/docs/technotes/guides/intl/enhancements.8.html#cldr
-        // FIXME: This must be updated after we switch to Java 9.
-        // See https://docs.oracle.com/javase/9/docs/api/java/util/spi/LocaleServiceProvider.html
         try {
             try {
@@ -388,5 +384,5 @@
                 I18n.class.getResourceAsStream("/META-INF/services/java.text.spi.DecimalFormatSymbolsProvider").close();
                 // Don't call Utils.updateSystemProperty to avoid spurious log at startup
-                return System.setProperty("java.locale.providers", "SPI,JRE,CLDR");
+                return System.setProperty("java.locale.providers", "SPI,CLDR");
             } catch (RuntimeException | IOException e) {
                 // Don't call Logging class, it may not be fully initialized yet
@@ -398,5 +394,5 @@
         }
         try {
-            return System.setProperty("java.locale.providers", "JRE,CLDR");
+            return System.setProperty("java.locale.providers", "CLDR");
         } catch (SecurityException e) {
             // Don't call Logging class, it may not be fully initialized yet