diff --git a/README.md b/README.md index 3fe6bb4..c5a297d 100644 --- a/README.md +++ b/README.md @@ -70,7 +70,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-geoclustering/releases/download/v7.5.1.0/geopoint-clustering-aggregation-7.5.1.0.zip` +`./bin/elasticsearch-plugin install https://github.com/opendatasoft/elasticsearch-aggregation-geoclustering/releases/download/v7.6.0.0/geopoint-clustering-aggregation-7.6.0.0.zip` | elasticsearch version | plugin version | plugin url | | --------------------- | -------------- | ---------- | @@ -88,4 +88,5 @@ 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-geoclustering/releases/download/v7.2.0.0/geopoint-clustering-aggregation-7.2.0.0.zip| | 7.4.0 | 7.4.0.0 | https://github.com/opendatasoft/elasticsearch-aggregation-geoclustering/releases/download/v7.4.0.0/geopoint-clustering-aggregation-7.4.0.0.zip| | 7.5.1 | 7.5.1.0 | https://github.com/opendatasoft/elasticsearch-aggregation-geoclustering/releases/download/v7.5.1.0/geopoint-clustering-aggregation-7.5.1.0.zip| +| 7.6.0 | 7.6.0.0 | https://github.com/opendatasoft/elasticsearch-aggregation-geoclustering/releases/download/v7.6.0.0/geopoint-clustering-aggregation-7.6.0.0.zip| \ No newline at end of file diff --git a/build.gradle b/build.gradle index b94bd3f..9622948 100644 --- 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 index b5eccbd..38c0e06 100644 --- 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 index cc4fdc2..f3d88b1 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9492014..1b16c34 100644 --- 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/src/main/java/com/opendatasoft/elasticsearch/search/aggregations/bucket/geopointclustering/GeoPointClusteringAggregationBuilder.java b/src/main/java/com/opendatasoft/elasticsearch/search/aggregations/bucket/geopointclustering/GeoPointClusteringAggregationBuilder.java index 272722d..57f0fc0 100644 --- a/src/main/java/com/opendatasoft/elasticsearch/search/aggregations/bucket/geopointclustering/GeoPointClusteringAggregationBuilder.java +++ b/src/main/java/com/opendatasoft/elasticsearch/search/aggregations/bucket/geopointclustering/GeoPointClusteringAggregationBuilder.java @@ -13,13 +13,13 @@ import org.elasticsearch.search.aggregations.AggregatorFactory; import org.elasticsearch.search.aggregations.bucket.BucketUtils; import org.elasticsearch.search.aggregations.bucket.MultiBucketAggregationBuilder; +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; @@ -60,7 +60,7 @@ public static GeoPointClusteringAggregationBuilder parse(String aggregationName, private double ratio = DEFAULT_RATIO; public GeoPointClusteringAggregationBuilder(String name) { - super(name, ValuesSourceType.GEOPOINT, ValueType.GEOPOINT); + super(name, CoreValuesSourceType.GEOPOINT, ValueType.GEOPOINT); } protected GeoPointClusteringAggregationBuilder( @@ -83,7 +83,7 @@ protected AggregationBuilder shallowCopy(Builder factoriesBuilder, Map getBuckets() { } @Override - public InternalGeoPointClustering doReduce(List aggregations, ReduceContext reduceContext) { + public InternalGeoPointClustering reduce(List aggregations, ReduceContext reduceContext) { LongObjectPagedHashMap> buckets = null; for (InternalAggregation aggregation : aggregations) { InternalGeoPointClustering grid = (InternalGeoPointClustering) aggregation;