Skip to content

Commit dc6503f

Browse files
committed
Update to upstream release 1.5.0.
1 parent e3dbf0c commit dc6503f

File tree

4 files changed

+6
-8
lines changed

4 files changed

+6
-8
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
X64?= false
22

3-
ES_VERSION=1.4.4
3+
ES_VERSION=1.5.0
44
ES_NAME=elasticsearch-$(ES_VERSION)
55
ES_HOME=vendor/$(ES_NAME)
66
ES_LIB=$(ES_HOME)/lib

elasticsearch.iss

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010

1111
#define ServiceAccountName "elasticsearch"
1212
#define ServiceName "elasticsearch"
13-
#define AppVersion "1.4.4"
14-
#define LuceneVersion "4.10.3"
15-
#define JreVersion "8u31"
13+
#define AppVersion "1.5.0"
14+
#define LuceneVersion "4.10.4"
15+
#define JreVersion "8u40"
1616
#define ESPath "vendor\elasticsearch-" + AppVersion
1717
#ifdef _WIN64
1818
#define Bits "64"
@@ -63,9 +63,10 @@ Source: "{#ESPath}\bin\elasticsearchw-{#Bits}.exe"; DestDir: "{app}\bin"; DestNa
6363
Source: "{#ESPath}\bin\plugin.bat"; DestDir: "{app}\bin"
6464
Source: "{#ESPath}\lib\elasticsearch-{#AppVersion}.jar"; DestDir: "{app}\lib"
6565
Source: "{#ESPath}\lib\antlr-runtime-3.5.jar"; DestDir: "{app}\lib"
66+
Source: "{#ESPath}\lib\apache-log4j-extras-1.2.17.jar"; DestDir: "{app}\lib"
6667
Source: "{#ESPath}\lib\asm-4.1.jar"; DestDir: "{app}\lib"
6768
Source: "{#ESPath}\lib\asm-commons-4.1.jar"; DestDir: "{app}\lib"
68-
Source: "{#ESPath}\lib\groovy-all-2.3.2.jar"; DestDir: "{app}\lib"
69+
Source: "{#ESPath}\lib\groovy-all-2.4.0.jar"; DestDir: "{app}\lib"
6970
Source: "{#ESPath}\lib\jna-4.1.0.jar"; DestDir: "{app}\lib"
7071
Source: "{#ESPath}\lib\jts-1.13.jar"; DestDir: "{app}\lib"
7172
Source: "{#ESPath}\lib\log4j-1.2.17.jar"; DestDir: "{app}\lib"

elasticsearchw-update.cmd

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ rem Initial memory pool size in MB.
1212
set JVM_MS=256
1313
rem Maximum memory pool size in MB.
1414
set JVM_MX=1024
15-
rem Thread stack size in KB.
16-
set JVM_SS=256
1715

1816
rem Other options.
1917
rem NB the pound (#) and semicolon (;) are separator characters.
@@ -77,7 +75,6 @@ if exist "%ES_HOME%\jre\bin\client\jvm.dll" set JVM=%ES_HOME%\jre\bin\client\jvm
7775
--Classpath "%JVM_CLASSPATH%" ^
7876
--JvmMs %JVM_MS% ^
7977
--JvmMx %JVM_MX% ^
80-
--JvmSs %JVM_SS% ^
8178
--JvmOptions "" ^
8279
%JVM_OPTIONS: = ++JvmOptions % ^
8380
++JvmOptions "-Des.path.home=%ES_HOME%"
File renamed without changes.

0 commit comments

Comments
 (0)