diff --git a/pom.xml b/pom.xml index 4b990ec3e..d790d6756 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ 2.6 - 7.4.1 + 7.5.1 2.9.1 2.3.0.BUILD-SNAPSHOT 4.1.39.Final diff --git a/src/main/asciidoc/preface.adoc b/src/main/asciidoc/preface.adoc index 1cec65a97..60ddff34b 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 -| Neumannfootnote:cdv[Currently in development] |4.0.xfootnote:cdv[]|7.4.1 |2.3.xfootnote:cdv[] +| Neumannfootnote:cdv[Currently in development] |4.0.xfootnote:cdv[]|7.5.1 |2.3.xfootnote:cdv[] | Moore | 3.2.x |6.8.4 | 2.2.x | Lovelace | 3.1.x | 6.2.2 |2.1.x | Kayfootnote:oom[Out of maintenance] | 3.0.xfootnote:oom[] | 5.5.0 | 2.0.xfootnote:oom[] diff --git a/src/main/asciidoc/reference/elasticsearch-new.adoc b/src/main/asciidoc/reference/elasticsearch-new.adoc index fc8449a08..807d3d62d 100644 --- a/src/main/asciidoc/reference/elasticsearch-new.adoc +++ b/src/main/asciidoc/reference/elasticsearch-new.adoc @@ -5,7 +5,7 @@ == New in Spring Data Elasticsearch 4.0 * Uses Spring 5.2. -* Upgrade to Elasticsearch 7.4.1. +* Upgrade to Elasticsearch 7.5.1. * Deprecation of `TransportClient` usage. * Implements most of the mapping-types available for the index mappings. * Removal of the Jackson `ObjectMapper`, now using the <> diff --git a/src/main/java/org/springframework/data/elasticsearch/client/util/RequestConverters.java b/src/main/java/org/springframework/data/elasticsearch/client/util/RequestConverters.java index 65a5be626..ab428764f 100644 --- a/src/main/java/org/springframework/data/elasticsearch/client/util/RequestConverters.java +++ b/src/main/java/org/springframework/data/elasticsearch/client/util/RequestConverters.java @@ -77,6 +77,7 @@ import org.elasticsearch.common.xcontent.XContentHelper; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.index.VersionType; +import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.index.rankeval.RankEvalRequest; import org.elasticsearch.index.reindex.AbstractBulkByScrollRequest; import org.elasticsearch.index.reindex.DeleteByQueryRequest; @@ -183,7 +184,9 @@ public class RequestConverters { metadata.field("_index", action.index()); } if (Strings.hasLength(action.type())) { - metadata.field("_type", action.type()); + if (MapperService.SINGLE_MAPPING_NAME.equals(action.type()) == false) { + metadata.field("_type", action.type()); + } } if (Strings.hasLength(action.id())) { metadata.field("_id", action.id()); @@ -201,11 +204,14 @@ public class RequestConverters { metadata.field("version_type", "external"); } else if (versionType == VersionType.EXTERNAL_GTE) { metadata.field("version_type", "external_gte"); - } else if (versionType == VersionType.FORCE) { - metadata.field("version_type", "force"); } } + if (action.ifSeqNo() != SequenceNumbers.UNASSIGNED_SEQ_NO) { + metadata.field("if_seq_no", action.ifSeqNo()); + metadata.field("if_primary_term", action.ifPrimaryTerm()); + } + if (opType == DocWriteRequest.OpType.INDEX || opType == DocWriteRequest.OpType.CREATE) { IndexRequest indexRequest = (IndexRequest) action; if (Strings.hasLength(indexRequest.getPipeline())) { diff --git a/src/test/java/org/springframework/data/elasticsearch/core/CriteriaQueryMappingTests.java b/src/test/java/org/springframework/data/elasticsearch/core/CriteriaQueryMappingTests.java index 3176498e4..ee82bef3b 100644 --- a/src/test/java/org/springframework/data/elasticsearch/core/CriteriaQueryMappingTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/core/CriteriaQueryMappingTests.java @@ -99,6 +99,6 @@ public class CriteriaQueryMappingTests { @Field(name = "first-name") String firstName; @Field(name = "last-name") String lastName; @Field(name = "birth-date", type = FieldType.Date, format = DateFormat.custom, - pattern = "dd.MM.yyyy") LocalDate birthDate; + pattern = "dd.MM.uuuu") LocalDate birthDate; } } diff --git a/src/test/java/org/springframework/data/elasticsearch/core/convert/ElasticsearchDateConverterTests.java b/src/test/java/org/springframework/data/elasticsearch/core/convert/ElasticsearchDateConverterTests.java index 50fe532f3..a05f734b5 100644 --- a/src/test/java/org/springframework/data/elasticsearch/core/convert/ElasticsearchDateConverterTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/core/convert/ElasticsearchDateConverterTests.java @@ -21,7 +21,7 @@ class ElasticsearchDateConverterTests { if (dateFormat == DateFormat.none) { return; } - String pattern = (dateFormat != DateFormat.custom) ? dateFormat.name() : "dd.MM.yyyy"; + String pattern = (dateFormat != DateFormat.custom) ? dateFormat.name() : "dd.MM.uuuu"; ElasticsearchDateConverter converter = ElasticsearchDateConverter.of(pattern); diff --git a/src/test/java/org/springframework/data/elasticsearch/core/convert/MappingElasticsearchConverterUnitTests.java b/src/test/java/org/springframework/data/elasticsearch/core/convert/MappingElasticsearchConverterUnitTests.java index 2c92e4963..daa24cfcc 100644 --- a/src/test/java/org/springframework/data/elasticsearch/core/convert/MappingElasticsearchConverterUnitTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/core/convert/MappingElasticsearchConverterUnitTests.java @@ -643,7 +643,7 @@ public class MappingElasticsearchConverterUnitTests { @Field(name = "first-name") String firstName; @Field(name = "last-name") String lastName; @Field(name = "birth-date", type = FieldType.Date, format = DateFormat.custom, - pattern = "dd.MM.yyyy") LocalDate birthDate; + pattern = "dd.MM.uuuu") LocalDate birthDate; Gender gender; Address address; diff --git a/src/test/java/org/springframework/data/elasticsearch/core/index/SimpleElasticsearchDateMappingTests.java b/src/test/java/org/springframework/data/elasticsearch/core/index/SimpleElasticsearchDateMappingTests.java index 8e2f19611..1c3230b27 100644 --- a/src/test/java/org/springframework/data/elasticsearch/core/index/SimpleElasticsearchDateMappingTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/core/index/SimpleElasticsearchDateMappingTests.java @@ -21,6 +21,7 @@ import static org.springframework.data.elasticsearch.annotations.FieldType.*; import lombok.Data; import java.io.IOException; +import java.time.LocalDateTime; import java.util.Date; import org.junit.jupiter.api.Test; @@ -39,7 +40,7 @@ import org.springframework.data.elasticsearch.annotations.FieldType; public class SimpleElasticsearchDateMappingTests extends MappingContextBaseTests { private static final String EXPECTED_MAPPING = "{\"properties\":{\"message\":{\"store\":true," - + "\"type\":\"text\",\"index\":false,\"analyzer\":\"standard\"},\"customFormatDate\":{\"type\":\"date\",\"format\":\"dd.MM.yyyy hh:mm\"}," + + "\"type\":\"text\",\"index\":false,\"analyzer\":\"standard\"},\"customFormatDate\":{\"type\":\"date\",\"format\":\"dd.MM.uuuu hh:mm\"}," + "\"defaultFormatDate\":{\"type\":\"date\"},\"basicFormatDate\":{\"" + "type\":\"date\",\"format\":\"basic_date\"}}}"; @@ -64,10 +65,10 @@ public class SimpleElasticsearchDateMappingTests extends MappingContextBaseTests @Field(type = Text, index = false, store = true, analyzer = "standard") private String message; @Field(type = Date, format = DateFormat.custom, - pattern = "dd.MM.yyyy hh:mm") private java.util.Date customFormatDate; + pattern = "dd.MM.uuuu hh:mm") private LocalDateTime customFormatDate; - @Field(type = FieldType.Date) private Date defaultFormatDate; + @Field(type = FieldType.Date) private LocalDateTime defaultFormatDate; - @Field(type = FieldType.Date, format = DateFormat.basic_date) private Date basicFormatDate; + @Field(type = FieldType.Date, format = DateFormat.basic_date) private LocalDateTime basicFormatDate; } } diff --git a/src/test/java/org/springframework/data/elasticsearch/core/mapping/SimpleElasticsearchPersistentPropertyUnitTests.java b/src/test/java/org/springframework/data/elasticsearch/core/mapping/SimpleElasticsearchPersistentPropertyUnitTests.java index 38da81b2a..083d4743b 100644 --- a/src/test/java/org/springframework/data/elasticsearch/core/mapping/SimpleElasticsearchPersistentPropertyUnitTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/core/mapping/SimpleElasticsearchPersistentPropertyUnitTests.java @@ -123,7 +123,7 @@ public class SimpleElasticsearchPersistentPropertyUnitTests { static class DatesProperty { @Field(type = FieldType.Date, format = DateFormat.basic_date) Date date; - @Field(type = FieldType.Date, format = DateFormat.custom, pattern = "dd.MM.yyyy") LocalDate localDate; + @Field(type = FieldType.Date, format = DateFormat.custom, pattern = "dd.MM.uuuu") LocalDate localDate; @Field(type = FieldType.Date, format = DateFormat.basic_date_time) LocalDateTime localDateTime; } } diff --git a/src/test/resources/test-home-dir/modules/analysis-common/analysis-common-7.4.1.jar b/src/test/resources/test-home-dir/modules/analysis-common/analysis-common-7.5.1.jar similarity index 88% rename from src/test/resources/test-home-dir/modules/analysis-common/analysis-common-7.4.1.jar rename to src/test/resources/test-home-dir/modules/analysis-common/analysis-common-7.5.1.jar index b63aaa003..8c77e44ce 100644 Binary files a/src/test/resources/test-home-dir/modules/analysis-common/analysis-common-7.4.1.jar and b/src/test/resources/test-home-dir/modules/analysis-common/analysis-common-7.5.1.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 cba78bbaa..48b3dc4ce 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.4.1 +version=7.5.1 # # '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.4.1 +elasticsearch.version=7.5.1 ### 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.4.1.jar b/src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-dissect-7.5.1.jar similarity index 86% rename from src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-dissect-7.4.1.jar rename to src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-dissect-7.5.1.jar index eb0aee19f..a209b8177 100644 Binary files a/src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-dissect-7.4.1.jar and b/src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-dissect-7.5.1.jar differ diff --git a/src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-grok-7.4.1.jar b/src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-grok-7.5.1.jar similarity index 68% rename from src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-grok-7.4.1.jar rename to src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-grok-7.5.1.jar index 8400a15a6..553c5829d 100644 Binary files a/src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-grok-7.4.1.jar and b/src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-grok-7.5.1.jar differ diff --git a/src/test/resources/test-home-dir/modules/ingest-common/ingest-common-7.4.1.jar b/src/test/resources/test-home-dir/modules/ingest-common/ingest-common-7.5.1.jar similarity index 84% rename from src/test/resources/test-home-dir/modules/ingest-common/ingest-common-7.4.1.jar rename to src/test/resources/test-home-dir/modules/ingest-common/ingest-common-7.5.1.jar index 3b872af32..38881033b 100644 Binary files a/src/test/resources/test-home-dir/modules/ingest-common/ingest-common-7.4.1.jar and b/src/test/resources/test-home-dir/modules/ingest-common/ingest-common-7.5.1.jar differ diff --git a/src/test/resources/test-home-dir/modules/ingest-common/joni-2.1.29.jar b/src/test/resources/test-home-dir/modules/ingest-common/joni-2.1.29.jar new file mode 100644 index 000000000..ede74030a Binary files /dev/null and b/src/test/resources/test-home-dir/modules/ingest-common/joni-2.1.29.jar differ diff --git a/src/test/resources/test-home-dir/modules/ingest-common/joni-2.1.6.jar b/src/test/resources/test-home-dir/modules/ingest-common/joni-2.1.6.jar deleted file mode 100644 index 7ec4d1507..000000000 Binary files a/src/test/resources/test-home-dir/modules/ingest-common/joni-2.1.6.jar and /dev/null 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 8d4910dad..008a57f4a 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.4.1 +version=7.5.1 # # '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.4.1 +elasticsearch.version=7.5.1 ### 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.4.1.jar b/src/test/resources/test-home-dir/modules/lang-expression/lang-expression-7.5.1.jar similarity index 85% rename from src/test/resources/test-home-dir/modules/lang-expression/lang-expression-7.4.1.jar rename to src/test/resources/test-home-dir/modules/lang-expression/lang-expression-7.5.1.jar index 0889a1e24..59e466244 100644 Binary files a/src/test/resources/test-home-dir/modules/lang-expression/lang-expression-7.4.1.jar and b/src/test/resources/test-home-dir/modules/lang-expression/lang-expression-7.5.1.jar differ diff --git a/src/test/resources/test-home-dir/modules/lang-expression/lucene-expressions-8.2.0.jar b/src/test/resources/test-home-dir/modules/lang-expression/lucene-expressions-8.3.0.jar similarity index 91% rename from src/test/resources/test-home-dir/modules/lang-expression/lucene-expressions-8.2.0.jar rename to src/test/resources/test-home-dir/modules/lang-expression/lucene-expressions-8.3.0.jar index 3f93fbc86..b870ca615 100644 Binary files a/src/test/resources/test-home-dir/modules/lang-expression/lucene-expressions-8.2.0.jar and b/src/test/resources/test-home-dir/modules/lang-expression/lucene-expressions-8.3.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 9c61a39de..dffbd1fbb 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.4.1 +version=7.5.1 # # '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.4.1 +elasticsearch.version=7.5.1 ### 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/plugin-security.policy b/src/test/resources/test-home-dir/modules/lang-expression/plugin-security.policy index 292c8614c..4835ab053 100644 --- a/src/test/resources/test-home-dir/modules/lang-expression/plugin-security.policy +++ b/src/test/resources/test-home-dir/modules/lang-expression/plugin-security.policy @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * https://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an diff --git a/src/test/resources/test-home-dir/modules/lang-painless/elasticsearch-scripting-painless-spi-7.4.1.jar b/src/test/resources/test-home-dir/modules/lang-painless/elasticsearch-scripting-painless-spi-7.5.1.jar similarity index 87% rename from src/test/resources/test-home-dir/modules/lang-painless/elasticsearch-scripting-painless-spi-7.4.1.jar rename to src/test/resources/test-home-dir/modules/lang-painless/elasticsearch-scripting-painless-spi-7.5.1.jar index 7043e4273..09a604504 100644 Binary files a/src/test/resources/test-home-dir/modules/lang-painless/elasticsearch-scripting-painless-spi-7.4.1.jar and b/src/test/resources/test-home-dir/modules/lang-painless/elasticsearch-scripting-painless-spi-7.5.1.jar differ diff --git a/src/test/resources/test-home-dir/modules/lang-painless/lang-painless-7.4.1.jar b/src/test/resources/test-home-dir/modules/lang-painless/lang-painless-7.4.1.jar deleted file mode 100644 index ecfdfefff..000000000 Binary files a/src/test/resources/test-home-dir/modules/lang-painless/lang-painless-7.4.1.jar and /dev/null differ diff --git a/src/test/resources/test-home-dir/modules/lang-painless/lang-painless-7.5.1.jar b/src/test/resources/test-home-dir/modules/lang-painless/lang-painless-7.5.1.jar new file mode 100644 index 000000000..f6ae23cdf Binary files /dev/null and b/src/test/resources/test-home-dir/modules/lang-painless/lang-painless-7.5.1.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 a603ccf38..e2ff62e8a 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.4.1 +version=7.5.1 # # '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.4.1 +elasticsearch.version=7.5.1 ### 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/plugin-security.policy b/src/test/resources/test-home-dir/modules/lang-painless/plugin-security.policy index f4d757447..b383c6da3 100644 --- a/src/test/resources/test-home-dir/modules/lang-painless/plugin-security.policy +++ b/src/test/resources/test-home-dir/modules/lang-painless/plugin-security.policy @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * https://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an 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 bd5a7ecea..1e5e098c2 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.4.1 +version=7.5.1 # # '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.4.1 +elasticsearch.version=7.5.1 ### 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 e49908e3f..a1503106d 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.4.1 +version=7.5.1 # # '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.4.1 +elasticsearch.version=7.5.1 ### 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-security.policy b/src/test/resources/test-home-dir/modules/reindex/plugin-security.policy index e59570988..a2482eaf4 100644 --- a/src/test/resources/test-home-dir/modules/reindex/plugin-security.policy +++ b/src/test/resources/test-home-dir/modules/reindex/plugin-security.policy @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * https://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an 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 19742f641..6507a11e2 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.4.1 +version=7.5.1 # # '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.4.1 +elasticsearch.version=7.5.1 ### 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-security.policy b/src/test/resources/test-home-dir/modules/repository-url/plugin-security.policy index 1959e8a14..b878c4857 100644 --- a/src/test/resources/test-home-dir/modules/repository-url/plugin-security.policy +++ b/src/test/resources/test-home-dir/modules/repository-url/plugin-security.policy @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * https://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an diff --git a/src/test/resources/test-home-dir/modules/repository-url/repository-url-7.4.1.jar b/src/test/resources/test-home-dir/modules/repository-url/repository-url-7.5.1.jar similarity index 81% rename from src/test/resources/test-home-dir/modules/repository-url/repository-url-7.4.1.jar rename to src/test/resources/test-home-dir/modules/repository-url/repository-url-7.5.1.jar index 973eba005..07ab80290 100644 Binary files a/src/test/resources/test-home-dir/modules/repository-url/repository-url-7.4.1.jar and b/src/test/resources/test-home-dir/modules/repository-url/repository-url-7.5.1.jar differ