From 068176b2504e3328c99aedd393903f06db9168d7 Mon Sep 17 00:00:00 2001 From: Hugo Mercier Date: Wed, 16 Feb 2022 14:59:35 +0100 Subject: [PATCH] Prepare for 7.17 --- README.md | 5 +++-- build.gradle | 6 +++--- gradle.properties | 4 ++-- ...y-geo-7.16.3.jar => legacy-geo-7.17.0.jar} | Bin 116706 -> 116741 bytes 4 files changed, 8 insertions(+), 7 deletions(-) rename libs/{legacy-geo-7.16.3.jar => legacy-geo-7.17.0.jar} (93%) diff --git a/README.md b/README.md index af9dfc7..ef6f95d 100644 --- a/README.md +++ b/README.md @@ -86,7 +86,7 @@ Plugin versions are available for (at least) all minor versions of Elasticsearch The first 3 digits of plugin version is Elasticsearch versioning. The last digit is used for plugin versioning under an elasticsearch version. To install it, launch this command in Elasticsearch directory replacing the url by the correct link for your Elasticsearch version (see table) -`./bin/elasticsearch-plugin install https://github.com/opendatasoft/elasticsearch-aggregation-envelope/releases/download/v7.6.0.0/envelope-aggregation-7.6.0.0.zip` +`./bin/elasticsearch-plugin install https://github.com/opendatasoft/elasticsearch-aggregation-envelope/releases/download/v7.17.0.0/envelope-aggregation-7.17.0.0.zip` | elasticsearch version | plugin version | plugin url | | --------------------- | -------------- | ---------- | @@ -105,10 +105,11 @@ To install it, launch this command in Elasticsearch directory replacing the url | 7.4.0 | 7.4.0.0 | https://github.com/opendatasoft/elasticsearch-aggregation-envelope/releases/download/v7.4.0.0/envelope-aggregation-7.4.0.0.zip | | 7.5.1 | 7.5.1.0 | https://github.com/opendatasoft/elasticsearch-aggregation-envelope/releases/download/v7.5.1.0/envelope-aggregation-7.5.1.0.zip | | 7.6.0 | 7.6.0.0 | https://github.com/opendatasoft/elasticsearch-aggregation-envelope/releases/download/v7.6.0.0/envelope-aggregation-7.6.0.0.zip | +| 7.17.0 | 7.17.0.0 | https://github.com/opendatasoft/elasticsearch-aggregation-envelope/releases/download/v7.17.0.0/envelope-aggregation-7.17.0.0.zip | License ------- -This software is under The MIT License (MIT) \ No newline at end of file +This software is under The MIT License (MIT) diff --git a/build.gradle b/build.gradle index 7883419..4c189f3 100644 --- a/build.gradle +++ b/build.gradle @@ -42,19 +42,19 @@ dependencies { // However this archive is not included in the final plugin bundle, since // legacy geo and its dependencies (JTS) are already present at runtime // with ES (see the jar/manifest rule below) - compileOnly files('libs/legacy-geo-7.16.3.jar') + compileOnly files('libs/legacy-geo-7.17.0.jar') yamlRestTestImplementation "org.elasticsearch.test:framework:${es_version}" yamlRestTestImplementation "org.apache.logging.log4j:log4j-core:2.17.1" } -// Since this plugin is meant to be loaded in an ES 7.16 instance, +// Since this plugin is meant to be loaded in an ES >=7.16 instance, // we can "link" it to existing classes through a class path without adding other archives // to the plugin bundle jar { manifest { attributes( - "Class-Path": "../../modules/legacy-geo/legacy-geo-7.16.3.jar ../../modules/legacy-geo/jts-core-1.15.0.jar ../../modules/legacy-geo/spatial4j-0.7.jar") + "Class-Path": "../../modules/legacy-geo/legacy-geo-7.17.0.jar ../../modules/legacy-geo/jts-core-1.15.0.jar ../../modules/legacy-geo/spatial4j-0.7.jar") } } diff --git a/gradle.properties b/gradle.properties index 411dede..a22475a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ -es_version = 7.16.3 -plugin_version = 7.16.3.0 +es_version = 7.17.0 +plugin_version = 7.17.0.0 diff --git a/libs/legacy-geo-7.16.3.jar b/libs/legacy-geo-7.17.0.jar similarity index 93% rename from libs/legacy-geo-7.16.3.jar rename to libs/legacy-geo-7.17.0.jar index 7a7127c130830cdf066dc9a654e3ce0a0ce37566..07a3f9638d9f990ebe47b276caff2f03e1f7cd68 100644 GIT binary patch delta 2784 zcmZWqeO!~*6}~44M1cf}2ownNjTQ;90}C^QK%s&RLCq>C@T0O7N=2+x9GjK0NolJ^ zB$Hb|Q08w!(K6-|8a_e+`LGK9v}5Ryf()!ybXwV_#ft3S`@V#Rg+K1)JkNd3bI-l^ zykiH&#bshiVw_N9h0uZps3J;rNa8CYgJx@DM9*G8=+q&#Yhn5N+#z@S;+p|e;qL!B z-7gBxmu-8zA-Jx3SKVZp{^;X;;mcB)rS*9BaQ)IZ9lD2Zi1#(#*)dhBupRA_mc*P? z+VrfB4e_76-*N9N&s2;4qnfwkjceZu-+pAWGRpdupoz&VVeX=a%!_52y+3Po@EP>H zw*Sm$(JRFkSKA|n*@gCdUd#IW?vd?@mmRlMX5PH}x81F=^~39iDvLzpW9{#(8aZes zKOqkuKmO>+mOA-=I!D&T=BJDMboHsZ=U#F2sJ473<5YZKnEw95m{$45=e7=85(D+o zGgG2}CzQ;j*RRR&O7$yn^XKIHclT*@d1g$sW5Vfy&E>xx?>Sj`;dkp&$^&J94H*~sdL_W&Z=rf`DxqM@ai8zLXlA_T_>am2-Q(4t#4qna61{t13lO%RtB;$ zR2fP~!^lRsA(E1rX3<#XD2NcMvC_V$3^aU}1u_w%?EVXs3an?(pHOwR3GPCsk`fY5 zM_qNqUTZcv5n{2BP5j~u1$1I)NrJa6=uF$UA(BDG+AldyVr4ov$!JTFFi2M|05*vz zjbMv(iG>fOETZq<3@G2r`}3_RSl z%<>p4a-fY{uqht`Y?&{Ys&Ak4kV0y#@S+@e5m)tqy}|z&TxI3d?NZ(nQx*JB2x=x5 z=M00K$mkNt64?<@Q+%f;ew`gcIZA{gagjHK8wy2`X2%xz$-#-$$&eKRzBVkD=M9st zY-v}`_xr935t3RXw23ZN8_L|^2eunSsV9taOAnugo7@3w*F%heS>LgzpsSHspR#6m zz~*(h$Wfl3gag(R5ZDV%T>#5;5MTpXtY5z5_}8JHM1Crk^YCZIsB)PB`xZ#y4*k75ZFbHgoqV0*{v^CY-miT{}n z{`iCQu$bj==_1jrU|f_1FX8Mip8M_v5;cS}?oUD$8QWgZ%bS-((`5PR!GHiEyZ|9m zf74H2l&Ip8I2&NGJ3S|g5hnY2@*_fv&~!vzI5U~i05WE0qJboCU_otfh$mk2IoLCa zjt94oSJO<62t}DB5YiW|ilY*Qy$laE@cz?2Co*9g9`M91M26{~phakZjq`VVwg^fC zi3X(*`Z9m>GHdQU`Nr|>g$QkMLP%wnw}A5fv@Kdk?AFBR4QL`lQExEd{mLbCz}gl9 z)Z|hCm$raE+mrIl3weJgnga592sP8Te3waFHA?X9CjO+78;OMVUK4Pp5!hSD6V!de z@0qru5tgxydKgJiUCy&@uu~JrSkh~COCEjek5F;W{G>-eCG6$+q5<5Pgpqn4{5uJT zvW>9iiYxUg`BH@b>ova~y+h2wB_nt-W^K~-pF7(k^ra6%VP?BKHo=%@o56=Me^GS3 zY%94RK>Ady8Po15WooY)z47W6zQ*6to!xlGB!XIDDf9Y_7XF?XpX&xU?P&EvtZoKx z4xuN$Nx~4Ek_JvVp_5lKb`t2REeAd61P|usyPco-=}BieOitbWUjISHQD@RYf-iOO z=TbmlP=y19e6ex%1xCJvg_&7NqrodU?z3F5!_#fNnO-W>{St+iIvh9!zTfvRQpff+;_mX{VAT0z(w1P1>nDi(aCwpg)#I-7qz-tyhZi z3*@1&%~G}5mr2z5AAOn4>$x>m-XO-GwDK;?z94ebbC3tV{{{Fmsg*eqE&|dP7mE>! zn^hvCzGzTmlJdX`2av9q-%HFIx!KyNWYb!AOq#nTPHN`8Yl;gBnh4p4JRkFxFqzFQ zN^FB5T7`-Z;##uJq~w89I`~^!9Q4!ik6jTONJeO_S>{#0Ht`j6_uuThVaE4AY~p)h z@-1- Gi~a{J{*&+k delta 2863 zcmaJ@dsLH07N47hBn1;5;UVFnL<$H<0wq?CsAQqOQsiNdLP1-qWf4OOT3M^L)GDk+ zEn-%uT5Q#IK~0sii9}uk0dXl*;iwB0Yb|YM@oZh~uDjF~-TCH=!B5ZG@1L36-@U*4 zn>%x7Qo2VpTp^OAYWV_Zgv4U>PD@CoBt$|6-O$McIaz>EW@UnZNqYa{4wdH?<-evl zp9|YNSiK?nhn;#^+ROj$3mP6;v3bDh&&Q698cGVU`Z}PVh!7dSgqjmEeHlVJVP4Sgs zyRWUhPH{mI@nyJkMbXN{LnXU2+y{zmtGaAAcfZ3ar*d^wcee*HYm1cG_&ijSnLKv~;eyPBPw*ZrarPxYQ;*IcH7Z z^+UFY>&9fo*R?+_934F;tGpuh+q~zq_oPO2aLr!CW1Ar)A8Hu zU8z&xgDy6Or7&AUEw`@xLr5pddzX9D$>7k}Y>ttKQYs8zNP`3hvZiH%$(_z_=^#%) zXU^&H4dt{x&WFit=2`n-5sPj=0K=>;aU=ZVPb1`d2$@7@M?By$U8z-j7#6b1K2cqx zq2{lb6;bup)e<<&X4roe_^eIj2AD?+?KXVqCI}F!amGiEg3?^8_Mq|jkKUl69-Cf@ z*rn$oq!ZvvNf3^u?cizkdkKnpbVte->=w-tB9!HZkQ&!{Lnt=2fxC4_BrFh80-yYz zl|xd3PBY%SqQHILAhvd^VT_i^I^qo(UUWH~N#M)MtEz!rE-p{nnxp z1tS7STfi^&uS$dp*Zo$Rs+}MvppKkuL{ihw!#*P9hQ>7yl*ayfo{|4Az@HNksUiV^ z_=W}OUgC%C;K$2jjTNmR!AUldO?@`0g2RzAi*N+HK9dwrw-TyK21~$YR`8%KoW^mm zAY|EkKtntiV!73>%=9EDyefrw24bo?r5 zjm6E4KpPLYF*!FHsju?_gld!s) zaa};Yq^7JacPE4f$)z)g<7KL038Ta?8OOKStM^?q$>nqEi3;BdMB74;-OUUVi>q2- z8s!fj=x`gKgiuTfLP;F{Wvwj9?ZPP&ByJ4-nO+w0zv@8|N>uRoxhYQGgd`TBmpMc= zmvK%Lyh6RAF4blilPcezhEP1m3vRQd((69BuNfw>>W(flG?B&%4M1oX$Gv}ybq^Sq zO{ja#M$`@SaZxJ-V#7ud;VPTGE+;w&^rFB4O~s#Of)G1*+HnQ z7}mM+r=W~dn5y0OJ~j4_5nUZQnHiFIcre|vO#U?Od4_IGw>-m!Gxw zuB+zMjx^G{{UkRz9FEVjRk4y4d+{6u)8vNt-t9a~68}nS#BKBQZ{VB@c8P(#^Zb}A zSWi5o9dyiH((@KesA>iJ(qruzqUfzWs>oQY7U6?u?AyV_5f1tV+eh{;wdiqB8-zT! z!98t+Ym9<1SWaFcDw*^CICvN_jfIqld5+kRZ6C#nyi>JK