From fe4736113d4fc786e788196e13856d0aa4815e8c Mon Sep 17 00:00:00 2001
From: Peter-Josef Meisch <pj.meisch@sothawo.com>
Date: Tue, 21 Apr 2020 08:46:58 +0200
Subject: [PATCH] DATAES-793 - Upgrade to Elasticsearch 6.2.4. (#435)

Original PR: #435
---
 README.adoc                                   |   2 +-
 pom.xml                                       |   2 +-
 ...on-6.2.2.jar => lang-expression-6.2.4.jar} | Bin 48652 -> 48652 bytes
 .../plugin-descriptor.properties              |   4 ++--
 .../lang-expression/plugin-security.policy    |   2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)
 rename src/test/resources/test-home-dir/modules/lang-expression/{lang-expression-6.2.2.jar => lang-expression-6.2.4.jar} (89%)

diff --git a/README.adoc b/README.adoc
index 33623fcd2..9ac3fd6f8 100644
--- a/README.adoc
+++ b/README.adoc
@@ -119,7 +119,7 @@ Add the Maven dependency:
 |===
 |Spring Data Elasticsearch | Elasticsearch
 |3.2.x |6.7.2
-|3.1.x |6.2.2
+|3.1.x |6.2.4
 |3.0.x |5.5.0
 |2.1.x |2.4.0
 |2.0.x |2.2.0
diff --git a/pom.xml b/pom.xml
index 5d5be835a..e4e9a8427 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
 	<properties>
 		<commonscollections>3.2.1</commonscollections>
 		<commonslang>2.6</commonslang>
-		<elasticsearch>6.2.2</elasticsearch>
+		<elasticsearch>6.2.4</elasticsearch>
 		<log4j>2.9.1</log4j>
 		<springdata.commons>2.1.17.BUILD-SNAPSHOT</springdata.commons>
 		<java-module-name>spring.data.elasticsearch</java-module-name>
diff --git a/src/test/resources/test-home-dir/modules/lang-expression/lang-expression-6.2.2.jar b/src/test/resources/test-home-dir/modules/lang-expression/lang-expression-6.2.4.jar
similarity index 89%
rename from src/test/resources/test-home-dir/modules/lang-expression/lang-expression-6.2.2.jar
rename to src/test/resources/test-home-dir/modules/lang-expression/lang-expression-6.2.4.jar
index 521648ddf9f1546867172c44d4467e1e0fa9ee5d..1dcb6ac328064019b8e749e3d95c153fb372ff5f 100644
GIT binary patch
delta 2122
zcmZWp3pA8z82<djm|Vt$Ve-?c%}~@}jmsXAC8{B*Lq;7sC%JTlD6Dl^4yzS~ucNZk
zO`Yw+VB9m&Wrt(kjyju4QM-1dZ56FjcI`LcKW2CIpEL8n=lP!ZeV_MzzxOYgBMRmS
z-EBgex)uNo26$3gP^`;af?mGmz9D@v#jYzdh5o<Ta@u^lGi&NkZtRLJ*W4^U$=;Wn
zawRW_@v7H3%s_a|>>)Edv)@N36b*SYD^B+mbS4i@=;myiyruc-x_SA&=mbFlon8~*
ztv(*&L(6s^v9q=Jsv<UtQyt5$+?&ZOZoK%~HI)&^Ywrv0>*lY^JCgh%ZICy}uG_)N
z^m@!VGqUF0{n?}D{`wx|yMY9YuByg+)6A&x+=3yS{uED1$yC~z$O}<kg2=$o_|Q2&
zDCF;=ao<>68w`J@HXqZpEU~n9>O|sH;`k-|4Mu&(V;_u#a}TXO`|F!6(+(|(uX1G8
zPG99(MBJG%jhOE_$XX|rHK>mtnkx)*cgwUNqrX`{{>OB^RY$2?$oYot=kjOiH%2*E
z-GK;R2?;!qb+YRF&em;#LDtpz7ji!Ddg<u5{KakEi?a6(Z_T_?(+^Jn-0pHYY3KXW
z4~fGQKam+PVl6dhqQ*=#=H|Vvtvd&9Sao@qf#?#RSY;Bv06heJs7BJzK;SzyK7Owz
z9GA)mgiqyv=vf6lprsxSsQ61XGgh<ZE|N)?JL=ewg>_KIUA`d=BbNz*Ha47j=5%a)
z7d}B?W0y??#W^Z+rsI_9&ewW|)d09d1HcO|J!KDfH)%_r9Dc3Flq=$d{}Y-*0Puqb
z%!;&z9Zl>y_k1eWWBa9=nDdPIIwe6JfH^JL&s_s=h8syTU^XSHmh}x~Jk=eb+|>O#
zDWu9vVK}huG_blT6JJVQ^5%TX=nH72a=h0ymdzlEMp{UR0J7S&C0kE1s6e9!^eMKe
z+<?k)m-~b=3O&rIqk&`xsuf9*k(AM7rbTfoR~A#8zv9c(X=_n$<0{Ja^pWA4{&e(y
zDw;(p`WXQDOv=s-?5<_rHfMo>Gvej|&DBZUo%TNB*0{&t7Hwkqj269}6v%!YUmKSn
zY%#PY`1($#zFkYM8FLC<xZa7bx86G4f9{#Pdq`l-Dk<y@$nEwY4`!H3trB>e$90YT
z<9nmrhci8Thf6${l<)a{<J3M*>ZD1#U!o{a8Wgups74rS(Ue;a+o~P@TWdI5?ZRDr
zhtN<I4-5S5(Fp^@2Ih-7`U?~w=e$&d2MI%XO04q<ahVFyj6g&Zj)-;Sql15nNg_xN
z@occp|77}F(Tj%q3<22c3cv<s3;^o0$_RM=upJtv8IBRqKoT-zc?{^*Y6K@F`WO~B
zlSF|jhChZagRdo2#@Kq2@Lz%9Sw6R<mO?kwkVM2Pj279b!x2K~6FnC>CYNLy0O;!h
z;I5*lg8x59I*gZSD@B;Jki;zkKE4^gd?DMsge0n+6;5Ugs1OM@cExCiNFSbSrh2Ke
zX)1ZQe~J3wt+%LgupRZI$O|1=%J;6sow1N$1eG4;gAQz=O~XpuB-=KUNZYE=X9P1K
zUD+tTT9WYHfscM;G2xzCO3vP{2TzmGX6K+*sJ5YhCnkRkGk`i0LmWP>i6kzBD5O|o
z=xifN#DrnyEZ<n!s5q3(F&x9uY!ju3#|YjZjRMHWtqmROjBpSpirW%{U{@H~M2&j_
zLEiB=fP8{>&BmBnfeNIhC<CD7hx2XJ%s-&nh|;i!Tk9Gsu9PHVGck0meB~!sz;yYJ
zFS1eXwWxO0E18ppoo2bF3(e-EI>U36iH|fI;?1}^mA>u~a&KZTZeLEGLOfe#4Eadq
zjY1S>JsfMHO7*KF35yd5vV~=J931v0yC+J3zH>ZH06bJKiG8Ueto&BXFDDmQy1x}I
z&1prYB<yPCaOGdF`ugYJ9zYj7)CK^wd&;LWYcH&jeug=!UpFNMRAv!yRBH1tK)Wdi

delta 2248
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
QP`{SnLzS6Yuv_K)9|N5OmH+?%

diff --git a/src/test/resources/test-home-dir/modules/lang-expression/plugin-descriptor.properties b/src/test/resources/test-home-dir/modules/lang-expression/plugin-descriptor.properties
index 6ed2760a4..1f7deb72f 100644
--- a/src/test/resources/test-home-dir/modules/lang-expression/plugin-descriptor.properties
+++ b/src/test/resources/test-home-dir/modules/lang-expression/plugin-descriptor.properties
@@ -22,7 +22,7 @@
 description=Lucene expressions integration for Elasticsearch
 #
 # 'version': plugin's version
-version=6.2.2
+version=6.2.4
 #
 # 'name': the plugin name
 name=lang-expression
@@ -37,7 +37,7 @@ classname=org.elasticsearch.script.expression.ExpressionPlugin
 java.version=1.8
 #
 # 'elasticsearch.version': version of elasticsearch compiled against
-elasticsearch.version=6.2.2
+elasticsearch.version=6.2.4
 ### optional elements for plugins:
 #
 #  'extended.plugins': other plugins this plugin extends through SPI
diff --git a/src/test/resources/test-home-dir/modules/lang-expression/plugin-security.policy b/src/test/resources/test-home-dir/modules/lang-expression/plugin-security.policy
index 292c8614c..4835ab053 100644
--- a/src/test/resources/test-home-dir/modules/lang-expression/plugin-security.policy
+++ b/src/test/resources/test-home-dir/modules/lang-expression/plugin-security.policy
@@ -7,7 +7,7 @@
  * not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    https://www.apache.org/licenses/LICENSE-2.0
+ *    http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an