Skip to content

Commit 122d5b3

Browse files
author
Jesse White
committed
Add support for Elasticsearch v7.2.0.
1 parent c21a104 commit 122d5b3

File tree

4 files changed

+8
-17
lines changed

4 files changed

+8
-17
lines changed

pom.xml

+2-8
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>org.opennms.elasticsearch</groupId>
88
<artifactId>elasticsearch-drift-plugin</artifactId>
9-
<version>7.1.1-SNAPSHOT</version>
9+
<version>7.2.0-SNAPSHOT</version>
1010

1111
<licenses>
1212
<license>
@@ -22,7 +22,7 @@
2222
</parent>
2323

2424
<properties>
25-
<elasticsearch.version>7.1.1</elasticsearch.version>
25+
<elasticsearch.version>7.2.0</elasticsearch.version>
2626

2727
<!-- We use the build timestamp in the RPM version, so change the format to ensure that there
2828
are no invalid characters such as colons (:) -->
@@ -51,12 +51,6 @@
5151
<version>${elasticsearch.version}</version>
5252
<scope>test</scope>
5353
</dependency>
54-
<dependency>
55-
<groupId>org.codelibs.elasticsearch.module</groupId>
56-
<artifactId>lang-painless</artifactId>
57-
<version>${elasticsearch.version}</version>
58-
<scope>test</scope>
59-
</dependency>
6054
<dependency>
6155
<groupId>org.apache.logging.log4j</groupId>
6256
<artifactId>log4j-api</artifactId>

src/test/java/org/opennms/elasticsearch/plugin/aggregations/bucket/histogram/OffsetIT.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
import org.elasticsearch.action.index.IndexRequestBuilder;
4343
import org.elasticsearch.action.search.SearchResponse;
4444
import org.elasticsearch.index.mapper.DateFieldMapper;
45-
import org.elasticsearch.painless.PainlessPlugin;
4645
import org.elasticsearch.plugins.Plugin;
4746
import org.elasticsearch.search.aggregations.BucketOrder;
4847
import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramInterval;
@@ -57,11 +56,11 @@
5756
public class OffsetIT extends ESIntegTestCase {
5857

5958
protected Collection<Class<? extends Plugin>> nodePlugins() {
60-
return Arrays.asList(DriftPlugin.class, PainlessPlugin.class);
59+
return Arrays.asList(DriftPlugin.class);
6160
}
6261

6362
protected Collection<Class<? extends Plugin>> transportClientPlugins() {
64-
return Arrays.asList(DriftPlugin.class, PainlessPlugin.class);
63+
return Arrays.asList(DriftPlugin.class);
6564
}
6665

6766
@Override

src/test/java/org/opennms/elasticsearch/plugin/aggregations/bucket/histogram/ProportionalSumAggregatorIT.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
import org.elasticsearch.action.index.IndexRequestBuilder;
4343
import org.elasticsearch.action.search.SearchResponse;
4444
import org.elasticsearch.index.mapper.DateFieldMapper;
45-
import org.elasticsearch.painless.PainlessPlugin;
4645
import org.elasticsearch.plugins.Plugin;
4746
import org.elasticsearch.search.aggregations.BucketOrder;
4847
import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramInterval;
@@ -57,11 +56,11 @@
5756
public class ProportionalSumAggregatorIT extends ESIntegTestCase {
5857

5958
protected Collection<Class<? extends Plugin>> nodePlugins() {
60-
return Arrays.asList(DriftPlugin.class, PainlessPlugin.class);
59+
return Arrays.asList(DriftPlugin.class);
6160
}
6261

6362
protected Collection<Class<? extends Plugin>> transportClientPlugins() {
64-
return Arrays.asList(DriftPlugin.class, PainlessPlugin.class);
63+
return Arrays.asList(DriftPlugin.class);
6564
}
6665

6766
@Override

src/test/java/org/opennms/elasticsearch/plugin/aggregations/bucket/histogram/SamplingIT.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
import org.elasticsearch.action.index.IndexRequestBuilder;
4343
import org.elasticsearch.action.search.SearchResponse;
4444
import org.elasticsearch.index.mapper.DateFieldMapper;
45-
import org.elasticsearch.painless.PainlessPlugin;
4645
import org.elasticsearch.plugins.Plugin;
4746
import org.elasticsearch.search.aggregations.BucketOrder;
4847
import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramInterval;
@@ -57,11 +56,11 @@
5756
public class SamplingIT extends ESIntegTestCase {
5857

5958
protected Collection<Class<? extends Plugin>> nodePlugins() {
60-
return Arrays.asList(DriftPlugin.class, PainlessPlugin.class);
59+
return Arrays.asList(DriftPlugin.class);
6160
}
6261

6362
protected Collection<Class<? extends Plugin>> transportClientPlugins() {
64-
return Arrays.asList(DriftPlugin.class, PainlessPlugin.class);
63+
return Arrays.asList(DriftPlugin.class);
6564
}
6665

6766
@Override

0 commit comments

Comments
 (0)