update to upstream release 6.0.0

Author: rgl

Makefile

@@ -1,8 +1,8 @@
 X64?= false
 
-ES_FILE_VERSION=5.6.2
+ES_FILE_VERSION=6.0.0
 ES_VERSION=$(ES_FILE_VERSION)
-ES_SHA512=db4ec26915d2dc1673307522c168560f2ff7aa6cd3834d2d19effd398c05881b4cb2b08cbad3c8e7dd223a91ddfa2ff8401aae7ac9d69805dc1db8b88d30e393
+ES_SHA512=b7830f61577c73fa06fad2b15f876dba5fb239099ce11035a2632035d35a41b25967bd03adb214ef3c286983e7fc3dc27daef1559f66cabd2b24d9394a10a6f8
 ES_NAME=elasticsearch-$(ES_VERSION)
 ES_HOME=vendor/$(ES_NAME)
 ES_LIB=$(ES_HOME)/lib

Vagrantfile-provision.ps1

@@ -1,10 +1,10 @@
 Set-StrictMode -Version Latest
-
+$ProgressPreference = 'SilentlyContinue'
 $ErrorActionPreference = 'Stop'
-
 trap {
     Write-Output "ERROR: $_"
     Write-Output (($_.ScriptStackTrace -split '\r?\n') -replace '^(.*)$','ERROR: $1')
+    Write-Output (($_.Exception.ToString() -split '\r?\n') -replace '^(.*)$','ERROR EXCEPTION: $1')
     Exit 1
 }
 

elasticsearch.iss

@@ -59,6 +59,7 @@ Name: "{app}\plugins"
 Source: "setup-helper.dll"; DestDir: "{app}"
 Source: "vendor\SetACL-2.2.0\SetACL.exe"; DestDir: "{tmp}"; Flags: deleteafterinstall ignoreversion
 Source: "{#ESPath}\bin\elasticsearchw-{#Bits}.exe"; DestDir: "{app}\bin"; DestName: "elasticsearchw.exe"
+Source: "{#ESPath}\bin\elasticsearch-env.bat"; DestDir: "{app}\bin"
 Source: "{#ESPath}\bin\elasticsearch-keystore.bat"; DestDir: "{app}\bin"
 Source: "{#ESPath}\bin\elasticsearch-plugin.bat"; DestDir: "{app}\bin"
 Source: "{#ESPath}\bin\elasticsearch-translog.bat"; DestDir: "{app}\bin"

elasticsearchw-update.cmd

@@ -55,6 +55,10 @@ set JVM_OPTIONS=%JVM_OPTIONS% -Dfile.encoding=UTF-8
 REM Use our provided JNA always versus the system one
 set JVM_OPTIONS=%JVM_OPTIONS% -Djna.nosys=true
 
+REM turn off a JDK optimization that throws away stack traces for common
+REM exceptions because stack traces are important for debugging
+set JVM_OPTIONS=%JVM_OPTIONS% -XX:-OmitStackTraceInFastThrow
+
 REM use old-style file permissions on JDK9
 set JVM_OPTIONS=%JVM_OPTIONS% -Djdk.io.permissionsUseCanonicalPath=true
 
@@ -66,7 +70,6 @@ set JVM_OPTIONS=%JVM_OPTIONS% -Dio.netty.recycler.maxCapacityPerThread=0
 REM log4j 2
 set JVM_OPTIONS=%JVM_OPTIONS% -Dlog4j.shutdownHookEnabled=false
 set JVM_OPTIONS=%JVM_OPTIONS% -Dlog4j2.disable.jmx=true
-set JVM_OPTIONS=%JVM_OPTIONS% -Dlog4j.skipJansi=true
 
 set JVM_CLASSPATH=%ES_LIB%\*
 
@@ -91,7 +94,8 @@ if exist "%ES_HOME%\jre\bin\client\jvm.dll" set JVM=%ES_HOME%\jre\bin\client\jvm
   --JvmMs %JVM_MS% ^
   --JvmMx %JVM_MX% ^
   %JVM_OPTIONS: = ++JvmOptions % ^
-  ++JvmOptions "-Des.path.home=%ES_HOME%"
+  ++JvmOptions "-Des.path.home=%ES_HOME%" ^
+  ++JvmOptions "-Des.path.conf=%ES_HOME%\config"
 
 rem These settings are saved in the Windows Registry at:
 rem