From: Sébastien Lesaint Date: Thu, 7 Nov 2019 08:35:32 +0000 (+0100) Subject: SONAR-12685 upgrade Elasticsearch to 6.8.4 X-Git-Tag: 8.1.0.31237~84 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=506d2c33f5778030991cafc06ccab582a14a4ed5;p=sonarqube.git SONAR-12685 upgrade Elasticsearch to 6.8.4 --- diff --git a/sonar-application/src/main/assembly/elasticsearch/README.textile b/sonar-application/src/main/assembly/elasticsearch/README.textile index 472e44ef01b..465f4adac18 100644 --- a/sonar-application/src/main/assembly/elasticsearch/README.textile +++ b/sonar-application/src/main/assembly/elasticsearch/README.textile @@ -155,9 +155,9 @@ Complete control on the index level is allowed. As an example, in the above case 
 curl -XPUT http://localhost:9200/another_user?pretty -H 'Content-Type: application/json' -d '
 {
-    "index" : {
-        "number_of_shards" : 1,
-        "number_of_replicas" : 1
+    "settings" : {
+        "index.number_of_shards" : 1,
+        "index.number_of_replicas" : 1
     }
 }'
diff --git a/sonar-application/src/main/assembly/elasticsearch/bin/elasticsearch-cli b/sonar-application/src/main/assembly/elasticsearch/bin/elasticsearch-cli index 5699b3feb58..6605a5c57c3 100755 --- a/sonar-application/src/main/assembly/elasticsearch/bin/elasticsearch-cli +++ b/sonar-application/src/main/assembly/elasticsearch/bin/elasticsearch-cli @@ -16,6 +16,10 @@ do ES_CLASSPATH="$ES_CLASSPATH:$ES_HOME/$additional_classpath_directory/*" done +# use a small heap size for the CLI tools, and thus the serial collector to +# avoid stealing many CPU cycles; a user can override by setting ES_JAVA_OPTS +ES_JAVA_OPTS="-Xms4m -Xmx64m -XX:+UseSerialGC ${ES_JAVA_OPTS}" + exec \ "$JAVA" \ $ES_JAVA_OPTS \ diff --git a/sonar-application/src/main/assembly/elasticsearch/bin/elasticsearch-cli.bat b/sonar-application/src/main/assembly/elasticsearch/bin/elasticsearch-cli.bat index e8d9f669ecf..eb34a8d21f4 100644 --- a/sonar-application/src/main/assembly/elasticsearch/bin/elasticsearch-cli.bat +++ b/sonar-application/src/main/assembly/elasticsearch/bin/elasticsearch-cli.bat @@ -12,6 +12,10 @@ if defined ES_ADDITIONAL_CLASSPATH_DIRECTORIES ( ) ) +rem use a small heap size for the CLI tools, and thus the serial collector to +rem avoid stealing many CPU cycles; a user can override by setting ES_JAVA_OPTS +set ES_JAVA_OPTS=-Xms4m -Xmx64m -XX:+UseSerialGC %ES_JAVA_OPTS% + %JAVA% ^ %ES_JAVA_OPTS% ^ -Des.path.home="%ES_HOME%" ^ diff --git a/sonar-application/src/main/assembly/elasticsearch/bin/elasticsearch-service.bat b/sonar-application/src/main/assembly/elasticsearch/bin/elasticsearch-service.bat index df2d3942062..3cd1c2bae1e 100644 --- a/sonar-application/src/main/assembly/elasticsearch/bin/elasticsearch-service.bat +++ b/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.8.0 +set ES_VERSION=6.8.4 if "%SERVICE_LOG_DIR%" == "" set SERVICE_LOG_DIR=%ES_HOME%\logs diff --git a/sonar-application/src/main/assembly/elasticsearch/bin/elasticsearch-sql-cli-6.8.0.jar b/sonar-application/src/main/assembly/elasticsearch/bin/elasticsearch-sql-cli-6.8.0.jar deleted file mode 100755 index 93d97c79d0e..00000000000 Binary files a/sonar-application/src/main/assembly/elasticsearch/bin/elasticsearch-sql-cli-6.8.0.jar and /dev/null differ diff --git a/sonar-application/src/main/assembly/elasticsearch/bin/elasticsearch-sql-cli-6.8.4.jar b/sonar-application/src/main/assembly/elasticsearch/bin/elasticsearch-sql-cli-6.8.4.jar new file mode 100755 index 00000000000..6a3d2b253e3 Binary files /dev/null and b/sonar-application/src/main/assembly/elasticsearch/bin/elasticsearch-sql-cli-6.8.4.jar differ diff --git a/sonar-application/src/main/assembly/elasticsearch/lib/elasticsearch-6.8.0.jar b/sonar-application/src/main/assembly/elasticsearch/lib/elasticsearch-6.8.0.jar deleted file mode 100644 index 98ac207e9d6..00000000000 Binary files a/sonar-application/src/main/assembly/elasticsearch/lib/elasticsearch-6.8.0.jar and /dev/null differ diff --git a/sonar-application/src/main/assembly/elasticsearch/lib/elasticsearch-6.8.4.jar b/sonar-application/src/main/assembly/elasticsearch/lib/elasticsearch-6.8.4.jar new file mode 100644 index 00000000000..7a63e75c134 Binary files /dev/null and b/sonar-application/src/main/assembly/elasticsearch/lib/elasticsearch-6.8.4.jar differ diff --git a/sonar-application/src/main/assembly/elasticsearch/lib/elasticsearch-cli-6.8.0.jar b/sonar-application/src/main/assembly/elasticsearch/lib/elasticsearch-cli-6.8.0.jar deleted file mode 100644 index adfda137f5e..00000000000 Binary files a/sonar-application/src/main/assembly/elasticsearch/lib/elasticsearch-cli-6.8.0.jar and /dev/null differ diff --git a/sonar-application/src/main/assembly/elasticsearch/lib/elasticsearch-cli-6.8.4.jar b/sonar-application/src/main/assembly/elasticsearch/lib/elasticsearch-cli-6.8.4.jar new file mode 100644 index 00000000000..b229b21cca2 Binary files /dev/null and b/sonar-application/src/main/assembly/elasticsearch/lib/elasticsearch-cli-6.8.4.jar differ diff --git a/sonar-application/src/main/assembly/elasticsearch/lib/elasticsearch-core-6.8.0.jar b/sonar-application/src/main/assembly/elasticsearch/lib/elasticsearch-core-6.8.0.jar deleted file mode 100644 index a97ae5249e1..00000000000 Binary files a/sonar-application/src/main/assembly/elasticsearch/lib/elasticsearch-core-6.8.0.jar and /dev/null differ diff --git a/sonar-application/src/main/assembly/elasticsearch/lib/elasticsearch-core-6.8.4.jar b/sonar-application/src/main/assembly/elasticsearch/lib/elasticsearch-core-6.8.4.jar new file mode 100644 index 00000000000..75bbd6d20cf Binary files /dev/null and b/sonar-application/src/main/assembly/elasticsearch/lib/elasticsearch-core-6.8.4.jar differ diff --git a/sonar-application/src/main/assembly/elasticsearch/lib/elasticsearch-launchers-6.8.0.jar b/sonar-application/src/main/assembly/elasticsearch/lib/elasticsearch-launchers-6.8.0.jar deleted file mode 100644 index 8109c9409ad..00000000000 Binary files a/sonar-application/src/main/assembly/elasticsearch/lib/elasticsearch-launchers-6.8.0.jar and /dev/null differ diff --git a/sonar-application/src/main/assembly/elasticsearch/lib/elasticsearch-launchers-6.8.4.jar b/sonar-application/src/main/assembly/elasticsearch/lib/elasticsearch-launchers-6.8.4.jar new file mode 100644 index 00000000000..97dda83744f Binary files /dev/null and b/sonar-application/src/main/assembly/elasticsearch/lib/elasticsearch-launchers-6.8.4.jar differ diff --git a/sonar-application/src/main/assembly/elasticsearch/lib/elasticsearch-secure-sm-6.8.0.jar b/sonar-application/src/main/assembly/elasticsearch/lib/elasticsearch-secure-sm-6.8.0.jar deleted file mode 100644 index 8fde540ffd4..00000000000 Binary files a/sonar-application/src/main/assembly/elasticsearch/lib/elasticsearch-secure-sm-6.8.0.jar and /dev/null differ diff --git a/sonar-application/src/main/assembly/elasticsearch/lib/elasticsearch-secure-sm-6.8.4.jar b/sonar-application/src/main/assembly/elasticsearch/lib/elasticsearch-secure-sm-6.8.4.jar new file mode 100644 index 00000000000..65da38600ad Binary files /dev/null and b/sonar-application/src/main/assembly/elasticsearch/lib/elasticsearch-secure-sm-6.8.4.jar differ diff --git a/sonar-application/src/main/assembly/elasticsearch/lib/elasticsearch-x-content-6.8.0.jar b/sonar-application/src/main/assembly/elasticsearch/lib/elasticsearch-x-content-6.8.0.jar deleted file mode 100644 index c5085186260..00000000000 Binary files a/sonar-application/src/main/assembly/elasticsearch/lib/elasticsearch-x-content-6.8.0.jar and /dev/null differ diff --git a/sonar-application/src/main/assembly/elasticsearch/lib/elasticsearch-x-content-6.8.4.jar b/sonar-application/src/main/assembly/elasticsearch/lib/elasticsearch-x-content-6.8.4.jar new file mode 100644 index 00000000000..8980d4ac74f Binary files /dev/null and b/sonar-application/src/main/assembly/elasticsearch/lib/elasticsearch-x-content-6.8.4.jar differ diff --git a/sonar-application/src/main/assembly/elasticsearch/lib/java-version-checker-6.8.0.jar b/sonar-application/src/main/assembly/elasticsearch/lib/java-version-checker-6.8.0.jar deleted file mode 100644 index cf405c38b2b..00000000000 Binary files a/sonar-application/src/main/assembly/elasticsearch/lib/java-version-checker-6.8.0.jar and /dev/null differ diff --git a/sonar-application/src/main/assembly/elasticsearch/lib/java-version-checker-6.8.4.jar b/sonar-application/src/main/assembly/elasticsearch/lib/java-version-checker-6.8.4.jar new file mode 100644 index 00000000000..6f68dbab42b Binary files /dev/null and b/sonar-application/src/main/assembly/elasticsearch/lib/java-version-checker-6.8.4.jar differ diff --git a/sonar-application/src/main/assembly/elasticsearch/lib/lucene-analyzers-common-7.7.0.jar b/sonar-application/src/main/assembly/elasticsearch/lib/lucene-analyzers-common-7.7.0.jar deleted file mode 100644 index 933e6054946..00000000000 Binary files a/sonar-application/src/main/assembly/elasticsearch/lib/lucene-analyzers-common-7.7.0.jar and /dev/null differ diff --git a/sonar-application/src/main/assembly/elasticsearch/lib/lucene-analyzers-common-7.7.2.jar b/sonar-application/src/main/assembly/elasticsearch/lib/lucene-analyzers-common-7.7.2.jar new file mode 100644 index 00000000000..dc1952bebfd Binary files /dev/null and b/sonar-application/src/main/assembly/elasticsearch/lib/lucene-analyzers-common-7.7.2.jar differ diff --git a/sonar-application/src/main/assembly/elasticsearch/lib/lucene-backward-codecs-7.7.0.jar b/sonar-application/src/main/assembly/elasticsearch/lib/lucene-backward-codecs-7.7.0.jar deleted file mode 100644 index 73fded816b4..00000000000 Binary files a/sonar-application/src/main/assembly/elasticsearch/lib/lucene-backward-codecs-7.7.0.jar and /dev/null differ diff --git a/sonar-application/src/main/assembly/elasticsearch/lib/lucene-backward-codecs-7.7.2.jar b/sonar-application/src/main/assembly/elasticsearch/lib/lucene-backward-codecs-7.7.2.jar new file mode 100644 index 00000000000..03e5deb7b54 Binary files /dev/null and b/sonar-application/src/main/assembly/elasticsearch/lib/lucene-backward-codecs-7.7.2.jar differ diff --git a/sonar-application/src/main/assembly/elasticsearch/lib/lucene-core-7.7.0.jar b/sonar-application/src/main/assembly/elasticsearch/lib/lucene-core-7.7.0.jar deleted file mode 100644 index 81bddda2e6d..00000000000 Binary files a/sonar-application/src/main/assembly/elasticsearch/lib/lucene-core-7.7.0.jar and /dev/null differ diff --git a/sonar-application/src/main/assembly/elasticsearch/lib/lucene-core-7.7.2.jar b/sonar-application/src/main/assembly/elasticsearch/lib/lucene-core-7.7.2.jar new file mode 100644 index 00000000000..211444c3ad0 Binary files /dev/null and b/sonar-application/src/main/assembly/elasticsearch/lib/lucene-core-7.7.2.jar differ diff --git a/sonar-application/src/main/assembly/elasticsearch/lib/lucene-grouping-7.7.0.jar b/sonar-application/src/main/assembly/elasticsearch/lib/lucene-grouping-7.7.0.jar deleted file mode 100644 index 33d974f544c..00000000000 Binary files a/sonar-application/src/main/assembly/elasticsearch/lib/lucene-grouping-7.7.0.jar and /dev/null differ diff --git a/sonar-application/src/main/assembly/elasticsearch/lib/lucene-grouping-7.7.2.jar b/sonar-application/src/main/assembly/elasticsearch/lib/lucene-grouping-7.7.2.jar new file mode 100644 index 00000000000..c95f3846e5b Binary files /dev/null and b/sonar-application/src/main/assembly/elasticsearch/lib/lucene-grouping-7.7.2.jar differ diff --git a/sonar-application/src/main/assembly/elasticsearch/lib/lucene-highlighter-7.7.0.jar b/sonar-application/src/main/assembly/elasticsearch/lib/lucene-highlighter-7.7.0.jar deleted file mode 100644 index 967bf3c9a86..00000000000 Binary files a/sonar-application/src/main/assembly/elasticsearch/lib/lucene-highlighter-7.7.0.jar and /dev/null differ diff --git a/sonar-application/src/main/assembly/elasticsearch/lib/lucene-highlighter-7.7.2.jar b/sonar-application/src/main/assembly/elasticsearch/lib/lucene-highlighter-7.7.2.jar new file mode 100644 index 00000000000..74170155682 Binary files /dev/null and b/sonar-application/src/main/assembly/elasticsearch/lib/lucene-highlighter-7.7.2.jar differ diff --git a/sonar-application/src/main/assembly/elasticsearch/lib/lucene-join-7.7.0.jar b/sonar-application/src/main/assembly/elasticsearch/lib/lucene-join-7.7.0.jar deleted file mode 100644 index c927e6c7d41..00000000000 Binary files a/sonar-application/src/main/assembly/elasticsearch/lib/lucene-join-7.7.0.jar and /dev/null differ diff --git a/sonar-application/src/main/assembly/elasticsearch/lib/lucene-join-7.7.2.jar b/sonar-application/src/main/assembly/elasticsearch/lib/lucene-join-7.7.2.jar new file mode 100644 index 00000000000..e56fead633f Binary files /dev/null and b/sonar-application/src/main/assembly/elasticsearch/lib/lucene-join-7.7.2.jar differ diff --git a/sonar-application/src/main/assembly/elasticsearch/lib/lucene-memory-7.7.0.jar b/sonar-application/src/main/assembly/elasticsearch/lib/lucene-memory-7.7.0.jar deleted file mode 100644 index 345e6153046..00000000000 Binary files a/sonar-application/src/main/assembly/elasticsearch/lib/lucene-memory-7.7.0.jar and /dev/null differ diff --git a/sonar-application/src/main/assembly/elasticsearch/lib/lucene-memory-7.7.2.jar b/sonar-application/src/main/assembly/elasticsearch/lib/lucene-memory-7.7.2.jar new file mode 100644 index 00000000000..5f218a6afca Binary files /dev/null and b/sonar-application/src/main/assembly/elasticsearch/lib/lucene-memory-7.7.2.jar differ diff --git a/sonar-application/src/main/assembly/elasticsearch/lib/lucene-misc-7.7.0.jar b/sonar-application/src/main/assembly/elasticsearch/lib/lucene-misc-7.7.0.jar deleted file mode 100644 index 93f75380cae..00000000000 Binary files a/sonar-application/src/main/assembly/elasticsearch/lib/lucene-misc-7.7.0.jar and /dev/null differ diff --git a/sonar-application/src/main/assembly/elasticsearch/lib/lucene-misc-7.7.2.jar b/sonar-application/src/main/assembly/elasticsearch/lib/lucene-misc-7.7.2.jar new file mode 100644 index 00000000000..dffdb5e9991 Binary files /dev/null and b/sonar-application/src/main/assembly/elasticsearch/lib/lucene-misc-7.7.2.jar differ diff --git a/sonar-application/src/main/assembly/elasticsearch/lib/lucene-queries-7.7.0.jar b/sonar-application/src/main/assembly/elasticsearch/lib/lucene-queries-7.7.0.jar deleted file mode 100644 index e8f8267ffde..00000000000 Binary files a/sonar-application/src/main/assembly/elasticsearch/lib/lucene-queries-7.7.0.jar and /dev/null differ diff --git a/sonar-application/src/main/assembly/elasticsearch/lib/lucene-queries-7.7.2.jar b/sonar-application/src/main/assembly/elasticsearch/lib/lucene-queries-7.7.2.jar new file mode 100644 index 00000000000..9659a996e80 Binary files /dev/null and b/sonar-application/src/main/assembly/elasticsearch/lib/lucene-queries-7.7.2.jar differ diff --git a/sonar-application/src/main/assembly/elasticsearch/lib/lucene-queryparser-7.7.0.jar b/sonar-application/src/main/assembly/elasticsearch/lib/lucene-queryparser-7.7.0.jar deleted file mode 100644 index 6c2c8c3fee3..00000000000 Binary files a/sonar-application/src/main/assembly/elasticsearch/lib/lucene-queryparser-7.7.0.jar and /dev/null differ diff --git a/sonar-application/src/main/assembly/elasticsearch/lib/lucene-queryparser-7.7.2.jar b/sonar-application/src/main/assembly/elasticsearch/lib/lucene-queryparser-7.7.2.jar new file mode 100644 index 00000000000..f8decc071c7 Binary files /dev/null and b/sonar-application/src/main/assembly/elasticsearch/lib/lucene-queryparser-7.7.2.jar differ diff --git a/sonar-application/src/main/assembly/elasticsearch/lib/lucene-sandbox-7.7.0.jar b/sonar-application/src/main/assembly/elasticsearch/lib/lucene-sandbox-7.7.0.jar deleted file mode 100644 index f235f548aca..00000000000 Binary files a/sonar-application/src/main/assembly/elasticsearch/lib/lucene-sandbox-7.7.0.jar and /dev/null differ diff --git a/sonar-application/src/main/assembly/elasticsearch/lib/lucene-sandbox-7.7.2.jar b/sonar-application/src/main/assembly/elasticsearch/lib/lucene-sandbox-7.7.2.jar new file mode 100644 index 00000000000..cb687c3a015 Binary files /dev/null and b/sonar-application/src/main/assembly/elasticsearch/lib/lucene-sandbox-7.7.2.jar differ diff --git a/sonar-application/src/main/assembly/elasticsearch/lib/lucene-spatial-7.7.0.jar b/sonar-application/src/main/assembly/elasticsearch/lib/lucene-spatial-7.7.0.jar deleted file mode 100644 index 4e68a15e15e..00000000000 Binary files a/sonar-application/src/main/assembly/elasticsearch/lib/lucene-spatial-7.7.0.jar and /dev/null differ diff --git a/sonar-application/src/main/assembly/elasticsearch/lib/lucene-spatial-7.7.2.jar b/sonar-application/src/main/assembly/elasticsearch/lib/lucene-spatial-7.7.2.jar new file mode 100644 index 00000000000..ec277e71b7a Binary files /dev/null and b/sonar-application/src/main/assembly/elasticsearch/lib/lucene-spatial-7.7.2.jar differ diff --git a/sonar-application/src/main/assembly/elasticsearch/lib/lucene-spatial-extras-7.7.0.jar b/sonar-application/src/main/assembly/elasticsearch/lib/lucene-spatial-extras-7.7.0.jar deleted file mode 100644 index d8953aee83a..00000000000 Binary files a/sonar-application/src/main/assembly/elasticsearch/lib/lucene-spatial-extras-7.7.0.jar and /dev/null differ diff --git a/sonar-application/src/main/assembly/elasticsearch/lib/lucene-spatial-extras-7.7.2.jar b/sonar-application/src/main/assembly/elasticsearch/lib/lucene-spatial-extras-7.7.2.jar new file mode 100644 index 00000000000..fdb921da27b Binary files /dev/null and b/sonar-application/src/main/assembly/elasticsearch/lib/lucene-spatial-extras-7.7.2.jar differ diff --git a/sonar-application/src/main/assembly/elasticsearch/lib/lucene-spatial3d-7.7.0.jar b/sonar-application/src/main/assembly/elasticsearch/lib/lucene-spatial3d-7.7.0.jar deleted file mode 100644 index f59504c67a8..00000000000 Binary files a/sonar-application/src/main/assembly/elasticsearch/lib/lucene-spatial3d-7.7.0.jar and /dev/null differ diff --git a/sonar-application/src/main/assembly/elasticsearch/lib/lucene-spatial3d-7.7.2.jar b/sonar-application/src/main/assembly/elasticsearch/lib/lucene-spatial3d-7.7.2.jar new file mode 100644 index 00000000000..669632b75a3 Binary files /dev/null and b/sonar-application/src/main/assembly/elasticsearch/lib/lucene-spatial3d-7.7.2.jar differ diff --git a/sonar-application/src/main/assembly/elasticsearch/lib/lucene-suggest-7.7.0.jar b/sonar-application/src/main/assembly/elasticsearch/lib/lucene-suggest-7.7.0.jar deleted file mode 100644 index 479f2dc76e2..00000000000 Binary files a/sonar-application/src/main/assembly/elasticsearch/lib/lucene-suggest-7.7.0.jar and /dev/null differ diff --git a/sonar-application/src/main/assembly/elasticsearch/lib/lucene-suggest-7.7.2.jar b/sonar-application/src/main/assembly/elasticsearch/lib/lucene-suggest-7.7.2.jar new file mode 100644 index 00000000000..5e2754a955a Binary files /dev/null and b/sonar-application/src/main/assembly/elasticsearch/lib/lucene-suggest-7.7.2.jar differ diff --git a/sonar-application/src/main/assembly/elasticsearch/lib/plugin-classloader-6.8.0.jar b/sonar-application/src/main/assembly/elasticsearch/lib/plugin-classloader-6.8.0.jar deleted file mode 100644 index a999f07b10f..00000000000 Binary files a/sonar-application/src/main/assembly/elasticsearch/lib/plugin-classloader-6.8.0.jar and /dev/null differ diff --git a/sonar-application/src/main/assembly/elasticsearch/lib/plugin-classloader-6.8.4.jar b/sonar-application/src/main/assembly/elasticsearch/lib/plugin-classloader-6.8.4.jar new file mode 100644 index 00000000000..45de4dcfeca Binary files /dev/null and b/sonar-application/src/main/assembly/elasticsearch/lib/plugin-classloader-6.8.4.jar differ diff --git a/sonar-application/src/main/assembly/elasticsearch/lib/tools/plugin-cli/elasticsearch-plugin-cli-6.8.0.jar b/sonar-application/src/main/assembly/elasticsearch/lib/tools/plugin-cli/elasticsearch-plugin-cli-6.8.0.jar deleted file mode 100644 index 801d77d4bb7..00000000000 Binary files a/sonar-application/src/main/assembly/elasticsearch/lib/tools/plugin-cli/elasticsearch-plugin-cli-6.8.0.jar and /dev/null differ diff --git a/sonar-application/src/main/assembly/elasticsearch/lib/tools/plugin-cli/elasticsearch-plugin-cli-6.8.4.jar b/sonar-application/src/main/assembly/elasticsearch/lib/tools/plugin-cli/elasticsearch-plugin-cli-6.8.4.jar new file mode 100644 index 00000000000..35d73f70697 Binary files /dev/null and b/sonar-application/src/main/assembly/elasticsearch/lib/tools/plugin-cli/elasticsearch-plugin-cli-6.8.4.jar differ diff --git a/sonar-application/src/main/assembly/elasticsearch/lib/tools/security-cli/elasticsearch-security-cli-6.8.0.jar b/sonar-application/src/main/assembly/elasticsearch/lib/tools/security-cli/elasticsearch-security-cli-6.8.0.jar deleted file mode 100644 index d9ad9654491..00000000000 Binary files a/sonar-application/src/main/assembly/elasticsearch/lib/tools/security-cli/elasticsearch-security-cli-6.8.0.jar and /dev/null differ diff --git a/sonar-application/src/main/assembly/elasticsearch/lib/tools/security-cli/elasticsearch-security-cli-6.8.4.jar b/sonar-application/src/main/assembly/elasticsearch/lib/tools/security-cli/elasticsearch-security-cli-6.8.4.jar new file mode 100644 index 00000000000..e62f5dcadba Binary files /dev/null and b/sonar-application/src/main/assembly/elasticsearch/lib/tools/security-cli/elasticsearch-security-cli-6.8.4.jar differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/aggs-matrix-stats/aggs-matrix-stats-client-6.8.0.jar b/sonar-application/src/main/assembly/elasticsearch/modules/aggs-matrix-stats/aggs-matrix-stats-client-6.8.0.jar deleted file mode 100644 index e41f03f625e..00000000000 Binary files a/sonar-application/src/main/assembly/elasticsearch/modules/aggs-matrix-stats/aggs-matrix-stats-client-6.8.0.jar and /dev/null differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/aggs-matrix-stats/aggs-matrix-stats-client-6.8.4.jar b/sonar-application/src/main/assembly/elasticsearch/modules/aggs-matrix-stats/aggs-matrix-stats-client-6.8.4.jar new file mode 100644 index 00000000000..b002be7b463 Binary files /dev/null and b/sonar-application/src/main/assembly/elasticsearch/modules/aggs-matrix-stats/aggs-matrix-stats-client-6.8.4.jar differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/aggs-matrix-stats/plugin-descriptor.properties b/sonar-application/src/main/assembly/elasticsearch/modules/aggs-matrix-stats/plugin-descriptor.properties index e5a93ec5ba1..b7f5e342976 100644 --- a/sonar-application/src/main/assembly/elasticsearch/modules/aggs-matrix-stats/plugin-descriptor.properties +++ b/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.8.0 +version=6.8.4 # # '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.8.0 +elasticsearch.version=6.8.4 ### optional elements for plugins: # # 'extended.plugins': other plugins this plugin extends through SPI diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/analysis-common/analysis-common-6.8.0.jar b/sonar-application/src/main/assembly/elasticsearch/modules/analysis-common/analysis-common-6.8.0.jar deleted file mode 100644 index 8cd03ac0c9b..00000000000 Binary files a/sonar-application/src/main/assembly/elasticsearch/modules/analysis-common/analysis-common-6.8.0.jar and /dev/null differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/analysis-common/analysis-common-6.8.4.jar b/sonar-application/src/main/assembly/elasticsearch/modules/analysis-common/analysis-common-6.8.4.jar new file mode 100644 index 00000000000..9d27030e58c Binary files /dev/null and b/sonar-application/src/main/assembly/elasticsearch/modules/analysis-common/analysis-common-6.8.4.jar differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/analysis-common/plugin-descriptor.properties b/sonar-application/src/main/assembly/elasticsearch/modules/analysis-common/plugin-descriptor.properties index 2f51a56527d..69d44fdc77a 100644 --- a/sonar-application/src/main/assembly/elasticsearch/modules/analysis-common/plugin-descriptor.properties +++ b/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.8.0 +version=6.8.4 # # '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.8.0 +elasticsearch.version=6.8.4 ### optional elements for plugins: # # 'extended.plugins': other plugins this plugin extends through SPI diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/ingest-common/elasticsearch-dissect-6.8.0.jar b/sonar-application/src/main/assembly/elasticsearch/modules/ingest-common/elasticsearch-dissect-6.8.0.jar deleted file mode 100644 index 59bed41a58b..00000000000 Binary files a/sonar-application/src/main/assembly/elasticsearch/modules/ingest-common/elasticsearch-dissect-6.8.0.jar and /dev/null differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/ingest-common/elasticsearch-dissect-6.8.4.jar b/sonar-application/src/main/assembly/elasticsearch/modules/ingest-common/elasticsearch-dissect-6.8.4.jar new file mode 100644 index 00000000000..bed1e303d47 Binary files /dev/null and b/sonar-application/src/main/assembly/elasticsearch/modules/ingest-common/elasticsearch-dissect-6.8.4.jar differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/ingest-common/elasticsearch-grok-6.8.0.jar b/sonar-application/src/main/assembly/elasticsearch/modules/ingest-common/elasticsearch-grok-6.8.0.jar deleted file mode 100644 index 8ce07f8dbb0..00000000000 Binary files a/sonar-application/src/main/assembly/elasticsearch/modules/ingest-common/elasticsearch-grok-6.8.0.jar and /dev/null differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/ingest-common/elasticsearch-grok-6.8.4.jar b/sonar-application/src/main/assembly/elasticsearch/modules/ingest-common/elasticsearch-grok-6.8.4.jar new file mode 100644 index 00000000000..043f4ec991e Binary files /dev/null and b/sonar-application/src/main/assembly/elasticsearch/modules/ingest-common/elasticsearch-grok-6.8.4.jar differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/ingest-common/ingest-common-6.8.0.jar b/sonar-application/src/main/assembly/elasticsearch/modules/ingest-common/ingest-common-6.8.0.jar deleted file mode 100644 index d18c033ea11..00000000000 Binary files a/sonar-application/src/main/assembly/elasticsearch/modules/ingest-common/ingest-common-6.8.0.jar and /dev/null differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/ingest-common/ingest-common-6.8.4.jar b/sonar-application/src/main/assembly/elasticsearch/modules/ingest-common/ingest-common-6.8.4.jar new file mode 100644 index 00000000000..04ca2d2537e Binary files /dev/null and b/sonar-application/src/main/assembly/elasticsearch/modules/ingest-common/ingest-common-6.8.4.jar differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/ingest-common/plugin-descriptor.properties b/sonar-application/src/main/assembly/elasticsearch/modules/ingest-common/plugin-descriptor.properties index 4d9fea8ee5b..4c0fee630d6 100644 --- a/sonar-application/src/main/assembly/elasticsearch/modules/ingest-common/plugin-descriptor.properties +++ b/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.8.0 +version=6.8.4 # # '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.8.0 +elasticsearch.version=6.8.4 ### optional elements for plugins: # # 'extended.plugins': other plugins this plugin extends through SPI diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/ingest-geoip/ingest-geoip-6.8.0.jar b/sonar-application/src/main/assembly/elasticsearch/modules/ingest-geoip/ingest-geoip-6.8.0.jar deleted file mode 100644 index 49019943556..00000000000 Binary files a/sonar-application/src/main/assembly/elasticsearch/modules/ingest-geoip/ingest-geoip-6.8.0.jar and /dev/null differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/ingest-geoip/ingest-geoip-6.8.4.jar b/sonar-application/src/main/assembly/elasticsearch/modules/ingest-geoip/ingest-geoip-6.8.4.jar new file mode 100644 index 00000000000..7ea6fbd906b Binary files /dev/null and b/sonar-application/src/main/assembly/elasticsearch/modules/ingest-geoip/ingest-geoip-6.8.4.jar differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/ingest-geoip/plugin-descriptor.properties b/sonar-application/src/main/assembly/elasticsearch/modules/ingest-geoip/plugin-descriptor.properties index f906d76a5c8..63ac101119f 100644 --- a/sonar-application/src/main/assembly/elasticsearch/modules/ingest-geoip/plugin-descriptor.properties +++ b/sonar-application/src/main/assembly/elasticsearch/modules/ingest-geoip/plugin-descriptor.properties @@ -20,7 +20,7 @@ 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 +version=6.8.4 # # 'name': the plugin name name=ingest-geoip @@ -35,7 +35,7 @@ classname=org.elasticsearch.ingest.geoip.IngestGeoIpPlugin java.version=1.8 # # 'elasticsearch.version': version of elasticsearch compiled against -elasticsearch.version=6.8.0 +elasticsearch.version=6.8.4 ### optional elements for plugins: # # 'extended.plugins': other plugins this plugin extends through SPI diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/ingest-user-agent/ingest-user-agent-6.8.0.jar b/sonar-application/src/main/assembly/elasticsearch/modules/ingest-user-agent/ingest-user-agent-6.8.0.jar deleted file mode 100644 index e4b1f6f0a90..00000000000 Binary files a/sonar-application/src/main/assembly/elasticsearch/modules/ingest-user-agent/ingest-user-agent-6.8.0.jar and /dev/null differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/ingest-user-agent/ingest-user-agent-6.8.4.jar b/sonar-application/src/main/assembly/elasticsearch/modules/ingest-user-agent/ingest-user-agent-6.8.4.jar new file mode 100644 index 00000000000..3b931f5038e Binary files /dev/null and b/sonar-application/src/main/assembly/elasticsearch/modules/ingest-user-agent/ingest-user-agent-6.8.4.jar differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/ingest-user-agent/plugin-descriptor.properties b/sonar-application/src/main/assembly/elasticsearch/modules/ingest-user-agent/plugin-descriptor.properties index aeb8c61cc08..e3e3b4008bf 100644 --- a/sonar-application/src/main/assembly/elasticsearch/modules/ingest-user-agent/plugin-descriptor.properties +++ b/sonar-application/src/main/assembly/elasticsearch/modules/ingest-user-agent/plugin-descriptor.properties @@ -20,7 +20,7 @@ description=Ingest processor that extracts information from a user agent # # 'version': plugin's version -version=6.8.0 +version=6.8.4 # # 'name': the plugin name name=ingest-user-agent @@ -35,7 +35,7 @@ classname=org.elasticsearch.ingest.useragent.IngestUserAgentPlugin java.version=1.8 # # 'elasticsearch.version': version of elasticsearch compiled against -elasticsearch.version=6.8.0 +elasticsearch.version=6.8.4 ### optional elements for plugins: # # 'extended.plugins': other plugins this plugin extends through SPI diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/lang-expression/lang-expression-6.8.0.jar b/sonar-application/src/main/assembly/elasticsearch/modules/lang-expression/lang-expression-6.8.0.jar deleted file mode 100644 index 3900a0a91de..00000000000 Binary files a/sonar-application/src/main/assembly/elasticsearch/modules/lang-expression/lang-expression-6.8.0.jar and /dev/null differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/lang-expression/lang-expression-6.8.4.jar b/sonar-application/src/main/assembly/elasticsearch/modules/lang-expression/lang-expression-6.8.4.jar new file mode 100644 index 00000000000..09306d4b318 Binary files /dev/null and b/sonar-application/src/main/assembly/elasticsearch/modules/lang-expression/lang-expression-6.8.4.jar differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/lang-expression/lucene-expressions-7.7.0.jar b/sonar-application/src/main/assembly/elasticsearch/modules/lang-expression/lucene-expressions-7.7.0.jar deleted file mode 100644 index efafbd09fb0..00000000000 Binary files a/sonar-application/src/main/assembly/elasticsearch/modules/lang-expression/lucene-expressions-7.7.0.jar and /dev/null differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/lang-expression/lucene-expressions-7.7.2.jar b/sonar-application/src/main/assembly/elasticsearch/modules/lang-expression/lucene-expressions-7.7.2.jar new file mode 100644 index 00000000000..61859b3a641 Binary files /dev/null and b/sonar-application/src/main/assembly/elasticsearch/modules/lang-expression/lucene-expressions-7.7.2.jar differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/lang-expression/plugin-descriptor.properties b/sonar-application/src/main/assembly/elasticsearch/modules/lang-expression/plugin-descriptor.properties index e74c5c212a8..ecdcddc4cab 100644 --- a/sonar-application/src/main/assembly/elasticsearch/modules/lang-expression/plugin-descriptor.properties +++ b/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.8.0 +version=6.8.4 # # '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.8.0 +elasticsearch.version=6.8.4 ### optional elements for plugins: # # 'extended.plugins': other plugins this plugin extends through SPI diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/lang-mustache/lang-mustache-client-6.8.0.jar b/sonar-application/src/main/assembly/elasticsearch/modules/lang-mustache/lang-mustache-client-6.8.0.jar deleted file mode 100644 index 3b0816e5a5f..00000000000 Binary files a/sonar-application/src/main/assembly/elasticsearch/modules/lang-mustache/lang-mustache-client-6.8.0.jar and /dev/null differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/lang-mustache/lang-mustache-client-6.8.4.jar b/sonar-application/src/main/assembly/elasticsearch/modules/lang-mustache/lang-mustache-client-6.8.4.jar new file mode 100644 index 00000000000..432dae633e6 Binary files /dev/null and b/sonar-application/src/main/assembly/elasticsearch/modules/lang-mustache/lang-mustache-client-6.8.4.jar differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/lang-mustache/plugin-descriptor.properties b/sonar-application/src/main/assembly/elasticsearch/modules/lang-mustache/plugin-descriptor.properties index 0fd8c8dcea4..11f255d6644 100644 --- a/sonar-application/src/main/assembly/elasticsearch/modules/lang-mustache/plugin-descriptor.properties +++ b/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.8.0 +version=6.8.4 # # '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.8.0 +elasticsearch.version=6.8.4 ### optional elements for plugins: # # 'extended.plugins': other plugins this plugin extends through SPI diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/lang-painless/elasticsearch-scripting-painless-spi-6.8.0.jar b/sonar-application/src/main/assembly/elasticsearch/modules/lang-painless/elasticsearch-scripting-painless-spi-6.8.0.jar deleted file mode 100644 index d972ee4cd31..00000000000 Binary files a/sonar-application/src/main/assembly/elasticsearch/modules/lang-painless/elasticsearch-scripting-painless-spi-6.8.0.jar and /dev/null differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/lang-painless/elasticsearch-scripting-painless-spi-6.8.4.jar b/sonar-application/src/main/assembly/elasticsearch/modules/lang-painless/elasticsearch-scripting-painless-spi-6.8.4.jar new file mode 100644 index 00000000000..137798552d7 Binary files /dev/null and b/sonar-application/src/main/assembly/elasticsearch/modules/lang-painless/elasticsearch-scripting-painless-spi-6.8.4.jar differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/lang-painless/lang-painless-6.8.0.jar b/sonar-application/src/main/assembly/elasticsearch/modules/lang-painless/lang-painless-6.8.0.jar deleted file mode 100644 index a274d1be915..00000000000 Binary files a/sonar-application/src/main/assembly/elasticsearch/modules/lang-painless/lang-painless-6.8.0.jar and /dev/null differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/lang-painless/lang-painless-6.8.4.jar b/sonar-application/src/main/assembly/elasticsearch/modules/lang-painless/lang-painless-6.8.4.jar new file mode 100644 index 00000000000..3e542c8c25b Binary files /dev/null and b/sonar-application/src/main/assembly/elasticsearch/modules/lang-painless/lang-painless-6.8.4.jar differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/lang-painless/plugin-descriptor.properties b/sonar-application/src/main/assembly/elasticsearch/modules/lang-painless/plugin-descriptor.properties index 0b2262eec6e..ae6e11250d3 100644 --- a/sonar-application/src/main/assembly/elasticsearch/modules/lang-painless/plugin-descriptor.properties +++ b/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.8.0 +version=6.8.4 # # '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.8.0 +elasticsearch.version=6.8.4 ### optional elements for plugins: # # 'extended.plugins': other plugins this plugin extends through SPI diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/mapper-extras/mapper-extras-6.8.0.jar b/sonar-application/src/main/assembly/elasticsearch/modules/mapper-extras/mapper-extras-6.8.0.jar deleted file mode 100644 index 266b0d4496f..00000000000 Binary files a/sonar-application/src/main/assembly/elasticsearch/modules/mapper-extras/mapper-extras-6.8.0.jar and /dev/null differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/mapper-extras/mapper-extras-6.8.4.jar b/sonar-application/src/main/assembly/elasticsearch/modules/mapper-extras/mapper-extras-6.8.4.jar new file mode 100644 index 00000000000..a80daa0c4ab Binary files /dev/null and b/sonar-application/src/main/assembly/elasticsearch/modules/mapper-extras/mapper-extras-6.8.4.jar differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/mapper-extras/plugin-descriptor.properties b/sonar-application/src/main/assembly/elasticsearch/modules/mapper-extras/plugin-descriptor.properties index a5bfcc3e609..70af4b044fb 100644 --- a/sonar-application/src/main/assembly/elasticsearch/modules/mapper-extras/plugin-descriptor.properties +++ b/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.8.0 +version=6.8.4 # # '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.8.0 +elasticsearch.version=6.8.4 ### optional elements for plugins: # # 'extended.plugins': other plugins this plugin extends through SPI diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/parent-join/parent-join-client-6.8.0.jar b/sonar-application/src/main/assembly/elasticsearch/modules/parent-join/parent-join-client-6.8.0.jar deleted file mode 100644 index dc89e941d67..00000000000 Binary files a/sonar-application/src/main/assembly/elasticsearch/modules/parent-join/parent-join-client-6.8.0.jar and /dev/null differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/parent-join/parent-join-client-6.8.4.jar b/sonar-application/src/main/assembly/elasticsearch/modules/parent-join/parent-join-client-6.8.4.jar new file mode 100644 index 00000000000..ca622e2399c Binary files /dev/null and b/sonar-application/src/main/assembly/elasticsearch/modules/parent-join/parent-join-client-6.8.4.jar differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/parent-join/plugin-descriptor.properties b/sonar-application/src/main/assembly/elasticsearch/modules/parent-join/plugin-descriptor.properties index 2224d790e73..98cf0bb3520 100644 --- a/sonar-application/src/main/assembly/elasticsearch/modules/parent-join/plugin-descriptor.properties +++ b/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.8.0 +version=6.8.4 # # '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.8.0 +elasticsearch.version=6.8.4 ### optional elements for plugins: # # 'extended.plugins': other plugins this plugin extends through SPI diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/percolator/percolator-client-6.8.0.jar b/sonar-application/src/main/assembly/elasticsearch/modules/percolator/percolator-client-6.8.0.jar deleted file mode 100644 index fc57537638c..00000000000 Binary files a/sonar-application/src/main/assembly/elasticsearch/modules/percolator/percolator-client-6.8.0.jar and /dev/null differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/percolator/percolator-client-6.8.4.jar b/sonar-application/src/main/assembly/elasticsearch/modules/percolator/percolator-client-6.8.4.jar new file mode 100644 index 00000000000..d24c7bd3848 Binary files /dev/null and b/sonar-application/src/main/assembly/elasticsearch/modules/percolator/percolator-client-6.8.4.jar differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/percolator/plugin-descriptor.properties b/sonar-application/src/main/assembly/elasticsearch/modules/percolator/plugin-descriptor.properties index 8b0108f741b..50a09ae173a 100644 --- a/sonar-application/src/main/assembly/elasticsearch/modules/percolator/plugin-descriptor.properties +++ b/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.8.0 +version=6.8.4 # # '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.8.0 +elasticsearch.version=6.8.4 ### optional elements for plugins: # # 'extended.plugins': other plugins this plugin extends through SPI diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/rank-eval/plugin-descriptor.properties b/sonar-application/src/main/assembly/elasticsearch/modules/rank-eval/plugin-descriptor.properties index b2e1a700209..5ed87a58a80 100644 --- a/sonar-application/src/main/assembly/elasticsearch/modules/rank-eval/plugin-descriptor.properties +++ b/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.8.0 +version=6.8.4 # # '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.8.0 +elasticsearch.version=6.8.4 ### optional elements for plugins: # # 'extended.plugins': other plugins this plugin extends through SPI diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/rank-eval/rank-eval-client-6.8.0.jar b/sonar-application/src/main/assembly/elasticsearch/modules/rank-eval/rank-eval-client-6.8.0.jar deleted file mode 100644 index 9dab3e46e3b..00000000000 Binary files a/sonar-application/src/main/assembly/elasticsearch/modules/rank-eval/rank-eval-client-6.8.0.jar and /dev/null differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/rank-eval/rank-eval-client-6.8.4.jar b/sonar-application/src/main/assembly/elasticsearch/modules/rank-eval/rank-eval-client-6.8.4.jar new file mode 100644 index 00000000000..d53c017ae5d Binary files /dev/null and b/sonar-application/src/main/assembly/elasticsearch/modules/rank-eval/rank-eval-client-6.8.4.jar differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/reindex/elasticsearch-rest-client-6.8.0.jar b/sonar-application/src/main/assembly/elasticsearch/modules/reindex/elasticsearch-rest-client-6.8.0.jar deleted file mode 100644 index 1b90e3cdea2..00000000000 Binary files a/sonar-application/src/main/assembly/elasticsearch/modules/reindex/elasticsearch-rest-client-6.8.0.jar and /dev/null differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/reindex/elasticsearch-rest-client-6.8.4.jar b/sonar-application/src/main/assembly/elasticsearch/modules/reindex/elasticsearch-rest-client-6.8.4.jar new file mode 100644 index 00000000000..5aa6ed55c84 Binary files /dev/null and b/sonar-application/src/main/assembly/elasticsearch/modules/reindex/elasticsearch-rest-client-6.8.4.jar differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/reindex/elasticsearch-ssl-config-6.8.0.jar b/sonar-application/src/main/assembly/elasticsearch/modules/reindex/elasticsearch-ssl-config-6.8.0.jar deleted file mode 100644 index b505086fe17..00000000000 Binary files a/sonar-application/src/main/assembly/elasticsearch/modules/reindex/elasticsearch-ssl-config-6.8.0.jar and /dev/null differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/reindex/elasticsearch-ssl-config-6.8.4.jar b/sonar-application/src/main/assembly/elasticsearch/modules/reindex/elasticsearch-ssl-config-6.8.4.jar new file mode 100644 index 00000000000..6b36c13d72d Binary files /dev/null and b/sonar-application/src/main/assembly/elasticsearch/modules/reindex/elasticsearch-ssl-config-6.8.4.jar differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/reindex/plugin-descriptor.properties b/sonar-application/src/main/assembly/elasticsearch/modules/reindex/plugin-descriptor.properties index bb3800789db..9781a60a4ed 100644 --- a/sonar-application/src/main/assembly/elasticsearch/modules/reindex/plugin-descriptor.properties +++ b/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.8.0 +version=6.8.4 # # '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.8.0 +elasticsearch.version=6.8.4 ### optional elements for plugins: # # 'extended.plugins': other plugins this plugin extends through SPI diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/reindex/reindex-client-6.8.0.jar b/sonar-application/src/main/assembly/elasticsearch/modules/reindex/reindex-client-6.8.0.jar deleted file mode 100644 index 6424d698aab..00000000000 Binary files a/sonar-application/src/main/assembly/elasticsearch/modules/reindex/reindex-client-6.8.0.jar and /dev/null differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/reindex/reindex-client-6.8.4.jar b/sonar-application/src/main/assembly/elasticsearch/modules/reindex/reindex-client-6.8.4.jar new file mode 100644 index 00000000000..6275f48023e Binary files /dev/null and b/sonar-application/src/main/assembly/elasticsearch/modules/reindex/reindex-client-6.8.4.jar differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/repository-url/plugin-descriptor.properties b/sonar-application/src/main/assembly/elasticsearch/modules/repository-url/plugin-descriptor.properties index 57e19f77266..635c9fe6203 100644 --- a/sonar-application/src/main/assembly/elasticsearch/modules/repository-url/plugin-descriptor.properties +++ b/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.8.0 +version=6.8.4 # # '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.8.0 +elasticsearch.version=6.8.4 ### optional elements for plugins: # # 'extended.plugins': other plugins this plugin extends through SPI diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/repository-url/repository-url-6.8.0.jar b/sonar-application/src/main/assembly/elasticsearch/modules/repository-url/repository-url-6.8.0.jar deleted file mode 100644 index cb4c667bed4..00000000000 Binary files a/sonar-application/src/main/assembly/elasticsearch/modules/repository-url/repository-url-6.8.0.jar and /dev/null differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/repository-url/repository-url-6.8.4.jar b/sonar-application/src/main/assembly/elasticsearch/modules/repository-url/repository-url-6.8.4.jar new file mode 100644 index 00000000000..698939f13a9 Binary files /dev/null and b/sonar-application/src/main/assembly/elasticsearch/modules/repository-url/repository-url-6.8.4.jar differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/transport-netty4/plugin-descriptor.properties b/sonar-application/src/main/assembly/elasticsearch/modules/transport-netty4/plugin-descriptor.properties index 1230888074f..1b83c660b71 100644 --- a/sonar-application/src/main/assembly/elasticsearch/modules/transport-netty4/plugin-descriptor.properties +++ b/sonar-application/src/main/assembly/elasticsearch/modules/transport-netty4/plugin-descriptor.properties @@ -20,7 +20,7 @@ description=Netty 4 based transport implementation # # 'version': plugin's version -version=6.8.0 +version=6.8.4 # # 'name': the plugin name name=transport-netty4 @@ -35,7 +35,7 @@ classname=org.elasticsearch.transport.Netty4Plugin java.version=1.8 # # 'elasticsearch.version': version of elasticsearch compiled against -elasticsearch.version=6.8.0 +elasticsearch.version=6.8.4 ### optional elements for plugins: # # 'extended.plugins': other plugins this plugin extends through SPI diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/transport-netty4/transport-netty4-client-6.8.0.jar b/sonar-application/src/main/assembly/elasticsearch/modules/transport-netty4/transport-netty4-client-6.8.0.jar deleted file mode 100644 index 184d2ceb8e9..00000000000 Binary files a/sonar-application/src/main/assembly/elasticsearch/modules/transport-netty4/transport-netty4-client-6.8.0.jar and /dev/null differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/transport-netty4/transport-netty4-client-6.8.4.jar b/sonar-application/src/main/assembly/elasticsearch/modules/transport-netty4/transport-netty4-client-6.8.4.jar new file mode 100644 index 00000000000..8cac2689892 Binary files /dev/null and b/sonar-application/src/main/assembly/elasticsearch/modules/transport-netty4/transport-netty4-client-6.8.4.jar differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/tribe/plugin-descriptor.properties b/sonar-application/src/main/assembly/elasticsearch/modules/tribe/plugin-descriptor.properties index 83ab5097615..7ff9c449317 100644 --- a/sonar-application/src/main/assembly/elasticsearch/modules/tribe/plugin-descriptor.properties +++ b/sonar-application/src/main/assembly/elasticsearch/modules/tribe/plugin-descriptor.properties @@ -20,7 +20,7 @@ description=Tribe module # # 'version': plugin's version -version=6.8.0 +version=6.8.4 # # 'name': the plugin name name=tribe @@ -35,7 +35,7 @@ classname=org.elasticsearch.tribe.TribePlugin java.version=1.8 # # 'elasticsearch.version': version of elasticsearch compiled against -elasticsearch.version=6.8.0 +elasticsearch.version=6.8.4 ### optional elements for plugins: # # 'extended.plugins': other plugins this plugin extends through SPI diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/tribe/tribe-6.8.0.jar b/sonar-application/src/main/assembly/elasticsearch/modules/tribe/tribe-6.8.0.jar deleted file mode 100644 index 16ba201fcbb..00000000000 Binary files a/sonar-application/src/main/assembly/elasticsearch/modules/tribe/tribe-6.8.0.jar and /dev/null differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/tribe/tribe-6.8.4.jar b/sonar-application/src/main/assembly/elasticsearch/modules/tribe/tribe-6.8.4.jar new file mode 100644 index 00000000000..2b75ecc1936 Binary files /dev/null and b/sonar-application/src/main/assembly/elasticsearch/modules/tribe/tribe-6.8.4.jar differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ccr/plugin-descriptor.properties b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ccr/plugin-descriptor.properties index 3382f56116f..abf8b53526a 100644 --- a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ccr/plugin-descriptor.properties +++ b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ccr/plugin-descriptor.properties @@ -20,7 +20,7 @@ description=Elasticsearch Expanded Pack Plugin - CCR # # 'version': plugin's version -version=6.8.0 +version=6.8.4 # # 'name': the plugin name name=x-pack-ccr @@ -35,7 +35,7 @@ classname=org.elasticsearch.xpack.ccr.Ccr java.version=1.8 # # 'elasticsearch.version': version of elasticsearch compiled against -elasticsearch.version=6.8.0 +elasticsearch.version=6.8.4 ### optional elements for plugins: # # 'extended.plugins': other plugins this plugin extends through SPI diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ccr/x-pack-ccr-6.8.0.jar b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ccr/x-pack-ccr-6.8.0.jar deleted file mode 100644 index 4c3d9b14f59..00000000000 Binary files a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ccr/x-pack-ccr-6.8.0.jar and /dev/null differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ccr/x-pack-ccr-6.8.4.jar b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ccr/x-pack-ccr-6.8.4.jar new file mode 100644 index 00000000000..38ef9ca8df6 Binary files /dev/null and b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ccr/x-pack-ccr-6.8.4.jar differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-core/plugin-descriptor.properties b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-core/plugin-descriptor.properties index c9b50aa24f8..c4e3d6394e9 100644 --- a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-core/plugin-descriptor.properties +++ b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-core/plugin-descriptor.properties @@ -20,7 +20,7 @@ description=Elasticsearch Expanded Pack Plugin - Core # # 'version': plugin's version -version=6.8.0 +version=6.8.4 # # 'name': the plugin name name=x-pack-core @@ -35,7 +35,7 @@ classname=org.elasticsearch.xpack.core.XPackPlugin java.version=1.8 # # 'elasticsearch.version': version of elasticsearch compiled against -elasticsearch.version=6.8.0 +elasticsearch.version=6.8.4 ### optional elements for plugins: # # 'extended.plugins': other plugins this plugin extends through SPI diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-core/transport-netty4-client-6.8.0.jar b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-core/transport-netty4-client-6.8.0.jar deleted file mode 100644 index 184d2ceb8e9..00000000000 Binary files a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-core/transport-netty4-client-6.8.0.jar and /dev/null differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-core/transport-netty4-client-6.8.4.jar b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-core/transport-netty4-client-6.8.4.jar new file mode 100644 index 00000000000..8cac2689892 Binary files /dev/null and b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-core/transport-netty4-client-6.8.4.jar differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-core/x-pack-core-6.8.0.jar b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-core/x-pack-core-6.8.0.jar deleted file mode 100644 index fc55c726a99..00000000000 Binary files a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-core/x-pack-core-6.8.0.jar and /dev/null differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-core/x-pack-core-6.8.4.jar b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-core/x-pack-core-6.8.4.jar new file mode 100644 index 00000000000..a40c64cd8b4 Binary files /dev/null and b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-core/x-pack-core-6.8.4.jar differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-deprecation/plugin-descriptor.properties b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-deprecation/plugin-descriptor.properties index 9cef92c0979..4ce94f19b25 100644 --- a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-deprecation/plugin-descriptor.properties +++ b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-deprecation/plugin-descriptor.properties @@ -20,7 +20,7 @@ description=Elasticsearch Expanded Pack Plugin - Deprecation # # 'version': plugin's version -version=6.8.0 +version=6.8.4 # # 'name': the plugin name name=x-pack-deprecation @@ -35,7 +35,7 @@ classname=org.elasticsearch.xpack.deprecation.Deprecation java.version=1.8 # # 'elasticsearch.version': version of elasticsearch compiled against -elasticsearch.version=6.8.0 +elasticsearch.version=6.8.4 ### optional elements for plugins: # # 'extended.plugins': other plugins this plugin extends through SPI diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-deprecation/x-pack-deprecation-6.8.0.jar b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-deprecation/x-pack-deprecation-6.8.0.jar deleted file mode 100644 index f0eb1706cd1..00000000000 Binary files a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-deprecation/x-pack-deprecation-6.8.0.jar and /dev/null differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-deprecation/x-pack-deprecation-6.8.4.jar b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-deprecation/x-pack-deprecation-6.8.4.jar new file mode 100644 index 00000000000..135af967903 Binary files /dev/null and b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-deprecation/x-pack-deprecation-6.8.4.jar differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-graph/plugin-descriptor.properties b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-graph/plugin-descriptor.properties index 110319e0736..2762985d910 100644 --- a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-graph/plugin-descriptor.properties +++ b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-graph/plugin-descriptor.properties @@ -20,7 +20,7 @@ description=Elasticsearch Expanded Pack Plugin - Graph # # 'version': plugin's version -version=6.8.0 +version=6.8.4 # # 'name': the plugin name name=x-pack-graph @@ -35,7 +35,7 @@ classname=org.elasticsearch.xpack.graph.Graph java.version=1.8 # # 'elasticsearch.version': version of elasticsearch compiled against -elasticsearch.version=6.8.0 +elasticsearch.version=6.8.4 ### optional elements for plugins: # # 'extended.plugins': other plugins this plugin extends through SPI diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-graph/x-pack-graph-6.8.0.jar b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-graph/x-pack-graph-6.8.0.jar deleted file mode 100644 index fcf080b72b7..00000000000 Binary files a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-graph/x-pack-graph-6.8.0.jar and /dev/null differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-graph/x-pack-graph-6.8.4.jar b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-graph/x-pack-graph-6.8.4.jar new file mode 100644 index 00000000000..8ede7cb830f Binary files /dev/null and b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-graph/x-pack-graph-6.8.4.jar differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ilm/plugin-descriptor.properties b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ilm/plugin-descriptor.properties index 03da309b557..ca0a405d465 100644 --- a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ilm/plugin-descriptor.properties +++ b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ilm/plugin-descriptor.properties @@ -20,7 +20,7 @@ description=Elasticsearch Expanded Pack Plugin - Index Lifecycle Management # # 'version': plugin's version -version=6.8.0 +version=6.8.4 # # 'name': the plugin name name=x-pack-ilm @@ -35,7 +35,7 @@ classname=org.elasticsearch.xpack.indexlifecycle.IndexLifecycle java.version=1.8 # # 'elasticsearch.version': version of elasticsearch compiled against -elasticsearch.version=6.8.0 +elasticsearch.version=6.8.4 ### optional elements for plugins: # # 'extended.plugins': other plugins this plugin extends through SPI diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ilm/x-pack-ilm-6.8.0.jar b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ilm/x-pack-ilm-6.8.0.jar deleted file mode 100644 index a6c308748c9..00000000000 Binary files a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ilm/x-pack-ilm-6.8.0.jar and /dev/null differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ilm/x-pack-ilm-6.8.4.jar b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ilm/x-pack-ilm-6.8.4.jar new file mode 100644 index 00000000000..e1bb38d8b7b Binary files /dev/null and b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ilm/x-pack-ilm-6.8.4.jar differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-logstash/plugin-descriptor.properties b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-logstash/plugin-descriptor.properties index e9f7a866242..c4a8e03ae51 100644 --- a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-logstash/plugin-descriptor.properties +++ b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-logstash/plugin-descriptor.properties @@ -20,7 +20,7 @@ description=Elasticsearch Expanded Pack Plugin - Logstash # # 'version': plugin's version -version=6.8.0 +version=6.8.4 # # 'name': the plugin name name=x-pack-logstash @@ -35,7 +35,7 @@ classname=org.elasticsearch.xpack.logstash.Logstash java.version=1.8 # # 'elasticsearch.version': version of elasticsearch compiled against -elasticsearch.version=6.8.0 +elasticsearch.version=6.8.4 ### optional elements for plugins: # # 'extended.plugins': other plugins this plugin extends through SPI diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-logstash/x-pack-logstash-6.8.0.jar b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-logstash/x-pack-logstash-6.8.0.jar deleted file mode 100644 index e9e4a9b9c0f..00000000000 Binary files a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-logstash/x-pack-logstash-6.8.0.jar and /dev/null differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-logstash/x-pack-logstash-6.8.4.jar b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-logstash/x-pack-logstash-6.8.4.jar new file mode 100644 index 00000000000..014cc0559e1 Binary files /dev/null and b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-logstash/x-pack-logstash-6.8.4.jar differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/elasticsearch-grok-6.8.0.jar b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/elasticsearch-grok-6.8.0.jar deleted file mode 100644 index 8ce07f8dbb0..00000000000 Binary files a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/elasticsearch-grok-6.8.0.jar and /dev/null differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/elasticsearch-grok-6.8.4.jar b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/elasticsearch-grok-6.8.4.jar new file mode 100644 index 00000000000..043f4ec991e Binary files /dev/null and b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/elasticsearch-grok-6.8.4.jar differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/darwin-x86_64/bin/autoconfig b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/darwin-x86_64/bin/autoconfig index 6f6b372282a..fd275f7932f 100755 Binary files a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/darwin-x86_64/bin/autoconfig and b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/darwin-x86_64/bin/autoconfig differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/darwin-x86_64/bin/autodetect b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/darwin-x86_64/bin/autodetect index 7f9859c31f8..e0653374325 100755 Binary files a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/darwin-x86_64/bin/autodetect and b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/darwin-x86_64/bin/autodetect differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/darwin-x86_64/bin/categorize b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/darwin-x86_64/bin/categorize index ba1085beb21..577d866b69d 100755 Binary files a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/darwin-x86_64/bin/categorize and b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/darwin-x86_64/bin/categorize differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/darwin-x86_64/bin/controller b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/darwin-x86_64/bin/controller index e8490378527..f41b5910db4 100755 Binary files a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/darwin-x86_64/bin/controller and b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/darwin-x86_64/bin/controller differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/darwin-x86_64/bin/normalize b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/darwin-x86_64/bin/normalize index ec59762ce09..e3a3d46b811 100755 Binary files a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/darwin-x86_64/bin/normalize and b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/darwin-x86_64/bin/normalize differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/darwin-x86_64/lib/libMlApi.dylib b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/darwin-x86_64/lib/libMlApi.dylib index 9d694db3ce4..a2f236b79a1 100644 Binary files a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/darwin-x86_64/lib/libMlApi.dylib and b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/darwin-x86_64/lib/libMlApi.dylib differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/darwin-x86_64/lib/libMlConfig.dylib b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/darwin-x86_64/lib/libMlConfig.dylib index ef38bd0f3c3..08fafd9e1ad 100644 Binary files a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/darwin-x86_64/lib/libMlConfig.dylib and b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/darwin-x86_64/lib/libMlConfig.dylib differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/darwin-x86_64/lib/libMlCore.dylib b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/darwin-x86_64/lib/libMlCore.dylib index 7ff0ddfdb9f..c7002524ef5 100644 Binary files a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/darwin-x86_64/lib/libMlCore.dylib and b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/darwin-x86_64/lib/libMlCore.dylib differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/darwin-x86_64/lib/libMlMaths.dylib b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/darwin-x86_64/lib/libMlMaths.dylib index e51195d7bbb..4cf0d0208e4 100644 Binary files a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/darwin-x86_64/lib/libMlMaths.dylib and b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/darwin-x86_64/lib/libMlMaths.dylib differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/darwin-x86_64/lib/libMlModel.dylib b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/darwin-x86_64/lib/libMlModel.dylib index da5002701e3..7d4673aa48f 100644 Binary files a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/darwin-x86_64/lib/libMlModel.dylib and b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/darwin-x86_64/lib/libMlModel.dylib differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/bin/autoconfig b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/bin/autoconfig index 8b191fc02e7..f2ded402021 100755 Binary files a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/bin/autoconfig and b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/bin/autoconfig differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/bin/autodetect b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/bin/autodetect index af051d6f369..8457aa3439d 100755 Binary files a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/bin/autodetect and b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/bin/autodetect differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/bin/categorize b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/bin/categorize index d554cb698fc..3f2f893d852 100755 Binary files a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/bin/categorize and b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/bin/categorize differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/bin/controller b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/bin/controller index 1293976fead..10b6dbcf312 100755 Binary files a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/bin/controller and b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/bin/controller differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/bin/normalize b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/bin/normalize index ea7e8f69d87..12c785568cd 100755 Binary files a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/bin/normalize and b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/bin/normalize differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/lib/libMlApi.so b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/lib/libMlApi.so index 459a88f4999..96eb209b485 100644 Binary files a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/lib/libMlApi.so and b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/lib/libMlApi.so differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/lib/libMlConfig.so b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/lib/libMlConfig.so index 49e84b97309..a3291a87a9f 100644 Binary files a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/lib/libMlConfig.so and b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/lib/libMlConfig.so differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/lib/libMlCore.so b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/lib/libMlCore.so index c88dba4022b..5c6124ee7c1 100644 Binary files a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/lib/libMlCore.so and b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/lib/libMlCore.so differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/lib/libMlMaths.so b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/lib/libMlMaths.so index 5f8a1ee5ee8..1af533db283 100644 Binary files a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/lib/libMlMaths.so and b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/lib/libMlMaths.so differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/lib/libMlModel.so b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/lib/libMlModel.so index 941ac4826d5..05d9e2c11f9 100644 Binary files a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/lib/libMlModel.so and b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/lib/libMlModel.so differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/windows-x86_64/bin/autoconfig.exe b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/windows-x86_64/bin/autoconfig.exe index 9a7dbbab50a..9f175752a95 100755 Binary files a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/windows-x86_64/bin/autoconfig.exe and b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/windows-x86_64/bin/autoconfig.exe differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/windows-x86_64/bin/autodetect.exe b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/windows-x86_64/bin/autodetect.exe index 9f2883a009d..b3d9c869e29 100755 Binary files a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/windows-x86_64/bin/autodetect.exe and b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/windows-x86_64/bin/autodetect.exe differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/windows-x86_64/bin/categorize.exe b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/windows-x86_64/bin/categorize.exe index 969a7639be5..b5deeeb1fcb 100755 Binary files a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/windows-x86_64/bin/categorize.exe and b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/windows-x86_64/bin/categorize.exe differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/windows-x86_64/bin/controller.exe b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/windows-x86_64/bin/controller.exe index d27d5121a18..7e4e52f28b1 100755 Binary files a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/windows-x86_64/bin/controller.exe and b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/windows-x86_64/bin/controller.exe differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/windows-x86_64/bin/libMlApi.dll b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/windows-x86_64/bin/libMlApi.dll index 664b6f65f87..a08e5e16678 100755 Binary files a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/windows-x86_64/bin/libMlApi.dll and b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/windows-x86_64/bin/libMlApi.dll differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/windows-x86_64/bin/libMlConfig.dll b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/windows-x86_64/bin/libMlConfig.dll index f5fdb2d7feb..8c598c66bcc 100755 Binary files a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/windows-x86_64/bin/libMlConfig.dll and b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/windows-x86_64/bin/libMlConfig.dll differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/windows-x86_64/bin/libMlCore.dll b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/windows-x86_64/bin/libMlCore.dll index 4f65caa3750..2607be85261 100755 Binary files a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/windows-x86_64/bin/libMlCore.dll and b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/windows-x86_64/bin/libMlCore.dll differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/windows-x86_64/bin/libMlMaths.dll b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/windows-x86_64/bin/libMlMaths.dll index 800a10a976d..4ef93e25276 100755 Binary files a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/windows-x86_64/bin/libMlMaths.dll and b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/windows-x86_64/bin/libMlMaths.dll differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/windows-x86_64/bin/libMlModel.dll b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/windows-x86_64/bin/libMlModel.dll index b3cc5b88bd9..e8ed26357d8 100755 Binary files a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/windows-x86_64/bin/libMlModel.dll and b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/windows-x86_64/bin/libMlModel.dll differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/windows-x86_64/bin/normalize.exe b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/windows-x86_64/bin/normalize.exe index 70c05e9d459..53cbf369db0 100755 Binary files a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/windows-x86_64/bin/normalize.exe and b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/platform/windows-x86_64/bin/normalize.exe differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/plugin-descriptor.properties b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/plugin-descriptor.properties index 2b9c72461f3..b5a5b135493 100644 --- a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/plugin-descriptor.properties +++ b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/plugin-descriptor.properties @@ -20,7 +20,7 @@ description=Elasticsearch Expanded Pack Plugin - Machine Learning # # 'version': plugin's version -version=6.8.0 +version=6.8.4 # # 'name': the plugin name name=x-pack-ml @@ -35,7 +35,7 @@ classname=org.elasticsearch.xpack.ml.MachineLearning java.version=1.8 # # 'elasticsearch.version': version of elasticsearch compiled against -elasticsearch.version=6.8.0 +elasticsearch.version=6.8.4 ### optional elements for plugins: # # 'extended.plugins': other plugins this plugin extends through SPI diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/x-pack-ml-6.8.0.jar b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/x-pack-ml-6.8.0.jar deleted file mode 100644 index b5a1fd3114b..00000000000 Binary files a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/x-pack-ml-6.8.0.jar and /dev/null differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/x-pack-ml-6.8.4.jar b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/x-pack-ml-6.8.4.jar new file mode 100644 index 00000000000..a61cb7410f7 Binary files /dev/null and b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-ml/x-pack-ml-6.8.4.jar differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-monitoring/elasticsearch-rest-client-6.8.0.jar b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-monitoring/elasticsearch-rest-client-6.8.0.jar deleted file mode 100644 index 1b90e3cdea2..00000000000 Binary files a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-monitoring/elasticsearch-rest-client-6.8.0.jar and /dev/null differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-monitoring/elasticsearch-rest-client-6.8.4.jar b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-monitoring/elasticsearch-rest-client-6.8.4.jar new file mode 100644 index 00000000000..5aa6ed55c84 Binary files /dev/null and b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-monitoring/elasticsearch-rest-client-6.8.4.jar differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-monitoring/elasticsearch-rest-client-sniffer-6.8.0.jar b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-monitoring/elasticsearch-rest-client-sniffer-6.8.0.jar deleted file mode 100644 index 1afa948b29e..00000000000 Binary files a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-monitoring/elasticsearch-rest-client-sniffer-6.8.0.jar and /dev/null differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-monitoring/elasticsearch-rest-client-sniffer-6.8.4.jar b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-monitoring/elasticsearch-rest-client-sniffer-6.8.4.jar new file mode 100644 index 00000000000..898647191de Binary files /dev/null and b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-monitoring/elasticsearch-rest-client-sniffer-6.8.4.jar differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-monitoring/plugin-descriptor.properties b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-monitoring/plugin-descriptor.properties index cf6c1056965..855fd539a12 100644 --- a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-monitoring/plugin-descriptor.properties +++ b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-monitoring/plugin-descriptor.properties @@ -20,7 +20,7 @@ description=Elasticsearch Expanded Pack Plugin - Monitoring # # 'version': plugin's version -version=6.8.0 +version=6.8.4 # # 'name': the plugin name name=x-pack-monitoring @@ -35,7 +35,7 @@ classname=org.elasticsearch.xpack.monitoring.Monitoring java.version=1.8 # # 'elasticsearch.version': version of elasticsearch compiled against -elasticsearch.version=6.8.0 +elasticsearch.version=6.8.4 ### optional elements for plugins: # # 'extended.plugins': other plugins this plugin extends through SPI diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-monitoring/x-pack-monitoring-6.8.0.jar b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-monitoring/x-pack-monitoring-6.8.0.jar deleted file mode 100644 index 767bf6b5f9c..00000000000 Binary files a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-monitoring/x-pack-monitoring-6.8.0.jar and /dev/null differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-monitoring/x-pack-monitoring-6.8.4.jar b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-monitoring/x-pack-monitoring-6.8.4.jar new file mode 100644 index 00000000000..27353de3e98 Binary files /dev/null and b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-monitoring/x-pack-monitoring-6.8.4.jar differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-rollup/plugin-descriptor.properties b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-rollup/plugin-descriptor.properties index 55b58a401ae..1aff5a99992 100644 --- a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-rollup/plugin-descriptor.properties +++ b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-rollup/plugin-descriptor.properties @@ -20,7 +20,7 @@ description=Elasticsearch Expanded Pack Plugin - Rollup # # 'version': plugin's version -version=6.8.0 +version=6.8.4 # # 'name': the plugin name name=x-pack-rollup @@ -35,7 +35,7 @@ classname=org.elasticsearch.xpack.rollup.Rollup java.version=1.8 # # 'elasticsearch.version': version of elasticsearch compiled against -elasticsearch.version=6.8.0 +elasticsearch.version=6.8.4 ### optional elements for plugins: # # 'extended.plugins': other plugins this plugin extends through SPI diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-rollup/x-pack-rollup-6.8.0.jar b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-rollup/x-pack-rollup-6.8.0.jar deleted file mode 100644 index 5b3f2eacff1..00000000000 Binary files a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-rollup/x-pack-rollup-6.8.0.jar and /dev/null differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-rollup/x-pack-rollup-6.8.4.jar b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-rollup/x-pack-rollup-6.8.4.jar new file mode 100644 index 00000000000..649ace25172 Binary files /dev/null and b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-rollup/x-pack-rollup-6.8.4.jar differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-security/plugin-descriptor.properties b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-security/plugin-descriptor.properties index 194e5499536..7ffdd891605 100644 --- a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-security/plugin-descriptor.properties +++ b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-security/plugin-descriptor.properties @@ -20,7 +20,7 @@ description=Elasticsearch Expanded Pack Plugin - Security # # 'version': plugin's version -version=6.8.0 +version=6.8.4 # # 'name': the plugin name name=x-pack-security @@ -35,7 +35,7 @@ classname=org.elasticsearch.xpack.security.Security java.version=1.8 # # 'elasticsearch.version': version of elasticsearch compiled against -elasticsearch.version=6.8.0 +elasticsearch.version=6.8.4 ### optional elements for plugins: # # 'extended.plugins': other plugins this plugin extends through SPI diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-security/x-pack-security-6.8.0.jar b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-security/x-pack-security-6.8.0.jar deleted file mode 100644 index c314c415efb..00000000000 Binary files a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-security/x-pack-security-6.8.0.jar and /dev/null differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-security/x-pack-security-6.8.4.jar b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-security/x-pack-security-6.8.4.jar new file mode 100644 index 00000000000..5bee4a8b61a Binary files /dev/null and b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-security/x-pack-security-6.8.4.jar differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-sql/aggs-matrix-stats-client-6.8.0.jar b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-sql/aggs-matrix-stats-client-6.8.0.jar deleted file mode 100644 index e41f03f625e..00000000000 Binary files a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-sql/aggs-matrix-stats-client-6.8.0.jar and /dev/null differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-sql/aggs-matrix-stats-client-6.8.4.jar b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-sql/aggs-matrix-stats-client-6.8.4.jar new file mode 100644 index 00000000000..b002be7b463 Binary files /dev/null and b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-sql/aggs-matrix-stats-client-6.8.4.jar differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-sql/plugin-descriptor.properties b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-sql/plugin-descriptor.properties index 5b9613ef807..ac4f9f3c10a 100644 --- a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-sql/plugin-descriptor.properties +++ b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-sql/plugin-descriptor.properties @@ -20,7 +20,7 @@ description=The Elasticsearch plugin that powers SQL for Elasticsearch # # 'version': plugin's version -version=6.8.0 +version=6.8.4 # # 'name': the plugin name name=x-pack-sql @@ -35,7 +35,7 @@ classname=org.elasticsearch.xpack.sql.plugin.SqlPlugin java.version=1.8 # # 'elasticsearch.version': version of elasticsearch compiled against -elasticsearch.version=6.8.0 +elasticsearch.version=6.8.4 ### optional elements for plugins: # # 'extended.plugins': other plugins this plugin extends through SPI diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-sql/sql-action-6.8.0.jar b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-sql/sql-action-6.8.0.jar deleted file mode 100644 index 821659f4389..00000000000 Binary files a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-sql/sql-action-6.8.0.jar and /dev/null differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-sql/sql-action-6.8.4.jar b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-sql/sql-action-6.8.4.jar new file mode 100644 index 00000000000..89a9689ef40 Binary files /dev/null and b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-sql/sql-action-6.8.4.jar differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-sql/sql-proto-6.8.0.jar b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-sql/sql-proto-6.8.0.jar deleted file mode 100644 index 753546bc581..00000000000 Binary files a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-sql/sql-proto-6.8.0.jar and /dev/null differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-sql/sql-proto-6.8.4.jar b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-sql/sql-proto-6.8.4.jar new file mode 100644 index 00000000000..d904330fafe Binary files /dev/null and b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-sql/sql-proto-6.8.4.jar differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-sql/x-pack-sql-6.8.0.jar b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-sql/x-pack-sql-6.8.0.jar deleted file mode 100644 index eb189f30d0a..00000000000 Binary files a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-sql/x-pack-sql-6.8.0.jar and /dev/null differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-sql/x-pack-sql-6.8.4.jar b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-sql/x-pack-sql-6.8.4.jar new file mode 100644 index 00000000000..a5d44520099 Binary files /dev/null and b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-sql/x-pack-sql-6.8.4.jar differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-upgrade/plugin-descriptor.properties b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-upgrade/plugin-descriptor.properties index e655e7ca1aa..ecd3a76100a 100644 --- a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-upgrade/plugin-descriptor.properties +++ b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-upgrade/plugin-descriptor.properties @@ -20,7 +20,7 @@ description=Elasticsearch Expanded Pack Plugin - Upgrade # # 'version': plugin's version -version=6.8.0 +version=6.8.4 # # 'name': the plugin name name=x-pack-upgrade @@ -35,7 +35,7 @@ classname=org.elasticsearch.xpack.upgrade.Upgrade java.version=1.8 # # 'elasticsearch.version': version of elasticsearch compiled against -elasticsearch.version=6.8.0 +elasticsearch.version=6.8.4 ### optional elements for plugins: # # 'extended.plugins': other plugins this plugin extends through SPI diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-upgrade/x-pack-upgrade-6.8.0.jar b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-upgrade/x-pack-upgrade-6.8.0.jar deleted file mode 100644 index 537df7f40ac..00000000000 Binary files a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-upgrade/x-pack-upgrade-6.8.0.jar and /dev/null differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-upgrade/x-pack-upgrade-6.8.4.jar b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-upgrade/x-pack-upgrade-6.8.4.jar new file mode 100644 index 00000000000..f6ba8fc69aa Binary files /dev/null and b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-upgrade/x-pack-upgrade-6.8.4.jar differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-watcher/plugin-descriptor.properties b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-watcher/plugin-descriptor.properties index f8a8f93332c..1eaa9264d3a 100644 --- a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-watcher/plugin-descriptor.properties +++ b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-watcher/plugin-descriptor.properties @@ -20,7 +20,7 @@ description=Elasticsearch Expanded Pack Plugin - Watcher # # 'version': plugin's version -version=6.8.0 +version=6.8.4 # # 'name': the plugin name name=x-pack-watcher @@ -35,7 +35,7 @@ classname=org.elasticsearch.xpack.watcher.Watcher java.version=1.8 # # 'elasticsearch.version': version of elasticsearch compiled against -elasticsearch.version=6.8.0 +elasticsearch.version=6.8.4 ### optional elements for plugins: # # 'extended.plugins': other plugins this plugin extends through SPI diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-watcher/x-pack-watcher-6.8.0.jar b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-watcher/x-pack-watcher-6.8.0.jar deleted file mode 100644 index 3b83f1bc126..00000000000 Binary files a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-watcher/x-pack-watcher-6.8.0.jar and /dev/null differ diff --git a/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-watcher/x-pack-watcher-6.8.4.jar b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-watcher/x-pack-watcher-6.8.4.jar new file mode 100644 index 00000000000..ecb66a23514 Binary files /dev/null and b/sonar-application/src/main/assembly/elasticsearch/modules/x-pack-watcher/x-pack-watcher-6.8.4.jar differ