SONAR-11871 upgrade elasticsearch to 6.8.0

build.gradle

@@ -209,15 +209,14 @@ subprojects {
         entry 'jetty-server'
         entry 'jetty-servlet'
       }
-      dependency('org.elasticsearch.client:transport:6.6.2') {
+      dependency('org.elasticsearch.client:transport:6.8.0') {
         exclude 'org.elasticsearch.plugin:lang-mustache-client'
         exclude 'commons-logging:commons-logging'
         exclude 'org.elasticsearch.plugin:reindex-client'
         exclude 'org.elasticsearch.plugin:rank-eval-client'
       }
       dependency('org.elasticsearch:mocksocket:1.0')
-      // at this date, version 6.6.2 of this module has not been published to Maven central
-      dependency('org.codelibs.elasticsearch.module:analysis-common:6.6.1')
+      dependency('org.codelibs.elasticsearch.module:analysis-common:6.8.0')
       dependency 'org.freemarker:freemarker:2.3.20'
       dependency 'org.hamcrest:hamcrest-all:1.3'
       dependency 'org.jsoup:jsoup:1.11.3'

sonar-application/build.gradle

@@ -123,6 +123,8 @@ task zip(type: Zip, dependsOn: [configurations.compile]) {
       exclude 'elasticsearch/lib/tools/**'
       exclude 'elasticsearch/modules/aggs-matrix-stats/**'
       exclude 'elasticsearch/modules/ingest-common/**'
+      exclude 'elasticsearch/modules/ingest-geoip/**'
+      exclude 'elasticsearch/modules/ingest-user-agent/**'
       exclude 'elasticsearch/modules/lang-expression/**'
       exclude 'elasticsearch/modules/lang-groovy/**'
       exclude 'elasticsearch/modules/lang-mustache/**'

sonar-application/src/main/assembly/elasticsearch/NOTICE.txt

@@ -1406,6 +1406,219 @@ cryptacular LICENSE
    limitations under the License.
 
 
+================================================================================
+geoip2 NOTICE
+================================================================================
+This software is Copyright (c) 2013 by MaxMind, Inc.
+
+This is free software, licensed under the Apache License, Version 2.0.
+
+================================================================================
+geoip2 LICENSE
+================================================================================
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
 ================================================================================
 guava LICENSE
 ================================================================================
@@ -5200,6 +5413,221 @@ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
+================================================================================
+maxmind-db NOTICE
+================================================================================
+This software is Copyright (c) 2014 by MaxMind, Inc.
+
+This is free software, licensed under the Apache License, Version 2.0.
+
+
+================================================================================
+maxmind-db LICENSE
+================================================================================
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+
 ================================================================================
 metrics-core NOTICE
 ================================================================================

sonar-application/src/main/assembly/elasticsearch/bin/elasticsearch-certgen.bat

@@ -12,7 +12,9 @@ set ES_ADDITIONAL_SOURCES=x-pack-env;x-pack-security-env
 set ES_ADDITIONAL_CLASSPATH_DIRECTORIES=lib/tools/security-cli
 call "%~dp0elasticsearch-cli.bat" ^
   %%* ^
-  || exit /b 1
+  || goto exit
 
 endlocal
 endlocal
+:exit
+exit /b %ERRORLEVEL%

sonar-application/src/main/assembly/elasticsearch/bin/elasticsearch-certutil.bat

@@ -12,7 +12,9 @@ set ES_ADDITIONAL_SOURCES=x-pack-env;x-pack-security-env
 set ES_ADDITIONAL_CLASSPATH_DIRECTORIES=lib/tools/security-cli
 call "%~dp0elasticsearch-cli.bat" ^
   %%* ^
-  || exit /b 1
+  || goto exit
 
 endlocal
 endlocal
+:exit
+exit /b %ERRORLEVEL%

sonar-application/src/main/assembly/elasticsearch/bin/elasticsearch-cli.bat

@@ -21,3 +21,5 @@ if defined ES_ADDITIONAL_CLASSPATH_DIRECTORIES (
   -cp "%ES_CLASSPATH%" ^
   "%ES_MAIN_CLASS%" ^
   %*
+  
+exit /b %ERRORLEVEL%

sonar-application/src/main/assembly/elasticsearch/bin/elasticsearch-croneval.bat

@@ -11,7 +11,9 @@ set ES_MAIN_CLASS=org.elasticsearch.xpack.watcher.trigger.schedule.tool.CronEval
 set ES_ADDITIONAL_SOURCES=x-pack-env;x-pack-watcher-env
 call "%~dp0elasticsearch-cli.bat" ^
   %%* ^
-  || exit /b 1
+  || goto exit
 
 endlocal
 endlocal
+:exit
+exit /b %ERRORLEVEL%

sonar-application/src/main/assembly/elasticsearch/bin/elasticsearch-env

@@ -41,11 +41,12 @@ if [ -x "$JAVA_HOME/bin/java" ]; then
 else
   set +e
   JAVA=`which java`
+  echo "warning: Falling back to java on path. This behavior is deprecated. Specify JAVA_HOME"
   set -e
 fi
 
 if [ ! -x "$JAVA" ]; then
-  echo "could not find java; set JAVA_HOME or ensure java is in PATH" >&2
+  echo "could not find java; set JAVA_HOME" >&2
   exit 1
 fi
 

sonar-application/src/main/assembly/elasticsearch/bin/elasticsearch-env.bat

@@ -20,11 +20,12 @@ rem now set the path to java
 if defined JAVA_HOME (
   set JAVA="%JAVA_HOME%\bin\java.exe"
 ) else (
+  echo warning: Falling back to java on path. This behavior is deprecated. Specify JAVA_HOME
   for %%I in (java.exe) do set JAVA="%%~$PATH:I"
 )
 
 if not exist %JAVA% (
-  echo could not find java; set JAVA_HOME or ensure java is in PATH 1>&2
+  echo could not find java; set JAVA_HOME 1>&2
   exit /b 1
 )
 
@@ -57,5 +58,5 @@ set ES_DISTRIBUTION_FLAVOR=default
 set ES_DISTRIBUTION_TYPE=tar
 
 if not defined ES_TMPDIR (
-  for /f "tokens=* usebackq" %%a in (`"%JAVA% -cp "!ES_CLASSPATH!" "org.elasticsearch.tools.launchers.TempDirectory""`) do set ES_TMPDIR=%%a
+  for /f "tokens=* usebackq" %%a in (`CALL %JAVA% -cp "!ES_CLASSPATH!" "org.elasticsearch.tools.launchers.TempDirectory"`) do set  ES_TMPDIR=%%a
 )

sonar-application/src/main/assembly/elasticsearch/bin/elasticsearch-keystore.bat

@@ -6,7 +6,9 @@ setlocal enableextensions
 set ES_MAIN_CLASS=org.elasticsearch.common.settings.KeyStoreCli
 call "%~dp0elasticsearch-cli.bat" ^
   %%* ^
-  || exit /b 1
+  || goto exit
 
 endlocal
 endlocal
+:exit
+exit /b %ERRORLEVEL%

sonar-application/src/main/assembly/elasticsearch/bin/elasticsearch-migrate.bat

@@ -11,7 +11,9 @@ set ES_MAIN_CLASS=org.elasticsearch.xpack.security.authc.esnative.ESNativeRealmM
 set ES_ADDITIONAL_SOURCES=x-pack-env;x-pack-security-env
 call "%~dp0elasticsearch-cli.bat" ^
   %%* ^
-  || exit /b 1
+  || goto exit
 
 endlocal
 endlocal
+:exit
+exit /b %ERRORLEVEL%

sonar-application/src/main/assembly/elasticsearch/bin/elasticsearch-plugin.bat

@@ -7,7 +7,10 @@ set ES_MAIN_CLASS=org.elasticsearch.plugins.PluginCli
 set ES_ADDITIONAL_CLASSPATH_DIRECTORIES=lib/tools/plugin-cli
 call "%~dp0elasticsearch-cli.bat" ^
   %%* ^
-  || exit /b 1
+  || goto exit
+  
 
 endlocal
 endlocal
+:exit
+exit /b %ERRORLEVEL%

sonar-application/src/main/assembly/elasticsearch/bin/elasticsearch-saml-metadata.bat

@@ -11,7 +11,9 @@ set ES_MAIN_CLASS=org.elasticsearch.xpack.security.authc.saml.SamlMetadataComman
 set ES_ADDITIONAL_SOURCES=x-pack-env;x-pack-security-env
 call "%~dp0elasticsearch-cli.bat" ^
   %%* ^
-  || exit /b 1
+  || goto exit
 
 endlocal
 endlocal
+:exit
+exit /b %ERRORLEVEL%

sonar-application/src/main/assembly/elasticsearch/bin/elasticsearch-service.bat

@@ -14,7 +14,7 @@ echo elasticsearch-service-x64.exe was not found...
 exit /B 1
 
 :okExe
-set ES_VERSION=6.6.2
+set ES_VERSION=6.8.0
 
 if "%SERVICE_LOG_DIR%" == "" set SERVICE_LOG_DIR=%ES_HOME%\logs
 
@@ -252,3 +252,5 @@ goto:eof
 
 endlocal
 endlocal
+
+exit /b %ERRORLEVEL%

sonar-application/src/main/assembly/elasticsearch/bin/elasticsearch-setup-passwords.bat

@@ -11,7 +11,9 @@ set ES_MAIN_CLASS=org.elasticsearch.xpack.security.authc.esnative.tool.SetupPass
 set ES_ADDITIONAL_SOURCES=x-pack-env;x-pack-security-env
 call "%~dp0elasticsearch-cli.bat" ^
   %%* ^
-  || exit /b 1
+  || goto exit
 
 endlocal
 endlocal
+:exit
+exit /b %ERRORLEVEL%

sonar-application/src/main/assembly/elasticsearch/bin/elasticsearch-shard.bat

@@ -6,7 +6,9 @@ setlocal enableextensions
 set ES_MAIN_CLASS=org.elasticsearch.index.shard.ShardToolCli
 call "%~dp0elasticsearch-cli.bat" ^
   %%* ^
-  || exit /b 1
+  || goto exit
 
 endlocal
 endlocal
+:exit
+exit /b %ERRORLEVEL%

sonar-application/src/main/assembly/elasticsearch/bin/elasticsearch-sql-cli.bat

@@ -22,3 +22,4 @@ set CLI_JAR=%ES_HOME%/bin/*
 
 endlocal
 endlocal
+exit /b %ERRORLEVEL%

sonar-application/src/main/assembly/elasticsearch/bin/elasticsearch-syskeygen.bat

@@ -11,7 +11,9 @@ set ES_MAIN_CLASS=org.elasticsearch.xpack.security.crypto.tool.SystemKeyTool
 set ES_ADDITIONAL_SOURCES=x-pack-env;x-pack-security-env
 call "%~dp0elasticsearch-cli.bat" ^
   %%* ^
-  || exit /b 1
+  || goto exit
 
 endlocal
 endlocal
+:exit
+exit /b %ERRORLEVEL%

sonar-application/src/main/assembly/elasticsearch/bin/elasticsearch-translog.bat

@@ -6,7 +6,9 @@ setlocal enableextensions
 set ES_MAIN_CLASS=org.elasticsearch.index.translog.TranslogToolCli
 call "%~dp0elasticsearch-cli.bat" ^
   %%* ^
-  || exit /b 1
+  || goto exit
 
 endlocal
 endlocal
+:exit
+exit /b %ERRORLEVEL%

sonar-application/src/main/assembly/elasticsearch/bin/elasticsearch-users.bat

@@ -11,7 +11,9 @@ set ES_MAIN_CLASS=org.elasticsearch.xpack.security.authc.file.tool.UsersTool
 set ES_ADDITIONAL_SOURCES=x-pack-env;x-pack-security-env
 call "%~dp0elasticsearch-cli.bat" ^
   %%* ^
-  || exit /b 1
+  || goto exit
 
 endlocal
 endlocal
+:exit
+exit /b %ERRORLEVEL%

sonar-application/src/main/assembly/elasticsearch/bin/elasticsearch.bat

@@ -41,9 +41,9 @@ IF ERRORLEVEL 1 (
 	EXIT /B %ERRORLEVEL%
 )
 
-set "ES_JVM_OPTIONS=%ES_PATH_CONF%\jvm.options"
+set ES_JVM_OPTIONS=%ES_PATH_CONF%\jvm.options
 @setlocal
-for /F "usebackq delims=" %%a in (`"%JAVA% -cp "!ES_CLASSPATH!" "org.elasticsearch.tools.launchers.JvmOptionsParser" "!ES_JVM_OPTIONS!" || echo jvm_options_parser_failed"`) do set JVM_OPTIONS=%%a
+for /F "usebackq delims=" %%a in (`CALL %JAVA% -cp "!ES_CLASSPATH!" "org.elasticsearch.tools.launchers.JvmOptionsParser" "!ES_JVM_OPTIONS!" ^|^| echo jvm_options_parser_failed`) do set JVM_OPTIONS=%%a
 @endlocal & set "MAYBE_JVM_OPTIONS_PARSER_FAILED=%JVM_OPTIONS%" & set ES_JAVA_OPTS=%JVM_OPTIONS:${ES_TMPDIR}=!ES_TMPDIR!% %ES_JAVA_OPTS%
 
 if "%MAYBE_JVM_OPTIONS_PARSER_FAILED%" == "jvm_options_parser_failed" (
@@ -55,3 +55,4 @@ cd /d "%ES_HOME%"
 
 endlocal
 endlocal
+exit /b %ERRORLEVEL%

sonar-application/src/main/assembly/elasticsearch/config/log4j2.properties

@@ -108,12 +108,14 @@ appender.audit_rolling.layout.pattern = {\
                 %varsNotEmpty{, "realm":"%enc{%map{realm}}{JSON}"}\
                 %varsNotEmpty{, "url.path":"%enc{%map{url.path}}{JSON}"}\
                 %varsNotEmpty{, "url.query":"%enc{%map{url.query}}{JSON}"}\
+                %varsNotEmpty{, "request.method":"%enc{%map{request.method}}{JSON}"}\
                 %varsNotEmpty{, "request.body":"%enc{%map{request.body}}{JSON}"}\
                 %varsNotEmpty{, "request.id":"%enc{%map{request.id}}{JSON}"}\
                 %varsNotEmpty{, "action":"%enc{%map{action}}{JSON}"}\
                 %varsNotEmpty{, "request.name":"%enc{%map{request.name}}{JSON}"}\
                 %varsNotEmpty{, "indices":%map{indices}}\
                 %varsNotEmpty{, "opaque_id":"%enc{%map{opaque_id}}{JSON}"}\
+                %varsNotEmpty{, "x_forwarded_for":"%enc{%map{x_forwarded_for}}{JSON}"}\
                 %varsNotEmpty{, "transport.profile":"%enc{%map{transport.profile}}{JSON}"}\
                 %varsNotEmpty{, "rule":"%enc{%map{rule}}{JSON}"}\
                 %varsNotEmpty{, "event.category":"%enc{%map{event.category}}{JSON}"}\
@@ -136,12 +138,14 @@ appender.audit_rolling.layout.pattern = {\
 # "realm" name of a realm that has generated an "authentication_failed" or an "authentication_successful"; the subject is not yet authenticated
 # "url.path" the URI component between the port and the query string; it is percent (URL) encoded
 # "url.query" the URI component after the path and before the fragment; it is percent (URL) encoded
+# "request.method" the method of the HTTP request, i.e. one of GET, POST, PUT, DELETE, OPTIONS, HEAD, PATCH, TRACE, CONNECT
 # "request.body" the content of the request body entity, JSON escaped
 # "request.id" a synthentic identifier for the incoming request, this is unique per incoming request, and consistent across all audit events generated by that request
 # "action" an action is the most granular operation that is authorized and this identifies it in a namespaced way (internal)
 # "request.name" if the event is in connection to a transport message this is the name of the request class, similar to how rest requests are identified by the url path (internal)
 # "indices" the array of indices that the "action" is acting upon
 # "opaque_id" opaque value conveyed by the "X-Opaque-Id" request header
+# "x_forwarded_for" the addresses from the "X-Forwarded-For" request header, as a verbatim string value (not an array)
 # "transport.profile" name of the transport profile in case this is a "connection_granted" or "connection_denied" event
 # "rule" name of the applied rulee if the "origin.type" is "ip_filter"
 # "event.category" fixed value "elasticsearch-audit"

sonar-application/src/main/assembly/elasticsearch/modules/aggs-matrix-stats/plugin-descriptor.properties

@@ -20,7 +20,7 @@
 description=Adds aggregations whose input are a list of numeric fields and output includes a matrix.
 #
 # 'version': plugin's version
-version=6.6.2
+version=6.8.0
 #
 # 'name': the plugin name
 name=aggs-matrix-stats
@@ -35,7 +35,7 @@ classname=org.elasticsearch.search.aggregations.matrix.MatrixAggregationPlugin
 java.version=1.8
 #
 # 'elasticsearch.version': version of elasticsearch compiled against
-elasticsearch.version=6.6.2
+elasticsearch.version=6.8.0
 ### optional elements for plugins:
 #
 #  'extended.plugins': other plugins this plugin extends through SPI

sonar-application/src/main/assembly/elasticsearch/modules/analysis-common/plugin-descriptor.properties

@@ -20,7 +20,7 @@
 description=Adds "built in" analyzers to Elasticsearch.
 #
 # 'version': plugin's version
-version=6.6.2
+version=6.8.0
 #
 # 'name': the plugin name
 name=analysis-common
@@ -35,7 +35,7 @@ classname=org.elasticsearch.analysis.common.CommonAnalysisPlugin
 java.version=1.8
 #
 # 'elasticsearch.version': version of elasticsearch compiled against
-elasticsearch.version=6.6.2
+elasticsearch.version=6.8.0
 ### optional elements for plugins:
 #
 #  'extended.plugins': other plugins this plugin extends through SPI

sonar-application/src/main/assembly/elasticsearch/modules/ingest-common/plugin-descriptor.properties

@@ -20,7 +20,7 @@
 description=Module for ingest processors that do not require additional security permissions or have large dependencies and resources
 #
 # 'version': plugin's version
-version=6.6.2
+version=6.8.0
 #
 # 'name': the plugin name
 name=ingest-common
@@ -35,7 +35,7 @@ classname=org.elasticsearch.ingest.common.IngestCommonPlugin
 java.version=1.8
 #
 # 'elasticsearch.version': version of elasticsearch compiled against
-elasticsearch.version=6.6.2
+elasticsearch.version=6.8.0
 ### optional elements for plugins:
 #
 #  'extended.plugins': other plugins this plugin extends through SPI

sonar-application/src/main/assembly/elasticsearch/modules/ingest-geoip/plugin-descriptor.properties

@@ -0,0 +1,45 @@
+# Elasticsearch plugin descriptor file
+# This file must exist as 'plugin-descriptor.properties' inside a plugin.
+#
+### example plugin for "foo"
+#
+# foo.zip <-- zip file for the plugin, with this structure:
+# |____   <arbitrary name1>.jar <-- classes, resources, dependencies
+# |____   <arbitrary nameN>.jar <-- any number of jars
+# |____   plugin-descriptor.properties <-- example contents below:
+#
+# classname=foo.bar.BazPlugin
+# description=My cool plugin
+# version=6.0
+# elasticsearch.version=6.0
+# java.version=1.8
+#
+### mandatory elements for all plugins:
+#
+# 'description': simple summary of the plugin
+description=Ingest processor that uses looksup geo data based on ip adresses using the Maxmind geo database
+#
+# 'version': plugin's version
+version=6.8.0
+#
+# 'name': the plugin name
+name=ingest-geoip
+#
+# 'classname': the name of the class to load, fully-qualified.
+classname=org.elasticsearch.ingest.geoip.IngestGeoIpPlugin
+#
+# 'java.version': version of java the code is built against
+# use the system property java.specification.version
+# version string must be a sequence of nonnegative decimal integers
+# separated by "."'s and may have leading zeros
+java.version=1.8
+#
+# 'elasticsearch.version': version of elasticsearch compiled against
+elasticsearch.version=6.8.0
+### optional elements for plugins:
+#
+#  'extended.plugins': other plugins this plugin extends through SPI
+extended.plugins=
+#
+# 'has.native.controller': whether or not the plugin has a native controller
+has.native.controller=false

sonar-application/src/main/assembly/elasticsearch/modules/ingest-geoip/plugin-security.policy

@@ -0,0 +1,29 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+grant {
+  // needed because jackson-databind is using Class#getDeclaredConstructors(), Class#getDeclaredMethods() and
+  // Class#getDeclaredAnnotations() to find all public, private, protected, package protected and
+  // private constructors, methods or annotations. Just locating all public constructors, methods and annotations
+  // should be enough, so this permission wouldn't then be needed. Unfortunately this is not what jackson-databind does
+  // or can be configured to do.
+  permission java.lang.RuntimePermission "accessDeclaredMembers";
+  // Also needed because of jackson-databind:
+  permission java.lang.reflect.ReflectPermission "suppressAccessChecks";
+};

sonar-application/src/main/assembly/elasticsearch/modules/ingest-user-agent/plugin-descriptor.properties

@@ -0,0 +1,45 @@
+# Elasticsearch plugin descriptor file
+# This file must exist as 'plugin-descriptor.properties' inside a plugin.
+#
+### example plugin for "foo"
+#
+# foo.zip <-- zip file for the plugin, with this structure:
+# |____   <arbitrary name1>.jar <-- classes, resources, dependencies
+# |____   <arbitrary nameN>.jar <-- any number of jars
+# |____   plugin-descriptor.properties <-- example contents below:
+#
+# classname=foo.bar.BazPlugin
+# description=My cool plugin
+# version=6.0
+# elasticsearch.version=6.0
+# java.version=1.8
+#
+### mandatory elements for all plugins:
+#
+# 'description': simple summary of the plugin
+description=Ingest processor that extracts information from a user agent
+#
+# 'version': plugin's version
+version=6.8.0
+#
+# 'name': the plugin name
+name=ingest-user-agent
+#
+# 'classname': the name of the class to load, fully-qualified.
+classname=org.elasticsearch.ingest.useragent.IngestUserAgentPlugin
+#
+# 'java.version': version of java the code is built against
+# use the system property java.specification.version
+# version string must be a sequence of nonnegative decimal integers
+# separated by "."'s and may have leading zeros
+java.version=1.8
+#
+# 'elasticsearch.version': version of elasticsearch compiled against
+elasticsearch.version=6.8.0
+### optional elements for plugins:
+#
+#  'extended.plugins': other plugins this plugin extends through SPI
+extended.plugins=
+#
+# 'has.native.controller': whether or not the plugin has a native controller
+has.native.controller=false

sonar-application/src/main/assembly/elasticsearch/modules/lang-expression/plugin-descriptor.properties

@@ -20,7 +20,7 @@
 description=Lucene expressions integration for Elasticsearch
 #
 # 'version': plugin's version
-version=6.6.2
+version=6.8.0
 #
 # 'name': the plugin name
 name=lang-expression
@@ -35,7 +35,7 @@ classname=org.elasticsearch.script.expression.ExpressionPlugin
 java.version=1.8
 #
 # 'elasticsearch.version': version of elasticsearch compiled against
-elasticsearch.version=6.6.2
+elasticsearch.version=6.8.0
 ### optional elements for plugins:
 #
 #  'extended.plugins': other plugins this plugin extends through SPI

sonar-application/src/main/assembly/elasticsearch/modules/lang-mustache/plugin-descriptor.properties

@@ -20,7 +20,7 @@
 description=Mustache scripting integration for Elasticsearch
 #
 # 'version': plugin's version
-version=6.6.2
+version=6.8.0
 #
 # 'name': the plugin name
 name=lang-mustache
@@ -35,7 +35,7 @@ classname=org.elasticsearch.script.mustache.MustachePlugin
 java.version=1.8
 #
 # 'elasticsearch.version': version of elasticsearch compiled against
-elasticsearch.version=6.6.2
+elasticsearch.version=6.8.0
 ### optional elements for plugins:
 #
 #  'extended.plugins': other plugins this plugin extends through SPI

sonar-application/src/main/assembly/elasticsearch/modules/lang-painless/plugin-descriptor.properties

@@ -20,7 +20,7 @@
 description=An easy, safe and fast scripting language for Elasticsearch
 #
 # 'version': plugin's version
-version=6.6.2
+version=6.8.0
 #
 # 'name': the plugin name
 name=lang-painless
@@ -35,7 +35,7 @@ classname=org.elasticsearch.painless.PainlessPlugin
 java.version=1.8
 #
 # 'elasticsearch.version': version of elasticsearch compiled against
-elasticsearch.version=6.6.2
+elasticsearch.version=6.8.0
 ### optional elements for plugins:
 #
 #  'extended.plugins': other plugins this plugin extends through SPI

sonar-application/src/main/assembly/elasticsearch/modules/mapper-extras/plugin-descriptor.properties

@@ -20,7 +20,7 @@
 description=Adds advanced field mappers
 #
 # 'version': plugin's version
-version=6.6.2
+version=6.8.0
 #
 # 'name': the plugin name
 name=mapper-extras
@@ -35,7 +35,7 @@ classname=org.elasticsearch.index.mapper.MapperExtrasPlugin
 java.version=1.8
 #
 # 'elasticsearch.version': version of elasticsearch compiled against
-elasticsearch.version=6.6.2
+elasticsearch.version=6.8.0
 ### optional elements for plugins:
 #
 #  'extended.plugins': other plugins this plugin extends through SPI

sonar-application/src/main/assembly/elasticsearch/modules/parent-join/plugin-descriptor.properties

@@ -20,7 +20,7 @@
 description=This module adds the support parent-child queries and aggregations
 #
 # 'version': plugin's version
-version=6.6.2
+version=6.8.0
 #
 # 'name': the plugin name
 name=parent-join
@@ -35,7 +35,7 @@ classname=org.elasticsearch.join.ParentJoinPlugin
 java.version=1.8
 #
 # 'elasticsearch.version': version of elasticsearch compiled against
-elasticsearch.version=6.6.2
+elasticsearch.version=6.8.0
 ### optional elements for plugins:
 #
 #  'extended.plugins': other plugins this plugin extends through SPI

sonar-application/src/main/assembly/elasticsearch/modules/percolator/plugin-descriptor.properties

@@ -20,7 +20,7 @@
 description=Percolator module adds capability to index queries and query these queries by specifying documents
 #
 # 'version': plugin's version
-version=6.6.2
+version=6.8.0
 #
 # 'name': the plugin name
 name=percolator
@@ -35,7 +35,7 @@ classname=org.elasticsearch.percolator.PercolatorPlugin
 java.version=1.8
 #
 # 'elasticsearch.version': version of elasticsearch compiled against
-elasticsearch.version=6.6.2
+elasticsearch.version=6.8.0
 ### optional elements for plugins:
 #
 #  'extended.plugins': other plugins this plugin extends through SPI

sonar-application/src/main/assembly/elasticsearch/modules/rank-eval/plugin-descriptor.properties

@@ -20,7 +20,7 @@
 description=The Rank Eval module adds APIs to evaluate ranking quality.
 #
 # 'version': plugin's version
-version=6.6.2
+version=6.8.0
 #
 # 'name': the plugin name
 name=rank-eval
@@ -35,7 +35,7 @@ classname=org.elasticsearch.index.rankeval.RankEvalPlugin
 java.version=1.8
 #
 # 'elasticsearch.version': version of elasticsearch compiled against
-elasticsearch.version=6.6.2
+elasticsearch.version=6.8.0
 ### optional elements for plugins:
 #
 #  'extended.plugins': other plugins this plugin extends through SPI

sonar-application/src/main/assembly/elasticsearch/modules/reindex/plugin-descriptor.properties

@@ -20,7 +20,7 @@
 description=The Reindex module adds APIs to reindex from one index to another or update documents in place.
 #
 # 'version': plugin's version
-version=6.6.2
+version=6.8.0
 #
 # 'name': the plugin name
 name=reindex
@@ -35,7 +35,7 @@ classname=org.elasticsearch.index.reindex.ReindexPlugin
 java.version=1.8
 #
 # 'elasticsearch.version': version of elasticsearch compiled against
-elasticsearch.version=6.6.2
+elasticsearch.version=6.8.0
 ### optional elements for plugins:
 #
 #  'extended.plugins': other plugins this plugin extends through SPI

sonar-application/src/main/assembly/elasticsearch/modules/repository-url/plugin-descriptor.properties

@@ -20,7 +20,7 @@
 description=Module for URL repository
 #
 # 'version': plugin's version
-version=6.6.2
+version=6.8.0
 #
 # 'name': the plugin name
 name=repository-url
@@ -35,7 +35,7 @@ classname=org.elasticsearch.plugin.repository.url.URLRepositoryPlugin
 java.version=1.8
 #
 # 'elasticsearch.version': version of elasticsearch compiled against
-elasticsearch.version=6.6.2
+elasticsearch.version=6.8.0
 ### optional elements for plugins:
 #
 #  'extended.plugins': other plugins this plugin extends through SPI