Prepare release 7.6.0

opendatasoft · Feb 13, 2020 · dc2e4b9 · dc2e4b9
1 parent a2df9ae
commit dc2e4b9
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 18 deletions.
diff --git 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.5.1.0/envelope-aggregation-7.5.1.0.zip`
+`./bin/elasticsearch-plugin install https://github.com/opendatasoft/elasticsearch-aggregation-envelope/releases/download/v7.6.0.0/envelope-aggregation-7.6.0.0.zip`
 
 | elasticsearch version | plugin version | plugin url |
 | --------------------- | -------------- | ---------- |
@@ -104,6 +104,7 @@ To install it, launch this command in Elasticsearch directory replacing the url
 | 7.2.0 | 7.2.0.0 | https://github.com/opendatasoft/elasticsearch-aggregation-envelope/releases/download/v7.2.0.0/envelope-aggregation-7.2.0.0.zip |
 | 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 |
 
 
 

diff --git a/build.gradle b/build.gradle
@@ -1,7 +1,3 @@
-// Fixes integTests for 7.5.1 => https://github.com/elastic/elasticsearch/issues/49787#issuecomment-562720655
-import org.elasticsearch.gradle.testclusters.TestClustersPlugin
-import org.elasticsearch.gradle.testclusters.TestClustersRegistry
-
 buildscript {
     repositories {
         mavenLocal()
@@ -47,9 +43,3 @@ checkstyleTest.enabled = true
 dependencyLicenses.enabled = true
 
 thirdPartyAudit.enabled = true
-
-// Fixes integTests for 7.5.1 => https://github.com/elastic/elasticsearch/issues/49787#issuecomment-562720655
-TestClustersRegistry registry = project.rootProject.extensions.create("testClustersRegistry", TestClustersRegistry)
-TestClustersPlugin.configureClaimClustersHook(project.gradle, registry)
-TestClustersPlugin.configureStartClustersHook(project.gradle, registry)
-TestClustersPlugin.configureStopClustersHook(project.gradle, registry)
diff --git a/gradle.properties b/gradle.properties
@@ -1,2 +1,2 @@
-es_version = 7.5.1
-plugin_version = 7.5.1.0
+es_version = 7.6.0
+plugin_version = 7.6.0.0
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/...g/opendatasoft/elasticsearch/search/aggregations/metric/ConvexHullAggregationBuilder.java b/...g/opendatasoft/elasticsearch/search/aggregations/metric/ConvexHullAggregationBuilder.java
@@ -9,13 +9,13 @@
 import org.elasticsearch.search.aggregations.AggregationBuilder;
 import org.elasticsearch.search.aggregations.AggregatorFactories;
 import org.elasticsearch.search.aggregations.AggregatorFactory;
+import org.elasticsearch.search.aggregations.support.CoreValuesSourceType;
 import org.elasticsearch.search.aggregations.support.ValueType;
 import org.elasticsearch.search.aggregations.support.ValuesSource;
 import org.elasticsearch.search.aggregations.support.ValuesSourceAggregationBuilder;
 import org.elasticsearch.search.aggregations.support.ValuesSourceAggregatorFactory;
 import org.elasticsearch.search.aggregations.support.ValuesSourceConfig;
 import org.elasticsearch.search.aggregations.support.ValuesSourceParserHelper;
-import org.elasticsearch.search.aggregations.support.ValuesSourceType;
 
 import java.io.IOException;
 import java.util.Map;
@@ -36,7 +36,7 @@ public static AggregationBuilder parse(String aggregationName, XContentParser pa
     }
 
     public ConvexHullAggregationBuilder(String name) {
-        super(name, ValuesSourceType.GEOPOINT, ValueType.GEOPOINT);
+        super(name, CoreValuesSourceType.GEOPOINT, ValueType.GEOPOINT);
     }
 
 
@@ -51,7 +51,7 @@ protected AggregationBuilder shallowCopy(AggregatorFactories.Builder factoriesBu
     }
 
     public ConvexHullAggregationBuilder(StreamInput in) throws IOException {
-        super(in, ValuesSourceType.GEOPOINT, ValueType.GEOPOINT);
+        super(in, CoreValuesSourceType.GEOPOINT, ValueType.GEOPOINT);
     }
 
     @Override

diff --git a/...in/java/org/opendatasoft/elasticsearch/search/aggregations/metric/InternalConvexHull.java b/...in/java/org/opendatasoft/elasticsearch/search/aggregations/metric/InternalConvexHull.java
@@ -167,7 +167,7 @@ protected void doWriteTo(StreamOutput out) throws IOException {
     }
 
     @Override
-    public InternalAggregation doReduce(List<InternalAggregation> aggregations, ReduceContext reduceContext) {
+    public InternalAggregation reduce(List<InternalAggregation> aggregations, ReduceContext reduceContext) {
         Geometry merged = null;
 
         for (InternalAggregation aggregation: aggregations) {