From aa8ee74c6c644767efe252d6a6d5fca821435a09 Mon Sep 17 00:00:00 2001 From: Jason Tedor Date: Mon, 29 Feb 2016 10:21:39 -0500 Subject: [PATCH] Bump Elasticsearch version to 5.0.0-SNAPSHOT This commit bumps the Elasticsearch version to 5.0.0-SNAPSHOT in line with the alignment of versions across the stack. Closes #16862 --- buildSrc/version.properties | 2 +- .../main/java/org/elasticsearch/Version.java | 10 ++-- .../cluster/metadata/IndexMetaData.java | 6 +-- .../cluster/routing/ShardRouting.java | 2 +- .../gateway/PrimaryShardAllocator.java | 4 +- .../index/analysis/AnalysisService.java | 2 +- .../index/mapper/FieldMapper.java | 2 +- .../index/mapper/core/ByteFieldMapper.java | 2 +- .../index/mapper/core/DateFieldMapper.java | 2 +- .../index/mapper/core/DoubleFieldMapper.java | 2 +- .../index/mapper/core/FloatFieldMapper.java | 2 +- .../index/mapper/core/IntegerFieldMapper.java | 2 +- .../index/mapper/core/LongFieldMapper.java | 2 +- .../index/mapper/core/ShortFieldMapper.java | 2 +- .../index/mapper/core/StringFieldMapper.java | 2 +- .../index/mapper/core/TypeParsers.java | 8 ++-- .../mapper/internal/SourceFieldMapper.java | 4 +- .../percolator/PercolatorService.java | 2 +- .../index/analysis/AnalysisServiceTests.java | 7 ++- .../query/SpanNearQueryBuilderTests.java | 2 +- docs/reference/query-dsl/fuzzy-query.asciidoc | 2 +- .../query-dsl/parent-id-query.asciidoc | 2 +- docs/reference/search/percolate.asciidoc | 6 +-- docs/resiliency/index.asciidoc | 6 +-- migrate.sh | 6 +-- .../plugin-descriptor.properties | 48 ------------------- 26 files changed, 44 insertions(+), 93 deletions(-) delete mode 100644 plugins/repository-s3/generated-resources/plugin-descriptor.properties diff --git a/buildSrc/version.properties b/buildSrc/version.properties index 3c2c86c502a..54b16db2cb1 100644 --- a/buildSrc/version.properties +++ b/buildSrc/version.properties @@ -1,4 +1,4 @@ -elasticsearch = 3.0.0 +elasticsearch = 5.0.0 lucene = 5.5.0 # optional dependencies diff --git a/core/src/main/java/org/elasticsearch/Version.java b/core/src/main/java/org/elasticsearch/Version.java index 07fb07a2dfa..1c9a5464bb2 100644 --- a/core/src/main/java/org/elasticsearch/Version.java +++ b/core/src/main/java/org/elasticsearch/Version.java @@ -264,9 +264,9 @@ public class Version { public static final Version V_2_2_0 = new Version(V_2_2_0_ID, org.apache.lucene.util.Version.LUCENE_5_4_1); public static final int V_2_3_0_ID = 2030099; public static final Version V_2_3_0 = new Version(V_2_3_0_ID, org.apache.lucene.util.Version.LUCENE_5_5_0); - public static final int V_3_0_0_ID = 3000099; - public static final Version V_3_0_0 = new Version(V_3_0_0_ID, org.apache.lucene.util.Version.LUCENE_5_5_0); - public static final Version CURRENT = V_3_0_0; + public static final int V_5_0_0_ID = 5000099; + public static final Version V_5_0_0 = new Version(V_5_0_0_ID, org.apache.lucene.util.Version.LUCENE_5_5_0); + public static final Version CURRENT = V_5_0_0; static { assert CURRENT.luceneVersion.equals(org.apache.lucene.util.Version.LATEST) : "Version must be upgraded to [" @@ -279,8 +279,8 @@ public class Version { public static Version fromId(int id) { switch (id) { - case V_3_0_0_ID: - return V_3_0_0; + case V_5_0_0_ID: + return V_5_0_0; case V_2_3_0_ID: return V_2_3_0; case V_2_2_0_ID: diff --git a/core/src/main/java/org/elasticsearch/cluster/metadata/IndexMetaData.java b/core/src/main/java/org/elasticsearch/cluster/metadata/IndexMetaData.java index f8822ceb281..7b4d5a68cec 100644 --- a/core/src/main/java/org/elasticsearch/cluster/metadata/IndexMetaData.java +++ b/core/src/main/java/org/elasticsearch/cluster/metadata/IndexMetaData.java @@ -913,11 +913,11 @@ public class IndexMetaData implements Diffable, FromXContentBuild } } } else if ("warmers".equals(currentFieldName)) { - // TODO: do this in 4.0: + // TODO: do this in 6.0: // throw new IllegalArgumentException("Warmers are not supported anymore - are you upgrading from 1.x?"); - // ignore: warmers have been removed in 3.0 and are + // ignore: warmers have been removed in 5.0 and are // simply ignored when upgrading from 2.x - assert Version.CURRENT.major <= 3; + assert Version.CURRENT.major <= 5; parser.skipChildren(); } else { // check if its a custom index metadata diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/ShardRouting.java b/core/src/main/java/org/elasticsearch/cluster/routing/ShardRouting.java index 336b6547de4..cfa33e4f225 100644 --- a/core/src/main/java/org/elasticsearch/cluster/routing/ShardRouting.java +++ b/core/src/main/java/org/elasticsearch/cluster/routing/ShardRouting.java @@ -266,7 +266,7 @@ public final class ShardRouting implements Streamable, ToXContent { return false; } - if (indexMetaData.activeAllocationIds(id()).isEmpty() && indexMetaData.getCreationVersion().onOrAfter(Version.V_3_0_0)) { + if (indexMetaData.activeAllocationIds(id()).isEmpty() && indexMetaData.getCreationVersion().onOrAfter(Version.V_5_0_0)) { // when no shards with this id have ever been active for this index return false; } diff --git a/core/src/main/java/org/elasticsearch/gateway/PrimaryShardAllocator.java b/core/src/main/java/org/elasticsearch/gateway/PrimaryShardAllocator.java index 32963d5189c..ed61aa2c1fd 100644 --- a/core/src/main/java/org/elasticsearch/gateway/PrimaryShardAllocator.java +++ b/core/src/main/java/org/elasticsearch/gateway/PrimaryShardAllocator.java @@ -113,7 +113,7 @@ public abstract class PrimaryShardAllocator extends AbstractComponent { final boolean enoughAllocationsFound; if (lastActiveAllocationIds.isEmpty()) { - assert Version.indexCreated(indexMetaData.getSettings()).before(Version.V_3_0_0) : "trying to allocated a primary with an empty allocation id set, but index is new"; + assert Version.indexCreated(indexMetaData.getSettings()).before(Version.V_5_0_0) : "trying to allocated a primary with an empty allocation id set, but index is new"; // when we load an old index (after upgrading cluster) or restore a snapshot of an old index // fall back to old version-based allocation mode // Note that once the shard has been active, lastActiveAllocationIds will be non-empty @@ -123,7 +123,7 @@ public abstract class PrimaryShardAllocator extends AbstractComponent { } else { enoughAllocationsFound = isEnoughVersionBasedAllocationsFound(indexMetaData, nodeShardsResult); } - logger.debug("[{}][{}]: version-based allocation for pre-{} index found {} allocations of {}", shard.index(), shard.id(), Version.V_3_0_0, nodeShardsResult.allocationsFound, shard); + logger.debug("[{}][{}]: version-based allocation for pre-{} index found {} allocations of {}", shard.index(), shard.id(), Version.V_5_0_0, nodeShardsResult.allocationsFound, shard); } else { assert lastActiveAllocationIds.isEmpty() == false; // use allocation ids to select nodes diff --git a/core/src/main/java/org/elasticsearch/index/analysis/AnalysisService.java b/core/src/main/java/org/elasticsearch/index/analysis/AnalysisService.java index 22a560dc372..09e96f3743b 100644 --- a/core/src/main/java/org/elasticsearch/index/analysis/AnalysisService.java +++ b/core/src/main/java/org/elasticsearch/index/analysis/AnalysisService.java @@ -127,7 +127,7 @@ public class AnalysisService extends AbstractIndexComponent implements Closeable } if (analyzers.containsKey("default_index")) { final Version createdVersion = indexSettings.getIndexVersionCreated(); - if (createdVersion.onOrAfter(Version.V_3_0_0)) { + if (createdVersion.onOrAfter(Version.V_5_0_0)) { throw new IllegalArgumentException("setting [index.analysis.analyzer.default_index] is not supported anymore, use [index.analysis.analyzer.default] instead for index [" + index().getName() + "]"); } else { deprecationLogger.deprecated("setting [index.analysis.analyzer.default_index] is deprecated, use [index.analysis.analyzer.default] instead for index [{}]", index().getName()); diff --git a/core/src/main/java/org/elasticsearch/index/mapper/FieldMapper.java b/core/src/main/java/org/elasticsearch/index/mapper/FieldMapper.java index 1436fd9a48a..e40d711cb6c 100644 --- a/core/src/main/java/org/elasticsearch/index/mapper/FieldMapper.java +++ b/core/src/main/java/org/elasticsearch/index/mapper/FieldMapper.java @@ -230,7 +230,7 @@ public abstract class FieldMapper extends Mapper implements Cloneable { } protected boolean defaultDocValues(Version indexCreated) { - if (indexCreated.onOrAfter(Version.V_3_0_0)) { + if (indexCreated.onOrAfter(Version.V_5_0_0)) { // add doc values by default to keyword (boolean, numerics, etc.) fields return fieldType.tokenized() == false; } else { diff --git a/core/src/main/java/org/elasticsearch/index/mapper/core/ByteFieldMapper.java b/core/src/main/java/org/elasticsearch/index/mapper/core/ByteFieldMapper.java index 91019f0aa3f..5944bb7fb1c 100644 --- a/core/src/main/java/org/elasticsearch/index/mapper/core/ByteFieldMapper.java +++ b/core/src/main/java/org/elasticsearch/index/mapper/core/ByteFieldMapper.java @@ -252,7 +252,7 @@ public class ByteFieldMapper extends NumberFieldMapper { context.allEntries().addText(fieldType().name(), fieldType().nullValueAsString(), boost); } } else if (parser.currentToken() == XContentParser.Token.START_OBJECT - && Version.indexCreated(context.indexSettings()).before(Version.V_3_0_0)) { + && Version.indexCreated(context.indexSettings()).before(Version.V_5_0_0)) { XContentParser.Token token; String currentFieldName = null; Byte objValue = fieldType().nullValue(); diff --git a/core/src/main/java/org/elasticsearch/index/mapper/core/DateFieldMapper.java b/core/src/main/java/org/elasticsearch/index/mapper/core/DateFieldMapper.java index 5a355e2f3d4..7975228ec0b 100644 --- a/core/src/main/java/org/elasticsearch/index/mapper/core/DateFieldMapper.java +++ b/core/src/main/java/org/elasticsearch/index/mapper/core/DateFieldMapper.java @@ -478,7 +478,7 @@ public class DateFieldMapper extends NumberFieldMapper { } else if (token == XContentParser.Token.VALUE_NUMBER) { dateAsString = parser.text(); } else if (token == XContentParser.Token.START_OBJECT - && Version.indexCreated(context.indexSettings()).before(Version.V_3_0_0)) { + && Version.indexCreated(context.indexSettings()).before(Version.V_5_0_0)) { String currentFieldName = null; while ((token = parser.nextToken()) != XContentParser.Token.END_OBJECT) { if (token == XContentParser.Token.FIELD_NAME) { diff --git a/core/src/main/java/org/elasticsearch/index/mapper/core/DoubleFieldMapper.java b/core/src/main/java/org/elasticsearch/index/mapper/core/DoubleFieldMapper.java index 50ce90aa6c3..cab949c19f5 100644 --- a/core/src/main/java/org/elasticsearch/index/mapper/core/DoubleFieldMapper.java +++ b/core/src/main/java/org/elasticsearch/index/mapper/core/DoubleFieldMapper.java @@ -244,7 +244,7 @@ public class DoubleFieldMapper extends NumberFieldMapper { context.allEntries().addText(fieldType().name(), fieldType().nullValueAsString(), boost); } } else if (parser.currentToken() == XContentParser.Token.START_OBJECT - && Version.indexCreated(context.indexSettings()).before(Version.V_3_0_0)) { + && Version.indexCreated(context.indexSettings()).before(Version.V_5_0_0)) { XContentParser.Token token; String currentFieldName = null; Double objValue = fieldType().nullValue(); diff --git a/core/src/main/java/org/elasticsearch/index/mapper/core/FloatFieldMapper.java b/core/src/main/java/org/elasticsearch/index/mapper/core/FloatFieldMapper.java index c30e307758c..9c3715fcb47 100644 --- a/core/src/main/java/org/elasticsearch/index/mapper/core/FloatFieldMapper.java +++ b/core/src/main/java/org/elasticsearch/index/mapper/core/FloatFieldMapper.java @@ -256,7 +256,7 @@ public class FloatFieldMapper extends NumberFieldMapper { context.allEntries().addText(fieldType().name(), fieldType().nullValueAsString(), boost); } } else if (parser.currentToken() == XContentParser.Token.START_OBJECT - && Version.indexCreated(context.indexSettings()).before(Version.V_3_0_0)) { + && Version.indexCreated(context.indexSettings()).before(Version.V_5_0_0)) { XContentParser.Token token; String currentFieldName = null; Float objValue = fieldType().nullValue(); diff --git a/core/src/main/java/org/elasticsearch/index/mapper/core/IntegerFieldMapper.java b/core/src/main/java/org/elasticsearch/index/mapper/core/IntegerFieldMapper.java index e37b715278f..3c30e1b644f 100644 --- a/core/src/main/java/org/elasticsearch/index/mapper/core/IntegerFieldMapper.java +++ b/core/src/main/java/org/elasticsearch/index/mapper/core/IntegerFieldMapper.java @@ -261,7 +261,7 @@ public class IntegerFieldMapper extends NumberFieldMapper { context.allEntries().addText(fieldType().name(), fieldType().nullValueAsString(), boost); } } else if (parser.currentToken() == XContentParser.Token.START_OBJECT - && Version.indexCreated(context.indexSettings()).before(Version.V_3_0_0)) { + && Version.indexCreated(context.indexSettings()).before(Version.V_5_0_0)) { XContentParser.Token token; String currentFieldName = null; Integer objValue = fieldType().nullValue(); diff --git a/core/src/main/java/org/elasticsearch/index/mapper/core/LongFieldMapper.java b/core/src/main/java/org/elasticsearch/index/mapper/core/LongFieldMapper.java index 51375a6903d..3f774e90a10 100644 --- a/core/src/main/java/org/elasticsearch/index/mapper/core/LongFieldMapper.java +++ b/core/src/main/java/org/elasticsearch/index/mapper/core/LongFieldMapper.java @@ -249,7 +249,7 @@ public class LongFieldMapper extends NumberFieldMapper { context.allEntries().addText(fieldType().name(), fieldType().nullValueAsString(), boost); } } else if (parser.currentToken() == XContentParser.Token.START_OBJECT - && Version.indexCreated(context.indexSettings()).before(Version.V_3_0_0)) { + && Version.indexCreated(context.indexSettings()).before(Version.V_5_0_0)) { XContentParser.Token token; String currentFieldName = null; Long objValue = fieldType().nullValue(); diff --git a/core/src/main/java/org/elasticsearch/index/mapper/core/ShortFieldMapper.java b/core/src/main/java/org/elasticsearch/index/mapper/core/ShortFieldMapper.java index 2eead1a124b..0ced9d39b89 100644 --- a/core/src/main/java/org/elasticsearch/index/mapper/core/ShortFieldMapper.java +++ b/core/src/main/java/org/elasticsearch/index/mapper/core/ShortFieldMapper.java @@ -257,7 +257,7 @@ public class ShortFieldMapper extends NumberFieldMapper { context.allEntries().addText(fieldType().name(), fieldType().nullValueAsString(), boost); } } else if (parser.currentToken() == XContentParser.Token.START_OBJECT - && Version.indexCreated(context.indexSettings()).before(Version.V_3_0_0)) { + && Version.indexCreated(context.indexSettings()).before(Version.V_5_0_0)) { XContentParser.Token token; String currentFieldName = null; Short objValue = fieldType().nullValue(); diff --git a/core/src/main/java/org/elasticsearch/index/mapper/core/StringFieldMapper.java b/core/src/main/java/org/elasticsearch/index/mapper/core/StringFieldMapper.java index 5d0d77fb6de..f5a36b4de19 100644 --- a/core/src/main/java/org/elasticsearch/index/mapper/core/StringFieldMapper.java +++ b/core/src/main/java/org/elasticsearch/index/mapper/core/StringFieldMapper.java @@ -334,7 +334,7 @@ public class StringFieldMapper extends FieldMapper implements AllFieldMapper.Inc return new ValueAndBoost(nullValue, defaultBoost); } if (parser.currentToken() == XContentParser.Token.START_OBJECT - && Version.indexCreated(context.indexSettings()).before(Version.V_3_0_0)) { + && Version.indexCreated(context.indexSettings()).before(Version.V_5_0_0)) { XContentParser.Token token; String currentFieldName = null; String value = nullValue; diff --git a/core/src/main/java/org/elasticsearch/index/mapper/core/TypeParsers.java b/core/src/main/java/org/elasticsearch/index/mapper/core/TypeParsers.java index 375dcee527b..15fcd9220e2 100644 --- a/core/src/main/java/org/elasticsearch/index/mapper/core/TypeParsers.java +++ b/core/src/main/java/org/elasticsearch/index/mapper/core/TypeParsers.java @@ -64,7 +64,7 @@ public class TypeParsers { public static final String INDEX_OPTIONS_OFFSETS = "offsets"; private static boolean nodeBooleanValue(Object node, Mapper.TypeParser.ParserContext parserContext) { - if (parserContext.indexVersionCreated().onOrAfter(Version.V_3_0_0)) { + if (parserContext.indexVersionCreated().onOrAfter(Version.V_5_0_0)) { return XContentMapValues.nodeBooleanValue(node); } else { return XContentMapValues.lenientNodeBooleanValue(node); @@ -353,7 +353,7 @@ public class TypeParsers { } public static boolean parseIndex(String fieldName, String index, Mapper.TypeParser.ParserContext parserContext) throws MapperParsingException { - if (parserContext.indexVersionCreated().onOrAfter(Version.V_3_0_0)) { + if (parserContext.indexVersionCreated().onOrAfter(Version.V_5_0_0)) { switch (index) { case "true": return true; @@ -379,7 +379,7 @@ public class TypeParsers { } public static boolean parseStore(String fieldName, String store, Mapper.TypeParser.ParserContext parserContext) throws MapperParsingException { - if (parserContext.indexVersionCreated().onOrAfter(Version.V_3_0_0)) { + if (parserContext.indexVersionCreated().onOrAfter(Version.V_5_0_0)) { return XContentMapValues.nodeBooleanValue(store); } else { if ("no".equals(store)) { @@ -406,7 +406,7 @@ public class TypeParsers { } private static SimilarityProvider resolveSimilarity(Mapper.TypeParser.ParserContext parserContext, String name, String value) { - if (parserContext.indexVersionCreated().before(Version.V_3_0_0) && "default".equals(value)) { + if (parserContext.indexVersionCreated().before(Version.V_5_0_0) && "default".equals(value)) { // "default" similarity has been renamed into "classic" in 3.x. value = SimilarityService.DEFAULT_SIMILARITY; } diff --git a/core/src/main/java/org/elasticsearch/index/mapper/internal/SourceFieldMapper.java b/core/src/main/java/org/elasticsearch/index/mapper/internal/SourceFieldMapper.java index 519a38c4ff3..a102f03a5f1 100644 --- a/core/src/main/java/org/elasticsearch/index/mapper/internal/SourceFieldMapper.java +++ b/core/src/main/java/org/elasticsearch/index/mapper/internal/SourceFieldMapper.java @@ -124,8 +124,8 @@ public class SourceFieldMapper extends MetadataFieldMapper { if (fieldName.equals("enabled")) { builder.enabled(lenientNodeBooleanValue(fieldNode)); iterator.remove(); - } else if ("format".equals(fieldName) && parserContext.indexVersionCreated().before(Version.V_3_0_0)) { - // ignore on old indices, reject on and after 3.0 + } else if ("format".equals(fieldName) && parserContext.indexVersionCreated().before(Version.V_5_0_0)) { + // ignore on old indices, reject on and after 5.0 iterator.remove(); } else if (fieldName.equals("includes")) { List values = (List) fieldNode; diff --git a/core/src/main/java/org/elasticsearch/percolator/PercolatorService.java b/core/src/main/java/org/elasticsearch/percolator/PercolatorService.java index 5f0fe3ce94b..1160aec969b 100644 --- a/core/src/main/java/org/elasticsearch/percolator/PercolatorService.java +++ b/core/src/main/java/org/elasticsearch/percolator/PercolatorService.java @@ -243,7 +243,7 @@ public class PercolatorService extends AbstractComponent implements Releasable { // moved the core percolation logic to a pck protected method to make testing easier: static PercolateShardResponse doPercolate(PercolateContext context, PercolatorQueriesRegistry queriesRegistry, AggregationPhase aggregationPhase, @Nullable BucketCollector aggregatorCollector, HighlightPhase highlightPhase) throws IOException { PercolatorQuery.Builder builder = new PercolatorQuery.Builder(context.docSearcher(), queriesRegistry.getPercolateQueries(), context.percolatorTypeFilter()); - if (queriesRegistry.indexSettings().getSettings().getAsVersion(IndexMetaData.SETTING_VERSION_CREATED, null).onOrAfter(Version.V_3_0_0)) { + if (queriesRegistry.indexSettings().getSettings().getAsVersion(IndexMetaData.SETTING_VERSION_CREATED, null).onOrAfter(Version.V_5_0_0)) { builder.extractQueryTermsQuery(PercolatorFieldMapper.EXTRACTED_TERMS_FULL_FIELD_NAME, PercolatorFieldMapper.UNKNOWN_QUERY_FULL_FIELD_NAME); } if (context.percolateQuery() != null || context.aliasFilter() != null) { diff --git a/core/src/test/java/org/elasticsearch/index/analysis/AnalysisServiceTests.java b/core/src/test/java/org/elasticsearch/index/analysis/AnalysisServiceTests.java index 11ef2df40c8..1fd9655e8de 100644 --- a/core/src/test/java/org/elasticsearch/index/analysis/AnalysisServiceTests.java +++ b/core/src/test/java/org/elasticsearch/index/analysis/AnalysisServiceTests.java @@ -28,7 +28,6 @@ import org.elasticsearch.Version; import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.env.Environment; -import org.elasticsearch.index.Index; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.indices.analysis.PreBuiltAnalyzers; import org.elasticsearch.test.ESTestCase; @@ -77,7 +76,7 @@ public class AnalysisServiceTests extends ESTestCase { } public void testOverrideDefaultIndexAnalyzer() { - Version version = VersionUtils.randomVersionBetween(getRandom(), Version.V_3_0_0, Version.CURRENT); + Version version = VersionUtils.randomVersionBetween(getRandom(), Version.V_5_0_0, Version.CURRENT); Settings settings = Settings.builder().put(IndexMetaData.SETTING_VERSION_CREATED, version).build(); try { AnalysisService analysisService = new AnalysisService(IndexSettingsModule.newIndexSettings("index", settings), @@ -91,7 +90,7 @@ public class AnalysisServiceTests extends ESTestCase { } public void testBackCompatOverrideDefaultIndexAnalyzer() { - Version version = VersionUtils.randomVersionBetween(getRandom(), VersionUtils.getFirstVersion(), VersionUtils.getPreviousVersion(Version.V_3_0_0)); + Version version = VersionUtils.randomVersionBetween(getRandom(), VersionUtils.getFirstVersion(), VersionUtils.getPreviousVersion(Version.V_5_0_0)); Settings settings = Settings.builder().put(IndexMetaData.SETTING_VERSION_CREATED, version).build(); AnalysisService analysisService = new AnalysisService(IndexSettingsModule.newIndexSettings("index", settings), Collections.singletonMap("default_index", analyzerProvider("default_index")), @@ -113,7 +112,7 @@ public class AnalysisServiceTests extends ESTestCase { } public void testBackCompatOverrideDefaultIndexAndSearchAnalyzer() { - Version version = VersionUtils.randomVersionBetween(getRandom(), VersionUtils.getFirstVersion(), VersionUtils.getPreviousVersion(Version.V_3_0_0)); + Version version = VersionUtils.randomVersionBetween(getRandom(), VersionUtils.getFirstVersion(), VersionUtils.getPreviousVersion(Version.V_5_0_0)); Settings settings = Settings.builder().put(IndexMetaData.SETTING_VERSION_CREATED, version).build(); Map analyzers = new HashMap<>(); analyzers.put("default_index", analyzerProvider("default_index")); diff --git a/core/src/test/java/org/elasticsearch/index/query/SpanNearQueryBuilderTests.java b/core/src/test/java/org/elasticsearch/index/query/SpanNearQueryBuilderTests.java index 3b8ae51559e..3885801b335 100644 --- a/core/src/test/java/org/elasticsearch/index/query/SpanNearQueryBuilderTests.java +++ b/core/src/test/java/org/elasticsearch/index/query/SpanNearQueryBuilderTests.java @@ -114,7 +114,7 @@ public class SpanNearQueryBuilderTests extends AbstractQueryTestCase" "<\/repositories>" "plugins/$1/pom.xml" removeLines "" "<\/scm>" "plugins/$1/pom.xml" - # echo "### remove version 3.0.0-SNAPSHOT from $1 pom.xml" - # All plugins for ES 2.0.0 uses 3.0.0-SNAPSHOT version number - replaceLine " 3.0.0-SNAPSHOT<\/version>" "" "plugins/$1/pom.xml" + # echo "### remove version 5.0.0-SNAPSHOT from $1 pom.xml" + # All plugins for ES 5.0.0 uses 5.0.0-SNAPSHOT version number + replaceLine " 5.0.0-SNAPSHOT<\/version>" "" "plugins/$1/pom.xml" # echo "### remove unused dev-tools and .git dirs and LICENSE.txt and CONTRIBUTING.md files" rm -r plugins/$1/dev-tools diff --git a/plugins/repository-s3/generated-resources/plugin-descriptor.properties b/plugins/repository-s3/generated-resources/plugin-descriptor.properties deleted file mode 100644 index ff42cdf7543..00000000000 --- a/plugins/repository-s3/generated-resources/plugin-descriptor.properties +++ /dev/null @@ -1,48 +0,0 @@ -# Elasticsearch plugin descriptor file -# This file must exist as 'plugin-descriptor.properties' at -# the root directory of all plugins. -# -### example plugin for "foo" -# -# foo.zip <-- zip file for the plugin, with this structure: -# .jar <-- classes, resources, dependencies -# .jar <-- any number of jars -# plugin-descriptor.properties <-- example contents below: -# -# classname=foo.bar.BazPlugin -# description=My cool plugin -# version=2.0 -# elasticsearch.version=2.0 -# java.version=1.7 -# -### mandatory elements for all plugins: -# -# 'description': simple summary of the plugin -description=The S3 repository plugin adds S3 repositories. -# -# 'version': plugin's version -version=3.0.0-SNAPSHOT -# -# 'name': the plugin name -name=repository-s3 -# -# 'classname': the name of the class to load, fully-qualified. -classname=org.elasticsearch.plugin.repository.s3.S3RepositoryPlugin -# -# 'java.version' version of java the code is built against -# use the system property java.specification.version -# version string must be a sequence of nonnegative decimal integers -# separated by "."'s and may have leading zeros -java.version=1.8 -# -# 'elasticsearch.version' version of elasticsearch compiled against -elasticsearch.version=3.0.0-SNAPSHOT -# -### deprecated elements for jvm plugins : -# -# 'isolated': true if the plugin should have its own classloader. -# passing false is deprecated, and only intended to support plugins -# that have hard dependencies against each other. If this is -# not specified, then the plugin is isolated by default. -isolated=true -# \ No newline at end of file