From 3bae17d80b874b08b822cc8ad61807fe3b58f044 Mon Sep 17 00:00:00 2001 From: Greg Lewis Date: Sat, 5 Oct 2019 00:09:16 +0000 Subject: Update to 6.8.3 * Update to 6.8.3, which allows the use of newer versions of Java (e.g. 11) * Modify the rc file to allow the version of Java to be used to be configured * Pull in changes to jvm.options that allow for newer versions of Java * Fix a type in pkg-message PR: 239972 Approved by: maintainer timeout Sponsored by: The FreeBSD Foundation --- textproc/elasticsearch6/files/patch-config_jvm.options | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'textproc/elasticsearch6/files/patch-config_jvm.options') diff --git a/textproc/elasticsearch6/files/patch-config_jvm.options b/textproc/elasticsearch6/files/patch-config_jvm.options index 3e259c0b1315..925b45f3b73b 100644 --- a/textproc/elasticsearch6/files/patch-config_jvm.options +++ b/textproc/elasticsearch6/files/patch-config_jvm.options @@ -1,6 +1,6 @@ ---- config/jvm.options.orig 2018-03-01 23:04:45 UTC -+++ config/jvm.options -@@ -87,7 +87,7 @@ +--- config/jvm.options.orig 2019-07-24 08:21:42.000000000 -0700 ++++ config/jvm.options 2019-08-16 13:41:33.818798000 -0700 +@@ -107,13 +107,13 @@ 8:-XX:+PrintGCDateStamps 8:-XX:+PrintTenuringDistribution 8:-XX:+PrintGCApplicationStoppedTime @@ -9,3 +9,10 @@ 8:-XX:+UseGCLogFileRotation 8:-XX:NumberOfGCLogFiles=32 8:-XX:GCLogFileSize=64m + + # JDK 9+ GC logging +-9-:-Xlog:gc*,gc+age=trace,safepoint:file=logs/gc.log:utctime,pid,tags:filecount=32,filesize=64m ++9-:-Xlog:gc*,gc+age=trace,safepoint:file=${ES_TMPDIR}/gc.log: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 + 9-:-Djava.locale.providers=COMPAT -- cgit v1.2.3