diff --git a/pom.xml b/pom.xml index b78b67e0..f30d4ce9 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ 2.6 - 7.7.1 + 7.8.0 2.9.1 2.4.0-SNAPSHOT 4.1.50.Final diff --git a/src/main/asciidoc/preface.adoc b/src/main/asciidoc/preface.adoc index ab746ec2..6d34045c 100644 --- a/src/main/asciidoc/preface.adoc +++ b/src/main/asciidoc/preface.adoc @@ -35,7 +35,7 @@ The following table shows the Elasticsearch versions that are used by Spring Dat [cols="^,^,^,^",options="header"] |=== | Spring Data Release Train |Spring Data Elasticsearch |Elasticsearch | Spring Boot -| 2020.0.0footnote:cdv[Currently in development] |4.1.xfootnote:cdv[]|7.7.1 |2.3.xfootnote:cdv[] +| 2020.0.0footnote:cdv[Currently in development] |4.1.xfootnote:cdv[]|7.8.0 |2.3.xfootnote:cdv[] | Neumann | 4.0.x | 7.6.2 |2.3.x | Moore | 3.2.x |6.8.10 | 2.2.x | Lovelace | 3.1.x | 6.2.2 |2.1.x diff --git a/src/main/asciidoc/reference/elasticsearch-new.adoc b/src/main/asciidoc/reference/elasticsearch-new.adoc index 27f0faeb..bd781617 100644 --- a/src/main/asciidoc/reference/elasticsearch-new.adoc +++ b/src/main/asciidoc/reference/elasticsearch-new.adoc @@ -1,6 +1,13 @@ [[new-features]] = What's new +[[new-features.4-1-0]] +== New in Spring Data Elasticsearch 4.1 + +* Upgrade to Elasticsearch 7.8.0 +* Improved API for alias management +* Introduction of `ReactiveIndexOperations` for index management + [[new-features.4-0-0]] == New in Spring Data Elasticsearch 4.0 @@ -11,8 +18,7 @@ * Removal of the Jackson `ObjectMapper`, now using the <> * Cleanup of the API in the `*Operations` interfaces, grouping and renaming methods so that they match the Elasticsearch API, deprecating the old methods, aligning with other Spring Data modules. * Introduction of `SearchHit` class to represent a found document together with the relevant result metadata for this document (i.e. _sortValues_). -* Introduction of the `SearchHits` class to represent a whole search result together with the -metadata for the complete search result (i.e. _max_score_). +* Introduction of the `SearchHits` class to represent a whole search result together with the metadata for the complete search result (i.e. _max_score_). * Introduction of `SearchPage` class to represent a paged result containing a `SearchHits` instance. * Introduction of the `GeoDistanceOrder` class to be able to create sorting by geographical distance * Implementation of Auditing Support diff --git a/src/main/java/org/springframework/data/elasticsearch/core/AbstractDefaultIndexOperations.java b/src/main/java/org/springframework/data/elasticsearch/core/AbstractDefaultIndexOperations.java index 959ff023..866671ef 100644 --- a/src/main/java/org/springframework/data/elasticsearch/core/AbstractDefaultIndexOperations.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/AbstractDefaultIndexOperations.java @@ -22,7 +22,7 @@ import java.util.Map; import java.util.Set; import org.elasticsearch.action.admin.indices.settings.get.GetSettingsResponse; -import org.elasticsearch.cluster.metadata.AliasMetaData; +import org.elasticsearch.cluster.metadata.AliasMetadata; import org.elasticsearch.common.settings.Settings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -170,11 +170,11 @@ abstract class AbstractDefaultIndexOperations implements IndexOperations { protected abstract boolean doAddAlias(AliasQuery query, IndexCoordinates index); @Override - public List queryForAlias() { + public List queryForAlias() { return doQueryForAlias(getIndexCoordinates()); } - protected abstract List doQueryForAlias(IndexCoordinates index); + protected abstract List doQueryForAlias(IndexCoordinates index); @Override public boolean removeAlias(AliasQuery query) { diff --git a/src/main/java/org/springframework/data/elasticsearch/core/DefaultIndexOperations.java b/src/main/java/org/springframework/data/elasticsearch/core/DefaultIndexOperations.java index 29acbbb9..305d06dd 100644 --- a/src/main/java/org/springframework/data/elasticsearch/core/DefaultIndexOperations.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/DefaultIndexOperations.java @@ -34,7 +34,7 @@ import org.elasticsearch.client.indices.GetIndexRequest; import org.elasticsearch.client.indices.GetMappingsRequest; import org.elasticsearch.client.indices.GetMappingsResponse; import org.elasticsearch.client.indices.PutMappingRequest; -import org.elasticsearch.cluster.metadata.AliasMetaData; +import org.elasticsearch.cluster.metadata.AliasMetadata; import org.springframework.data.elasticsearch.core.document.Document; import org.springframework.data.elasticsearch.core.index.AliasActions; import org.springframework.data.elasticsearch.core.index.AliasData; @@ -136,7 +136,7 @@ class DefaultIndexOperations extends AbstractDefaultIndexOperations implements I } @Override - protected List doQueryForAlias(IndexCoordinates index) { + protected List doQueryForAlias(IndexCoordinates index) { GetAliasesRequest getAliasesRequest = requestFactory.getAliasesRequest(index); diff --git a/src/main/java/org/springframework/data/elasticsearch/core/DefaultTransportIndexOperations.java b/src/main/java/org/springframework/data/elasticsearch/core/DefaultTransportIndexOperations.java index 7b20df10..fc7a4da9 100644 --- a/src/main/java/org/springframework/data/elasticsearch/core/DefaultTransportIndexOperations.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/DefaultTransportIndexOperations.java @@ -33,7 +33,7 @@ import org.elasticsearch.action.admin.indices.refresh.RefreshRequest; import org.elasticsearch.action.admin.indices.settings.get.GetSettingsRequest; import org.elasticsearch.action.admin.indices.settings.get.GetSettingsResponse; import org.elasticsearch.client.Client; -import org.elasticsearch.cluster.metadata.AliasMetaData; +import org.elasticsearch.cluster.metadata.AliasMetadata; import org.elasticsearch.common.collect.ImmutableOpenMap; import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter; import org.springframework.data.elasticsearch.core.document.Document; @@ -133,7 +133,7 @@ class DefaultTransportIndexOperations extends AbstractDefaultIndexOperations imp } @Override - protected List doQueryForAlias(IndexCoordinates index) { + protected List doQueryForAlias(IndexCoordinates index) { GetAliasesRequest getAliasesRequest = requestFactory.getAliasesRequest(index); return client.admin().indices().getAliases(getAliasesRequest).actionGet().getAliases().get(index.getIndexName()); @@ -144,10 +144,10 @@ class DefaultTransportIndexOperations extends AbstractDefaultIndexOperations imp GetAliasesRequest getAliasesRequest = requestFactory.getAliasesRequest(aliasNames, indexNames); - ImmutableOpenMap> aliases = client.admin().indices().getAliases(getAliasesRequest) + ImmutableOpenMap> aliases = client.admin().indices().getAliases(getAliasesRequest) .actionGet().getAliases(); - Map> aliasesResponse = new LinkedHashMap<>(); + Map> aliasesResponse = new LinkedHashMap<>(); aliases.keysIt().forEachRemaining(index -> aliasesResponse.put(index, new HashSet<>(aliases.get(index)))); return requestFactory.convertAliasesResponse(aliasesResponse); } diff --git a/src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchOperations.java b/src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchOperations.java index 884a21c3..8866f2b7 100755 --- a/src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchOperations.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchOperations.java @@ -19,7 +19,7 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import org.elasticsearch.cluster.metadata.AliasMetaData; +import org.elasticsearch.cluster.metadata.AliasMetadata; import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter; import org.springframework.data.elasticsearch.core.document.Document; import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates; @@ -291,7 +291,7 @@ public interface ElasticsearchOperations extends DocumentOperations, SearchOpera * @deprecated since 4.0, use {@link #indexOps(IndexCoordinates)} and {@link IndexOperations#queryForAlias()} */ @Deprecated - default List queryForAlias(String indexName) { + default List queryForAlias(String indexName) { return indexOps(IndexCoordinates.of(indexName)).queryForAlias(); } diff --git a/src/main/java/org/springframework/data/elasticsearch/core/IndexOperations.java b/src/main/java/org/springframework/data/elasticsearch/core/IndexOperations.java index be42d708..8631f461 100644 --- a/src/main/java/org/springframework/data/elasticsearch/core/IndexOperations.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/IndexOperations.java @@ -19,7 +19,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.elasticsearch.cluster.metadata.AliasMetaData; +import org.elasticsearch.cluster.metadata.AliasMetadata; import org.springframework.data.elasticsearch.core.document.Document; import org.springframework.data.elasticsearch.core.index.AliasActions; import org.springframework.data.elasticsearch.core.index.AliasData; @@ -39,7 +39,7 @@ import org.springframework.data.elasticsearch.core.query.AliasQuery; */ public interface IndexOperations { - //region index management + // region index management /** * Create an index. * @@ -73,9 +73,9 @@ public interface IndexOperations { * Refresh the index(es) this IndexOperations is bound to */ void refresh(); - //endregion + // endregion - //region mappings + // region mappings /** * Creates the index mapping for the entity this IndexOperations is bound to. * @@ -119,15 +119,16 @@ public interface IndexOperations { default boolean putMapping(Class clazz) { return putMapping(createMapping(clazz)); } - //endregion + // endregion - //region settings + // region settings /** * Get mapping for an index defined by a class. * * @return the mapping */ Map getMapping(); + /** * Get the index settings. * @@ -142,9 +143,9 @@ public interface IndexOperations { * @return the settings */ Map getSettings(boolean includeDefaults); - //endregion + // endregion - //region aliases + // region aliases /** * Add an alias. * @@ -162,7 +163,7 @@ public interface IndexOperations { * @deprecated since 4.1, use {@link #getAliases(String...)} or {@link #getAliasesForIndex(String...)}. */ @Deprecated - List queryForAlias(); + List queryForAlias(); /** * Remove an alias. @@ -185,6 +186,7 @@ public interface IndexOperations { /** * gets information about aliases + * * @param aliasNames alias names, must not be {@literal null} * @return a {@link Map} from index names to {@link AliasData} for that index * @since 4.1 @@ -193,14 +195,15 @@ public interface IndexOperations { /** * gets information about aliases + * * @param indexNames index names, must not be {@literal null} * @return a {@link Map} from index names to {@link AliasData} for that index * @since 4.1 */ Map> getAliasesForIndex(String... indexNames); - //endregion + // endregion - //region helper functions + // region helper functions /** * get the current {@link IndexCoordinates}. These may change over time when the entity class has a SpEL constructed * index name. When this IndexOperations is not bound to a class, the bound IndexCoordinates are returned. @@ -209,5 +212,5 @@ public interface IndexOperations { * @since 4.1 */ IndexCoordinates getIndexCoordinates(); - //endregion + // endregion } diff --git a/src/main/java/org/springframework/data/elasticsearch/core/RequestFactory.java b/src/main/java/org/springframework/data/elasticsearch/core/RequestFactory.java index da17603a..944a6071 100644 --- a/src/main/java/org/springframework/data/elasticsearch/core/RequestFactory.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/RequestFactory.java @@ -59,7 +59,7 @@ import org.elasticsearch.client.indices.CreateIndexRequest; import org.elasticsearch.client.indices.GetIndexRequest; import org.elasticsearch.client.indices.GetMappingsRequest; import org.elasticsearch.client.indices.PutMappingRequest; -import org.elasticsearch.cluster.metadata.AliasMetaData; +import org.elasticsearch.cluster.metadata.AliasMetadata; import org.elasticsearch.common.collect.ImmutableOpenMap; import org.elasticsearch.common.compress.CompressedXContent; import org.elasticsearch.common.geo.GeoDistance; @@ -482,21 +482,21 @@ class RequestFactory { } public Map> convertAliasesResponse( - ImmutableOpenMap> aliasesResponse) { + ImmutableOpenMap> aliasesResponse) { - Map> mapped = new LinkedHashMap<>(); + Map> mapped = new LinkedHashMap<>(); Iterator keysIt = aliasesResponse.keysIt(); while (keysIt.hasNext()) { String key = keysIt.next(); - List aliasMetaData = aliasesResponse.get(key); + List aliasMetaData = aliasesResponse.get(key); mapped.put(key, new LinkedHashSet<>(aliasMetaData)); } return convertAliasesResponse(mapped); } - public Map> convertAliasesResponse(Map> aliasesResponse) { + public Map> convertAliasesResponse(Map> aliasesResponse) { Map> converted = new LinkedHashMap<>(); aliasesResponse.forEach((index, aliasMetaDataSet) -> { Set aliasDataSet = new LinkedHashSet<>(); diff --git a/src/test/java/org/springframework/data/elasticsearch/core/DocumentAdaptersUnitTests.java b/src/test/java/org/springframework/data/elasticsearch/core/DocumentAdaptersUnitTests.java index 37dca2fd..fe189f59 100644 --- a/src/test/java/org/springframework/data/elasticsearch/core/DocumentAdaptersUnitTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/core/DocumentAdaptersUnitTests.java @@ -140,7 +140,7 @@ public class DocumentAdaptersUnitTests { new DocumentField("field", Collections.singletonList("value"))); SearchShardTarget shard = new SearchShardTarget("node", new ShardId("index", "uuid", 42), null, null); - SearchHit searchHit = new SearchHit(123, "my-id", new Text("type"), fields); + SearchHit searchHit = new SearchHit(123, "my-id", new Text("type"), fields, null); searchHit.shard(shard); searchHit.setSeqNo(1); searchHit.setPrimaryTerm(2); @@ -168,7 +168,7 @@ public class DocumentAdaptersUnitTests { fields.put("string", new DocumentField("string", Collections.singletonList("value"))); fields.put("bool", new DocumentField("bool", Arrays.asList(true, true, false))); - SearchHit searchHit = new SearchHit(123, "my-id", new Text("type"), fields); + SearchHit searchHit = new SearchHit(123, "my-id", new Text("type"), fields, null); SearchDocument document = DocumentAdapters.from(searchHit); @@ -185,7 +185,7 @@ public class DocumentAdaptersUnitTests { fields.put("bool", new DocumentField("bool", Arrays.asList(true, true, false))); fields.put("null", new DocumentField("null", Collections.emptyList())); - SearchHit searchHit = new SearchHit(123, "my-id", new Text("type"), fields); + SearchHit searchHit = new SearchHit(123, "my-id", new Text("type"), fields, null); SearchDocument document = DocumentAdapters.from(searchHit); @@ -202,7 +202,7 @@ public class DocumentAdaptersUnitTests { fields.put("string", new DocumentField("string", Collections.singletonList("value"))); fields.put("bool", new DocumentField("bool", Arrays.asList(true, true, false))); - SearchHit searchHit = new SearchHit(123, "my-id", new Text("type"), fields); + SearchHit searchHit = new SearchHit(123, "my-id", new Text("type"), fields, null); SearchDocument document = DocumentAdapters.from(searchHit); @@ -215,7 +215,7 @@ public class DocumentAdaptersUnitTests { BytesArray source = new BytesArray("{\"field\":\"value\"}"); SearchShardTarget shard = new SearchShardTarget("node", new ShardId("index", "uuid", 42), null, null); - SearchHit searchHit = new SearchHit(123, "my-id", new Text("type"), Collections.emptyMap()); + SearchHit searchHit = new SearchHit(123, "my-id", new Text("type"), Collections.emptyMap(), null); searchHit.shard(shard); searchHit.sourceRef(source).score(42); searchHit.version(22); diff --git a/src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplateTests.java b/src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplateTests.java index 490372ad..2d24c4c6 100755 --- a/src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplateTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplateTests.java @@ -47,7 +47,7 @@ import org.assertj.core.util.Lists; import org.elasticsearch.action.search.SearchRequest; import org.elasticsearch.action.support.IndicesOptions; import org.elasticsearch.action.update.UpdateRequest; -import org.elasticsearch.cluster.metadata.AliasMetaData; +import org.elasticsearch.cluster.metadata.AliasMetadata; import org.elasticsearch.index.VersionType; import org.elasticsearch.script.Script; import org.elasticsearch.script.ScriptType; @@ -2739,7 +2739,7 @@ public abstract class ElasticsearchTemplateTests { indexOperations.addAlias(aliasQuery); // then - List aliases = indexOperations.queryForAlias(); + List aliases = indexOperations.queryForAlias(); assertThat(aliases).isNotNull(); assertThat(aliases.get(0).alias()).isEqualTo(aliasName); } @@ -2753,9 +2753,9 @@ public abstract class ElasticsearchTemplateTests { indexOperations.alias(aliasActions); - List aliases = indexOperations.queryForAlias(); + List aliases = indexOperations.queryForAlias(); assertThat(aliases).hasSize(2); - assertThat(aliases.stream().map(AliasMetaData::alias).collect(Collectors.toList())).contains("aliasA", "aliasB"); + assertThat(aliases.stream().map(AliasMetadata::alias).collect(Collectors.toList())).contains("aliasA", "aliasB"); } @Test // DATAES-864 @@ -2773,7 +2773,7 @@ public abstract class ElasticsearchTemplateTests { indexOperations.alias(aliasActions); - List aliases = indexOperations.queryForAlias(); + List aliases = indexOperations.queryForAlias(); assertThat(aliases).hasSize(0); } @@ -2829,10 +2829,10 @@ public abstract class ElasticsearchTemplateTests { operations.index(indexQuery, IndexCoordinates.of(alias1)); // then - List aliasMetaData = indexOperations.queryForAlias(); + List aliasMetaData = indexOperations.queryForAlias(); assertThat(aliasMetaData).isNotEmpty(); - AliasMetaData aliasMetaData1 = aliasMetaData.get(0); + AliasMetadata aliasMetaData1 = aliasMetaData.get(0); assertThat(aliasMetaData1).isNotNull(); if (aliasMetaData1.alias().equals(alias1)) { assertThat(aliasMetaData1.indexRouting()).isEqualTo("0"); @@ -2842,7 +2842,7 @@ public abstract class ElasticsearchTemplateTests { fail("unknown alias"); } - AliasMetaData aliasMetaData2 = aliasMetaData.get(1); + AliasMetadata aliasMetaData2 = aliasMetaData.get(1); assertThat(aliasMetaData2).isNotNull(); if (aliasMetaData2.alias().equals(alias1)) { assertThat(aliasMetaData2.indexRouting()).isEqualTo("0"); @@ -2894,9 +2894,9 @@ public abstract class ElasticsearchTemplateTests { long count = operations.count(query, IndexCoordinates.of(alias)); // then - List aliases = indexOperations.queryForAlias(); + List aliases = indexOperations.queryForAlias(); assertThat(aliases).isNotNull(); - AliasMetaData aliasMetaData = aliases.get(0); + AliasMetadata aliasMetaData = aliases.get(0); assertThat(aliasMetaData.alias()).isEqualTo(alias); assertThat(aliasMetaData.searchRouting()).isEqualTo("0"); assertThat(aliasMetaData.indexRouting()).isEqualTo("0"); @@ -2919,7 +2919,7 @@ public abstract class ElasticsearchTemplateTests { // when indexOperations.addAlias(aliasQuery); - List aliases = indexOperations.queryForAlias(); + List aliases = indexOperations.queryForAlias(); assertThat(aliases).isNotNull(); assertThat(aliases.get(0).alias()).isEqualTo(aliasName); diff --git a/src/test/resources/test-home-dir/modules/analysis-common/analysis-common-7.7.1.jar b/src/test/resources/test-home-dir/modules/analysis-common/analysis-common-7.8.0.jar similarity index 75% rename from src/test/resources/test-home-dir/modules/analysis-common/analysis-common-7.7.1.jar rename to src/test/resources/test-home-dir/modules/analysis-common/analysis-common-7.8.0.jar index 1ebf4a14..6d669619 100644 Binary files a/src/test/resources/test-home-dir/modules/analysis-common/analysis-common-7.7.1.jar and b/src/test/resources/test-home-dir/modules/analysis-common/analysis-common-7.8.0.jar differ diff --git a/src/test/resources/test-home-dir/modules/analysis-common/plugin-descriptor.properties b/src/test/resources/test-home-dir/modules/analysis-common/plugin-descriptor.properties index 976f2f89..cc693279 100644 --- a/src/test/resources/test-home-dir/modules/analysis-common/plugin-descriptor.properties +++ b/src/test/resources/test-home-dir/modules/analysis-common/plugin-descriptor.properties @@ -20,7 +20,7 @@ description=Adds "built in" analyzers to Elasticsearch. # # 'version': plugin's version -version=7.7.1 +version=7.8.0 # # 'name': the plugin name name=analysis-common @@ -35,7 +35,7 @@ classname=org.elasticsearch.analysis.common.CommonAnalysisPlugin java.version=1.8 # # 'elasticsearch.version': version of elasticsearch compiled against -elasticsearch.version=7.7.1 +elasticsearch.version=7.8.0 ### optional elements for plugins: # # 'extended.plugins': other plugins this plugin extends through SPI diff --git a/src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-dissect-7.7.1.jar b/src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-dissect-7.8.0.jar similarity index 87% rename from src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-dissect-7.7.1.jar rename to src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-dissect-7.8.0.jar index 70314609..f43a0b82 100644 Binary files a/src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-dissect-7.7.1.jar and b/src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-dissect-7.8.0.jar differ diff --git a/src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-grok-7.7.1.jar b/src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-grok-7.8.0.jar similarity index 67% rename from src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-grok-7.7.1.jar rename to src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-grok-7.8.0.jar index dd9c83d5..43b2785e 100644 Binary files a/src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-grok-7.7.1.jar and b/src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-grok-7.8.0.jar differ diff --git a/src/test/resources/test-home-dir/modules/ingest-common/ingest-common-7.7.1.jar b/src/test/resources/test-home-dir/modules/ingest-common/ingest-common-7.8.0.jar similarity index 83% rename from src/test/resources/test-home-dir/modules/ingest-common/ingest-common-7.7.1.jar rename to src/test/resources/test-home-dir/modules/ingest-common/ingest-common-7.8.0.jar index 8cb83e99..aaf99310 100644 Binary files a/src/test/resources/test-home-dir/modules/ingest-common/ingest-common-7.7.1.jar and b/src/test/resources/test-home-dir/modules/ingest-common/ingest-common-7.8.0.jar differ diff --git a/src/test/resources/test-home-dir/modules/ingest-common/plugin-descriptor.properties b/src/test/resources/test-home-dir/modules/ingest-common/plugin-descriptor.properties index 14fe41c7..fd7fea1b 100644 --- a/src/test/resources/test-home-dir/modules/ingest-common/plugin-descriptor.properties +++ b/src/test/resources/test-home-dir/modules/ingest-common/plugin-descriptor.properties @@ -20,7 +20,7 @@ description=Module for ingest processors that do not require additional security permissions or have large dependencies and resources # # 'version': plugin's version -version=7.7.1 +version=7.8.0 # # 'name': the plugin name name=ingest-common @@ -35,7 +35,7 @@ classname=org.elasticsearch.ingest.common.IngestCommonPlugin java.version=1.8 # # 'elasticsearch.version': version of elasticsearch compiled against -elasticsearch.version=7.7.1 +elasticsearch.version=7.8.0 ### 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/lang-expression-7.7.1.jar b/src/test/resources/test-home-dir/modules/lang-expression/lang-expression-7.8.0.jar similarity index 58% rename from src/test/resources/test-home-dir/modules/lang-expression/lang-expression-7.7.1.jar rename to src/test/resources/test-home-dir/modules/lang-expression/lang-expression-7.8.0.jar index f30f83b9..fa1321e3 100644 Binary files a/src/test/resources/test-home-dir/modules/lang-expression/lang-expression-7.7.1.jar and b/src/test/resources/test-home-dir/modules/lang-expression/lang-expression-7.8.0.jar differ 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 f066b85a..89bb327e 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 @@ -20,7 +20,7 @@ description=Lucene expressions integration for Elasticsearch # # 'version': plugin's version -version=7.7.1 +version=7.8.0 # # 'name': the plugin name name=lang-expression @@ -35,7 +35,7 @@ classname=org.elasticsearch.script.expression.ExpressionPlugin java.version=1.8 # # 'elasticsearch.version': version of elasticsearch compiled against -elasticsearch.version=7.7.1 +elasticsearch.version=7.8.0 ### optional elements for plugins: # # 'extended.plugins': other plugins this plugin extends through SPI diff --git a/src/test/resources/test-home-dir/modules/lang-painless/elasticsearch-scripting-painless-spi-7.7.1.jar b/src/test/resources/test-home-dir/modules/lang-painless/elasticsearch-scripting-painless-spi-7.8.0.jar similarity index 87% rename from src/test/resources/test-home-dir/modules/lang-painless/elasticsearch-scripting-painless-spi-7.7.1.jar rename to src/test/resources/test-home-dir/modules/lang-painless/elasticsearch-scripting-painless-spi-7.8.0.jar index 83de15e4..f7a06c41 100644 Binary files a/src/test/resources/test-home-dir/modules/lang-painless/elasticsearch-scripting-painless-spi-7.7.1.jar and b/src/test/resources/test-home-dir/modules/lang-painless/elasticsearch-scripting-painless-spi-7.8.0.jar differ diff --git a/src/test/resources/test-home-dir/modules/lang-painless/lang-painless-7.7.1.jar b/src/test/resources/test-home-dir/modules/lang-painless/lang-painless-7.8.0.jar similarity index 93% rename from src/test/resources/test-home-dir/modules/lang-painless/lang-painless-7.7.1.jar rename to src/test/resources/test-home-dir/modules/lang-painless/lang-painless-7.8.0.jar index 69c18c82..83024592 100644 Binary files a/src/test/resources/test-home-dir/modules/lang-painless/lang-painless-7.7.1.jar and b/src/test/resources/test-home-dir/modules/lang-painless/lang-painless-7.8.0.jar differ diff --git a/src/test/resources/test-home-dir/modules/lang-painless/plugin-descriptor.properties b/src/test/resources/test-home-dir/modules/lang-painless/plugin-descriptor.properties index f821931b..da98f3f1 100644 --- a/src/test/resources/test-home-dir/modules/lang-painless/plugin-descriptor.properties +++ b/src/test/resources/test-home-dir/modules/lang-painless/plugin-descriptor.properties @@ -20,7 +20,7 @@ description=An easy, safe and fast scripting language for Elasticsearch # # 'version': plugin's version -version=7.7.1 +version=7.8.0 # # 'name': the plugin name name=lang-painless @@ -35,7 +35,7 @@ classname=org.elasticsearch.painless.PainlessPlugin java.version=1.8 # # 'elasticsearch.version': version of elasticsearch compiled against -elasticsearch.version=7.7.1 +elasticsearch.version=7.8.0 ### optional elements for plugins: # # 'extended.plugins': other plugins this plugin extends through SPI diff --git a/src/test/resources/test-home-dir/modules/mapper-extras/plugin-descriptor.properties b/src/test/resources/test-home-dir/modules/mapper-extras/plugin-descriptor.properties index 6c32f77a..9fecb3d8 100644 --- a/src/test/resources/test-home-dir/modules/mapper-extras/plugin-descriptor.properties +++ b/src/test/resources/test-home-dir/modules/mapper-extras/plugin-descriptor.properties @@ -20,7 +20,7 @@ description=Adds advanced field mappers # # 'version': plugin's version -version=7.7.1 +version=7.8.0 # # 'name': the plugin name name=mapper-extras @@ -35,7 +35,7 @@ classname=org.elasticsearch.index.mapper.MapperExtrasPlugin java.version=1.8 # # 'elasticsearch.version': version of elasticsearch compiled against -elasticsearch.version=7.7.1 +elasticsearch.version=7.8.0 ### optional elements for plugins: # # 'extended.plugins': other plugins this plugin extends through SPI diff --git a/src/test/resources/test-home-dir/modules/reindex/plugin-descriptor.properties b/src/test/resources/test-home-dir/modules/reindex/plugin-descriptor.properties index 73cf9244..b7f269bc 100644 --- a/src/test/resources/test-home-dir/modules/reindex/plugin-descriptor.properties +++ b/src/test/resources/test-home-dir/modules/reindex/plugin-descriptor.properties @@ -20,7 +20,7 @@ description=The Reindex module adds APIs to reindex from one index to another or update documents in place. # # 'version': plugin's version -version=7.7.1 +version=7.8.0 # # 'name': the plugin name name=reindex @@ -35,7 +35,7 @@ classname=org.elasticsearch.index.reindex.ReindexPlugin java.version=1.8 # # 'elasticsearch.version': version of elasticsearch compiled against -elasticsearch.version=7.7.1 +elasticsearch.version=7.8.0 ### optional elements for plugins: # # 'extended.plugins': other plugins this plugin extends through SPI diff --git a/src/test/resources/test-home-dir/modules/repository-url/plugin-descriptor.properties b/src/test/resources/test-home-dir/modules/repository-url/plugin-descriptor.properties index e7117d26..62064465 100644 --- a/src/test/resources/test-home-dir/modules/repository-url/plugin-descriptor.properties +++ b/src/test/resources/test-home-dir/modules/repository-url/plugin-descriptor.properties @@ -20,7 +20,7 @@ description=Module for URL repository # # 'version': plugin's version -version=7.7.1 +version=7.8.0 # # 'name': the plugin name name=repository-url @@ -35,7 +35,7 @@ classname=org.elasticsearch.plugin.repository.url.URLRepositoryPlugin java.version=1.8 # # 'elasticsearch.version': version of elasticsearch compiled against -elasticsearch.version=7.7.1 +elasticsearch.version=7.8.0 ### optional elements for plugins: # # 'extended.plugins': other plugins this plugin extends through SPI diff --git a/src/test/resources/test-home-dir/modules/repository-url/repository-url-7.7.1.jar b/src/test/resources/test-home-dir/modules/repository-url/repository-url-7.7.1.jar deleted file mode 100644 index c3b47b7a..00000000 Binary files a/src/test/resources/test-home-dir/modules/repository-url/repository-url-7.7.1.jar and /dev/null differ diff --git a/src/test/resources/test-home-dir/modules/repository-url/repository-url-7.8.0.jar b/src/test/resources/test-home-dir/modules/repository-url/repository-url-7.8.0.jar new file mode 100644 index 00000000..3d31b03e Binary files /dev/null and b/src/test/resources/test-home-dir/modules/repository-url/repository-url-7.8.0.jar differ