Add SPI jvm option to SystemJvmOptions

distribution/src/config/jvm.options

@@ -75,3 +75,8 @@ ${error.file}
 
 # JDK 9+ GC logging
 9-:-Xlog:gc*,gc+age=trace,safepoint:file=${loggc}:utctime,pid,tags:filecount=32,filesize=64m
+
+# 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 locals
+8-:-Djava.locale.providers=SPI,JRE
+9-:-Djava.locale.providers=SPI,COMPAT

distribution/tools/launchers/src/main/java/org/elasticsearch/tools/launchers/SystemJvmOptions.java

@@ -59,12 +59,7 @@ static List<String> systemJvmOptions() {
             "-Dio.netty.allocator.numDirectArenas=0",
             // log4j 2
             "-Dlog4j.shutdownHookEnabled=false",
-            "-Dlog4j2.disable.jmx=true",
-            /*
-             * 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=COMPAT"));
+            "-Dlog4j2.disable.jmx=true"));
     }
 
 }

rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/310_date_agg_per_day_of_week.yml

@@ -0,0 +1,44 @@
+
+setup:
+  - skip:
+      version: " - 7.5.99" #todo this test failing on jdk8. has to be removed from 7.x
+      reason:  "Start of the week Monday was backported to 7.5"
+
+
+  - do:
+      indices.create:
+        index: test
+        body:
+          mappings:
+            properties:
+              date:
+                type: date
+  - do:
+      index:
+        index: test
+        id:    1
+        body:  { "date": "2009-11-15T14:12:12" }
+  - do:
+      indices.refresh:
+        index: [test]
+---
+# The inserted document has a field date=2009-11-15T14:12:12 which is Sunday.
+# When aggregating per day of the week this should be considered as last day of the week (7)
+# and this value should be used in 'key_as_string'
+"Date aggregartion per day of week":
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test
+        body:
+          aggregations:
+            test:
+              "date_histogram": {
+                "field": "date",
+                "calendar_interval": "day",
+                "format": "e",
+                "offset": 0
+              }
+  - match: {hits.total: 1}
+  - length: { aggregations.test.buckets: 1 }
+  - match: { aggregations.test.buckets.0.key_as_string: "7" }

server/src/test/java/org/elasticsearch/common/joda/JavaJodaTimeDuellingTests.java

@@ -29,6 +29,7 @@
 import org.joda.time.DateTimeZone;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.ISODateTimeFormat;
+import org.junit.BeforeClass;
 
 import java.time.ZoneId;
 import java.time.ZoneOffset;
@@ -47,6 +48,12 @@ protected boolean enableWarningsCheck() {
         return false;
     }
 
+    @BeforeClass
+    public static void checkJvmProperties(){
+        assert ("SPI,COMPAT".equals(System.getProperty("java.locale.providers")))
+            : "`-Djava.locale.providers=SPI,COMPAT` needs to be set";
+    }
+
     public void testTimezoneParsing() {
         /** this testcase won't work in joda. See comment in {@link #testPartialTimeParsing()}
          *  assertSameDateAs("2016-11-30T+01", "strict_date_optional_time", "strict_date_optional_time");