From 398c8028b383f24ce497d4b1ead44d158e94dcb2 Mon Sep 17 00:00:00 2001
From: Jason Tedor <jason@tedor.me>
Date: Mon, 28 Oct 2019 07:57:44 -0400
Subject: [PATCH] Remove locale provider picked up on backport

This commit removes a locale provider that was inadvertently introduced
after a merge conflict during a backport.
---
 .../org/elasticsearch/tools/launchers/SystemJvmOptions.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/distribution/tools/launchers/src/main/java/org/elasticsearch/tools/launchers/SystemJvmOptions.java b/distribution/tools/launchers/src/main/java/org/elasticsearch/tools/launchers/SystemJvmOptions.java
index b0b55b6379f..80903a040c0 100644
--- a/distribution/tools/launchers/src/main/java/org/elasticsearch/tools/launchers/SystemJvmOptions.java
+++ b/distribution/tools/launchers/src/main/java/org/elasticsearch/tools/launchers/SystemJvmOptions.java
@@ -64,7 +64,7 @@ final class SystemJvmOptions {
              * Due to internationalization enhancements in JDK 9 Elasticsearch need to set the provider to COMPAT otherwise time/date
              * parsing will break in an incompatible way for some date patterns and locales.
              */
-            "-Djava.locale.providers=SPI,COMPAT"));
+            "-Djava.locale.providers=COMPAT"));
     }
 
 }