Update to upstream release 2.2.1.

Makefile

@@ -1,7 +1,7 @@
 X64?= false
 
-ES_VERSION=1.7.5
-ES_SHA1=1099bc16a72ee20a5bfe3dd29eb3ca257ded7f66
+ES_VERSION=2.2.1
+ES_SHA1=5f84cbc9c99904444c5d23a3ef06a250afba6305
 ES_NAME=elasticsearch-$(ES_VERSION)
 ES_HOME=vendor/$(ES_NAME)
 ES_LIB=$(ES_HOME)/lib

elasticsearch-cmd.cmd

@@ -19,16 +19,12 @@ echo     net start elasticsearch
 echo.
 echo View installed plugins:
 echo.
-echo     plugin --list
+echo     plugin list
 echo.
-echo Install a plugin, e.g. Marvel:
+echo Install a plugin, e.g. HQ and head:
 echo.
-echo     plugin install elasticsearch/marvel/latest
-echo.
-echo NB if you want to disable the Marvel agent type:
-echo.
-echo     echo.^>^> config\elasticsearch.yml
-echo     echo marvel.agent.enabled: false^>^> config\elasticsearch.yml
+echo     plugin install royrusso/elasticsearch-HQ
+echo     plugin install mobz/elasticsearch-head
 echo.
 
 cmd /k "cd %ES_HOME%"

elasticsearch.iss

@@ -10,8 +10,7 @@
 
 #define ServiceAccountName "elasticsearch"
 #define ServiceName "elasticsearch"
-#define AppVersion "1.7.5"
-#define LuceneVersion "4.10.4"
+#define AppVersion "2.2.1"
 #define JreVersion "8u77"
 #define ESPath "vendor\elasticsearch-" + AppVersion
 #ifdef _WIN64
@@ -53,50 +52,25 @@ Name: "english"; MessagesFile: "compiler:Default.isl"
 [Dirs]
 Name: "{app}\bin"
 Name: "{app}\config"
+Name: "{app}\config\scripts"
 Name: "{app}\data"
 Name: "{app}\logs"
+Name: "{app}\plugins"
 
 [Files]
 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\plugin.bat"; DestDir: "{app}\bin"
-Source: "{#ESPath}\lib\elasticsearch-{#AppVersion}.jar"; DestDir: "{app}\lib"
-Source: "{#ESPath}\lib\antlr-runtime-3.5.jar"; DestDir: "{app}\lib"
-Source: "{#ESPath}\lib\apache-log4j-extras-1.2.17.jar"; DestDir: "{app}\lib"
-Source: "{#ESPath}\lib\asm-4.1.jar"; DestDir: "{app}\lib"
-Source: "{#ESPath}\lib\asm-commons-4.1.jar"; DestDir: "{app}\lib"
-Source: "{#ESPath}\lib\groovy-all-2.4.4.jar"; DestDir: "{app}\lib"
-Source: "{#ESPath}\lib\jna-4.1.0.jar"; DestDir: "{app}\lib"
-Source: "{#ESPath}\lib\jts-1.13.jar"; DestDir: "{app}\lib"
-Source: "{#ESPath}\lib\log4j-1.2.17.jar"; DestDir: "{app}\lib"
-Source: "{#ESPath}\lib\lucene-analyzers-common-{#LuceneVersion}.jar"; DestDir: "{app}\lib"
-Source: "{#ESPath}\lib\lucene-core-{#LuceneVersion}.jar"; DestDir: "{app}\lib"
-Source: "{#ESPath}\lib\lucene-expressions-{#LuceneVersion}.jar"; DestDir: "{app}\lib"
-Source: "{#ESPath}\lib\lucene-grouping-{#LuceneVersion}.jar"; DestDir: "{app}\lib"
-Source: "{#ESPath}\lib\lucene-highlighter-{#LuceneVersion}.jar"; DestDir: "{app}\lib"
-Source: "{#ESPath}\lib\lucene-join-{#LuceneVersion}.jar"; DestDir: "{app}\lib"
-Source: "{#ESPath}\lib\lucene-memory-{#LuceneVersion}.jar"; DestDir: "{app}\lib"
-Source: "{#ESPath}\lib\lucene-misc-{#LuceneVersion}.jar"; DestDir: "{app}\lib"
-Source: "{#ESPath}\lib\lucene-queries-{#LuceneVersion}.jar"; DestDir: "{app}\lib"
-Source: "{#ESPath}\lib\lucene-queryparser-{#LuceneVersion}.jar"; DestDir: "{app}\lib"
-Source: "{#ESPath}\lib\lucene-sandbox-{#LuceneVersion}.jar"; DestDir: "{app}\lib"
-Source: "{#ESPath}\lib\lucene-spatial-{#LuceneVersion}.jar"; DestDir: "{app}\lib"
-Source: "{#ESPath}\lib\lucene-suggest-{#LuceneVersion}.jar"; DestDir: "{app}\lib"
-Source: "{#ESPath}\lib\spatial4j-0.4.1.jar"; DestDir: "{app}\lib"
-Source: "{#ESPath}\lib\sigar\sigar-1.6.4.jar"; DestDir: "{app}\lib\sigar"
-#ifdef _WIN64
-Source: "{#ESPath}\lib\sigar\sigar-amd64-winnt.dll"; DestDir: "{app}\lib\sigar"; Flags: ignoreversion
-#else
-Source: "{#ESPath}\lib\sigar\sigar-x86-winnt.dll"; DestDir: "{app}\lib\sigar"; Flags: ignoreversion
-#endif
+Source: "{#ESPath}\lib\elasticsearch-cmd.cmd"; DestDir: "{app}\lib"
+Source: "{#ESPath}\lib\elasticsearchw-update-{#Bits}.cmd"; DestDir: "{app}\lib"; DestName: "elasticsearchw-update.cmd"
+Source: "{#ESPath}\lib\*.jar"; DestDir: "{app}\lib"
+Source: "{#ESPath}\modules\*"; DestDir: "{app}\modules"; Flags: recursesubdirs createallsubdirs
 Source: "{#ESPath}\config\elasticsearch.yml"; DestDir: "{app}\config"
 Source: "{#ESPath}\config\logging.yml"; DestDir: "{app}\config"
 Source: "{#ESPath}\README.textile"; DestDir: "{app}"; DestName: "README.txt"; Flags: isreadme
 Source: "{#ESPath}\NOTICE.txt"; DestDir: "{app}"
 Source: "{#ESPath}\LICENSE.txt"; DestDir: "{app}"
-Source: "{#ESPath}\lib\elasticsearch-cmd.cmd"; DestDir: "{app}\lib"
-Source: "{#ESPath}\lib\elasticsearchw-update-{#Bits}.cmd"; DestDir: "{app}\lib"; DestName: "elasticsearchw-update.cmd"
 Source: "elasticsearchw-uninstall.cmd"; DestDir: "{app}\lib"
 Source: "Elasticsearch Home.url"; DestDir: "{app}"
 Source: "Elasticsearch Setup Home.url"; DestDir: "{app}"
@@ -108,7 +82,7 @@ Name: "{group}\Elasticsearch Home"; Filename: "{app}\Elasticsearch Home.url"
 Name: "{group}\Elasticsearch Setup Home"; Filename: "{app}\Elasticsearch Setup Home.url"
 Name: "{group}\Elasticsearch Guide"; Filename: "{app}\Elasticsearch Guide.url"
 Name: "{group}\Elasticsearch Read Me"; Filename: "{app}\README.txt"
-Name: "{group}\Elasticsearch License"; Filename: "{app}\LICENSE.txt"
+Name: "{group}\Elasticsearch License"; Filename: "{app}\LICENSE.txt"
 Name: "{group}\Uninstall Elasticsearch"; Filename: "{uninstallexe}"
 
 [Run]

elasticsearchw-update.cmd

@@ -19,18 +19,8 @@ rem NB the pound (#) and semicolon (;) are separator characters.
 rem Force the JVM to use IPv4 stack
 rem JVM_OPTIONS=%JVM_OPTIONS% -Djava.net.preferIPv4Stack=true
 
-REM Enable aggressive optimizations in the JVM
-REM    - Disabled by default as it might cause the JVM to crash
-REM set JVM_OPTIONS=%JVM_OPTIONS% -XX:+AggressiveOpts
-
-REM Enable reference compression, reducing memory overhead on 64bit JVMs
-REM    - Disabled by default as it is not stable for Sun JVM before 6u19
-REM    - Enabled by default for JVM 6u23+ when JVM_MX < 32GB
-REM set JVM_OPTIONS=%JVM_OPTIONS% -XX:+UseCompressedOops
-
 set JVM_OPTIONS=%JVM_OPTIONS% -XX:+UseParNewGC
 set JVM_OPTIONS=%JVM_OPTIONS% -XX:+UseConcMarkSweepGC
-
 set JVM_OPTIONS=%JVM_OPTIONS% -XX:CMSInitiatingOccupancyFraction=75
 set JVM_OPTIONS=%JVM_OPTIONS% -XX:+UseCMSInitiatingOccupancyOnly
 
@@ -58,7 +48,10 @@ set JVM_OPTIONS=%JVM_OPTIONS% -XX:+DisableExplicitGC
 REM Ensure UTF-8 encoding by default (e.g. filenames)
 set JVM_OPTIONS=%JVM_OPTIONS% -Dfile.encoding=UTF-8
 
-set JVM_CLASSPATH=%ES_LIB%\*;%ES_LIB%\sigar\*
+REM Use our provided JNA always versus the system one
+set JVM_OPTIONS=%JVM_OPTIONS% -Djna.nosys=true
+
+set JVM_CLASSPATH=%ES_LIB%\elasticsearch-%ES_VERSION%.jar;%ES_LIB%\*
 
 set JVM=auto
 if exist "%ES_HOME%\jre\bin\server\jvm.dll" set JVM=%ES_HOME%\jre\bin\server\jvm.dll
@@ -71,12 +64,16 @@ if exist "%ES_HOME%\jre\bin\client\jvm.dll" set JVM=%ES_HOME%\jre\bin\client\jvm
   --StdError auto ^
   --LogPath "%ES_HOME%\logs" ^
   --StartPath "%ES_HOME%" ^
-  --StartMode=jvm --StartClass=org.elasticsearch.bootstrap.Elasticsearch --StartMethod=main ^
-  --StopMode=jvm --StopClass=org.elasticsearch.bootstrap.Elasticsearch --StopMethod=close ^
+  --StartMode jvm ^
+  --StartClass org.elasticsearch.bootstrap.Elasticsearch ^
+  --StartMethod main ^
+  ++StartParams start ^
+  --StopMode jvm ^
+  --StopClass org.elasticsearch.bootstrap.Elasticsearch ^
+  --StopMethod close ^
   --Classpath "%JVM_CLASSPATH%" ^
   --JvmMs %JVM_MS% ^
   --JvmMx %JVM_MX% ^
-  --JvmOptions "" ^
   %JVM_OPTIONS: = ++JvmOptions % ^
   ++JvmOptions "-Des.path.home=%ES_HOME%"
 
@@ -88,4 +85,4 @@ rem OR, on windows 64-bit procrun always uses the 32-bit registry at:
 rem
 rem    HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Apache Software Foundation\Procrun 2.0\elasticsearch
 rem
-rem See http://commons.apache.org/daemon/procrun.html
+rem See http://commons.apache.org/daemon/procrun.html