Skip to content

Commit df90e79

Browse files
committed
update to upstream release 5.6.2
1 parent b649307 commit df90e79

File tree

3 files changed

+10
-9
lines changed

3 files changed

+10
-9
lines changed

Makefile

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
X64?= false
22

3-
ES_FILE_VERSION=5.4.0
3+
ES_FILE_VERSION=5.6.2
44
ES_VERSION=$(ES_FILE_VERSION)
5-
ES_SHA1=6ca6f8157fe2bb6b9d07ac6c77a96a5ff366e420
5+
ES_SHA512=db4ec26915d2dc1673307522c168560f2ff7aa6cd3834d2d19effd398c05881b4cb2b08cbad3c8e7dd223a91ddfa2ff8401aae7ac9d69805dc1db8b88d30e393
66
ES_NAME=elasticsearch-$(ES_VERSION)
77
ES_HOME=vendor/$(ES_NAME)
88
ES_LIB=$(ES_HOME)/lib
@@ -84,7 +84,7 @@ $(ES_SERVICE_EXE): $(COMMONS_DAEMON_PRUNSRV) $(SETEXECUTABLEICON_EXE)
8484

8585
$(ES_JAR):
8686
wget -qO $(ES_HOME).zip https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-$(ES_VERSION).zip
87-
[ `openssl sha1 $(ES_HOME).zip | awk '{print $$2}'` == $(ES_SHA1) ]
87+
[ `openssl sha512 $(ES_HOME).zip | awk '{print $$2}'` == $(ES_SHA512) ]
8888
rm -rf vendor-tmp && mkdir vendor-tmp
8989
unzip -q -d vendor-tmp $(ES_HOME).zip
9090
for batch in vendor-tmp/elasticsearch-*/bin/elasticsearch-*.bat; do \
@@ -110,8 +110,9 @@ $(JRE): HasUnlimitedStrength.class
110110
--insecure \
111111
-L \
112112
-b oraclelicense=accept-securebackup-cookie \
113-
-o vendor/jre-64/server-jre-8u131-windows-x64.tar.gz \
114-
http://download.oracle.com/otn-pub/java/jdk/8u131-b11/d54c1d3a095b4ff2b6607d096fa80163/server-jre-8u131-windows-x64.tar.gz
113+
-o vendor/jre-64/server-jre-8u144-windows-x64.tar.gz \
114+
http://download.oracle.com/otn-pub/java/jdk/8u144-b01/090f390dda5b47b9b721c7dfaa008135/server-jre-8u144-windows-x64.tar.gz
115+
[ `openssl sha256 vendor/jre-64/server-jre-8u144-windows-x64.tar.gz | awk '{print $$2}'` == '20d5e1b2b4c789b6d0c378ffa9b2ff12448f31f0224ba482a338790cff18020a' ]
115116
tar xf vendor/jre-64/server-jre-*.tar.gz -C vendor/jre-64
116117
mv vendor/jre-64/jdk*/jre vendor/jre-64
117118
curl \

elasticsearch.iss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
#define ServiceAccountName "elasticsearch"
1212
#define ServiceName "elasticsearch"
13-
#define JreVersion "8u131"
13+
#define JreVersion "8u144"
1414
#define ESPath "vendor\elasticsearch-" + AppVersion
1515
#ifdef _WIN64
1616
#define Bits "64"

elasticsearchw-update.cmd

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,15 @@ REM The path to the heap dump location, note directory must exists and have enou
4949
REM space for a full heap dump.
5050
REM JVM_OPTIONS=%JVM_OPTIONS% -XX:HeapDumpPath=$ES_HOME/logs/heapdump.hprof
5151

52-
REM Disables explicit GC
53-
set JVM_OPTIONS=%JVM_OPTIONS% -XX:+DisableExplicitGC
54-
5552
REM Ensure UTF-8 encoding by default (e.g. filenames)
5653
set JVM_OPTIONS=%JVM_OPTIONS% -Dfile.encoding=UTF-8
5754

5855
REM Use our provided JNA always versus the system one
5956
set JVM_OPTIONS=%JVM_OPTIONS% -Djna.nosys=true
6057

58+
REM use old-style file permissions on JDK9
59+
set JVM_OPTIONS=%JVM_OPTIONS% -Djdk.io.permissionsUseCanonicalPath=true
60+
6161
REM Flags to configure Netty
6262
set JVM_OPTIONS=%JVM_OPTIONS% -Dio.netty.noUnsafe=true
6363
set JVM_OPTIONS=%JVM_OPTIONS% -Dio.netty.noKeySetOptimization=true

0 commit comments

Comments
 (0)