Skip to content

Commit e139340

Browse files
committed
Update to upstream release 1.7.1.
1 parent cfe49ee commit e139340

File tree

5 files changed

+7
-6
lines changed

5 files changed

+7
-6
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.6.0
3+
ES_VERSION=1.7.1
44
ES_NAME=elasticsearch-$(ES_VERSION)
55
ES_HOME=vendor/$(ES_NAME)
66
ES_LIB=$(ES_HOME)/lib

elasticsearch.iss

Lines changed: 3 additions & 3 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.6.0"
13+
#define AppVersion "1.7.1"
1414
#define LuceneVersion "4.10.4"
15-
#define JreVersion "8u45"
15+
#define JreVersion "8u51"
1616
#define ESPath "vendor\elasticsearch-" + AppVersion
1717
#ifdef _WIN64
1818
#define Bits "64"
@@ -66,7 +66,7 @@ Source: "{#ESPath}\lib\antlr-runtime-3.5.jar"; DestDir: "{app}\lib"
6666
Source: "{#ESPath}\lib\apache-log4j-extras-1.2.17.jar"; DestDir: "{app}\lib"
6767
Source: "{#ESPath}\lib\asm-4.1.jar"; DestDir: "{app}\lib"
6868
Source: "{#ESPath}\lib\asm-commons-4.1.jar"; DestDir: "{app}\lib"
69-
Source: "{#ESPath}\lib\groovy-all-2.4.0.jar"; DestDir: "{app}\lib"
69+
Source: "{#ESPath}\lib\groovy-all-2.4.4.jar"; DestDir: "{app}\lib"
7070
Source: "{#ESPath}\lib\jna-4.1.0.jar"; DestDir: "{app}\lib"
7171
Source: "{#ESPath}\lib\jts-1.13.jar"; DestDir: "{app}\lib"
7272
Source: "{#ESPath}\lib\log4j-1.2.17.jar"; DestDir: "{app}\lib"

elasticsearchw-update.cmd

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,11 @@ REM JVM_OPTIONS=%JVM_OPTIONS% -XX:+UseCondCardMark
4040
REM GC logging options -- uncomment to enable
4141
REM JVM_OPTIONS=%JVM_OPTIONS% -XX:+PrintGCDetails
4242
REM JVM_OPTIONS=%JVM_OPTIONS% -XX:+PrintGCTimeStamps
43+
REM JVM_OPTIONS=%JVM_OPTIONS% -XX:+PrintGCDateStamps
4344
REM JVM_OPTIONS=%JVM_OPTIONS% -XX:+PrintClassHistogram
4445
REM JVM_OPTIONS=%JVM_OPTIONS% -XX:+PrintTenuringDistribution
4546
REM JVM_OPTIONS=%JVM_OPTIONS% -XX:+PrintGCApplicationStoppedTime
46-
REM JVM_OPTIONS=%JVM_OPTIONS% -Xloggc:/var/log/elasticsearch/gc.log
47+
REM JVM_OPTIONS=%JVM_OPTIONS% -Xloggc:%ES_HOME%/logs/gc.log
4748

4849
REM Causes the JVM to dump its heap on OutOfMemory.
4950
set JVM_OPTIONS=%JVM_OPTIONS% -XX:+HeapDumpOnOutOfMemoryError

vendor/elasticsearch-1.6.0.zip.md5

Lines changed: 0 additions & 1 deletion
This file was deleted.

vendor/elasticsearch-1.7.1.zip.md5

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
777d038bedf0540aa264b6ecd276b198 *elasticsearch-1.7.1.zip

0 commit comments

Comments
 (0)