From b447e2ae99e762c64303d97c20951de440314fa4 Mon Sep 17 00:00:00 2001 From: Simon Willnauer Date: Fri, 14 Aug 2015 23:43:47 +0200 Subject: [PATCH] Move master to [2.1.0-SNAPSHOT] --- core/pom.xml | 2 +- core/src/main/java/org/elasticsearch/Version.java | 6 +++++- dev-tools/pom.xml | 2 +- distribution/deb/pom.xml | 2 +- distribution/fully-loaded/pom.xml | 2 +- distribution/pom.xml | 2 +- distribution/rpm/pom.xml | 2 +- distribution/shaded/pom.xml | 2 +- distribution/tar/pom.xml | 2 +- distribution/zip/pom.xml | 2 +- plugins/analysis-icu/pom.xml | 2 +- plugins/analysis-kuromoji/pom.xml | 2 +- plugins/analysis-phonetic/pom.xml | 2 +- plugins/analysis-smartcn/pom.xml | 2 +- plugins/analysis-stempel/pom.xml | 2 +- plugins/cloud-aws/pom.xml | 2 +- plugins/cloud-azure/pom.xml | 2 +- plugins/cloud-gce/pom.xml | 2 +- plugins/delete-by-query/pom.xml | 2 +- plugins/jvm-example/pom.xml | 2 +- plugins/lang-javascript/pom.xml | 2 +- plugins/lang-python/pom.xml | 2 +- plugins/mapper-size/pom.xml | 2 +- plugins/pom.xml | 4 ++-- plugins/site-example/pom.xml | 2 +- pom.xml | 2 +- qa/pom.xml | 4 ++-- qa/smoke-test-multinode/pom.xml | 2 +- qa/smoke-test-plugins/pom.xml | 2 +- qa/smoke-test-shaded/pom.xml | 2 +- qa/vagrant/pom.xml | 2 +- rest-api-spec/pom.xml | 2 +- 32 files changed, 38 insertions(+), 34 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index e039cc8f83d..dbc1b022b71 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -6,7 +6,7 @@ org.elasticsearch elasticsearch-parent - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT org.elasticsearch diff --git a/core/src/main/java/org/elasticsearch/Version.java b/core/src/main/java/org/elasticsearch/Version.java index d820a1b2427..d12fcd3274b 100644 --- a/core/src/main/java/org/elasticsearch/Version.java +++ b/core/src/main/java/org/elasticsearch/Version.java @@ -257,8 +257,10 @@ public class Version { public static final Version V_2_0_0_beta1 = new Version(V_2_0_0_beta1_ID, true, org.apache.lucene.util.Version.LUCENE_5_2_1); public static final int V_2_0_0_ID = 2000099; public static final Version V_2_0_0 = new Version(V_2_0_0_ID, true, org.apache.lucene.util.Version.LUCENE_5_2_1); + public static final int V_2_1_0_ID = 2010099; + public static final Version V_2_1_0 = new Version(V_2_1_0_ID, true, org.apache.lucene.util.Version.LUCENE_5_2_1); - public static final Version CURRENT = V_2_0_0; + public static final Version CURRENT = V_2_1_0; static { assert CURRENT.luceneVersion.equals(Lucene.VERSION) : "Version must be upgraded to [" + Lucene.VERSION + "] is still set to [" + CURRENT.luceneVersion + "]"; @@ -270,6 +272,8 @@ public class Version { public static Version fromId(int id) { switch (id) { + case V_2_1_0_ID: + return V_2_1_0; case V_2_0_0_ID: return V_2_0_0; case V_2_0_0_beta1_ID: diff --git a/dev-tools/pom.xml b/dev-tools/pom.xml index 1e8441a8c43..b53889ee731 100644 --- a/dev-tools/pom.xml +++ b/dev-tools/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.elasticsearch elasticsearch-dev-tools - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT Elasticsearch Build Resources Tools to assist in building and developing in the Elasticsearch project diff --git a/distribution/deb/pom.xml b/distribution/deb/pom.xml index b87824d5087..4f1a4b0f95b 100644 --- a/distribution/deb/pom.xml +++ b/distribution/deb/pom.xml @@ -6,7 +6,7 @@ org.elasticsearch.distribution elasticsearch-distribution - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT org.elasticsearch.distribution.deb diff --git a/distribution/fully-loaded/pom.xml b/distribution/fully-loaded/pom.xml index 91988f187ab..0215999ed96 100644 --- a/distribution/fully-loaded/pom.xml +++ b/distribution/fully-loaded/pom.xml @@ -6,7 +6,7 @@ org.elasticsearch.distribution elasticsearch-distribution - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT org.elasticsearch.distribution.fully-loaded diff --git a/distribution/pom.xml b/distribution/pom.xml index 4bb46e2e7f8..ca5b6e18fcb 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -6,7 +6,7 @@ org.elasticsearch elasticsearch-parent - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT org.elasticsearch.distribution diff --git a/distribution/rpm/pom.xml b/distribution/rpm/pom.xml index fa3d6dd8b0c..cd8f321689e 100644 --- a/distribution/rpm/pom.xml +++ b/distribution/rpm/pom.xml @@ -6,7 +6,7 @@ org.elasticsearch.distribution elasticsearch-distribution - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT org.elasticsearch.distribution.rpm diff --git a/distribution/shaded/pom.xml b/distribution/shaded/pom.xml index 7024504a7ec..a0624745e03 100644 --- a/distribution/shaded/pom.xml +++ b/distribution/shaded/pom.xml @@ -6,7 +6,7 @@ org.elasticsearch.distribution elasticsearch-distribution - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT org.elasticsearch.distribution.shaded diff --git a/distribution/tar/pom.xml b/distribution/tar/pom.xml index d54e48c64b3..d84450b1d22 100644 --- a/distribution/tar/pom.xml +++ b/distribution/tar/pom.xml @@ -6,7 +6,7 @@ org.elasticsearch.distribution elasticsearch-distribution - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT org.elasticsearch.distribution.tar diff --git a/distribution/zip/pom.xml b/distribution/zip/pom.xml index ab8f9afe030..6d16b04fbef 100644 --- a/distribution/zip/pom.xml +++ b/distribution/zip/pom.xml @@ -6,7 +6,7 @@ org.elasticsearch.distribution elasticsearch-distribution - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT org.elasticsearch.distribution.zip diff --git a/plugins/analysis-icu/pom.xml b/plugins/analysis-icu/pom.xml index d0679295787..a25f6f350f5 100644 --- a/plugins/analysis-icu/pom.xml +++ b/plugins/analysis-icu/pom.xml @@ -7,7 +7,7 @@ org.elasticsearch.plugin elasticsearch-plugin - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT elasticsearch-analysis-icu diff --git a/plugins/analysis-kuromoji/pom.xml b/plugins/analysis-kuromoji/pom.xml index 1ac11b858b6..d6e87ad17d9 100644 --- a/plugins/analysis-kuromoji/pom.xml +++ b/plugins/analysis-kuromoji/pom.xml @@ -7,7 +7,7 @@ org.elasticsearch.plugin elasticsearch-plugin - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT elasticsearch-analysis-kuromoji diff --git a/plugins/analysis-phonetic/pom.xml b/plugins/analysis-phonetic/pom.xml index f355a255a3f..ae3b7917872 100644 --- a/plugins/analysis-phonetic/pom.xml +++ b/plugins/analysis-phonetic/pom.xml @@ -7,7 +7,7 @@ org.elasticsearch.plugin elasticsearch-plugin - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT elasticsearch-analysis-phonetic diff --git a/plugins/analysis-smartcn/pom.xml b/plugins/analysis-smartcn/pom.xml index b0ed1943d23..a25e787cccb 100644 --- a/plugins/analysis-smartcn/pom.xml +++ b/plugins/analysis-smartcn/pom.xml @@ -7,7 +7,7 @@ org.elasticsearch.plugin elasticsearch-plugin - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT elasticsearch-analysis-smartcn diff --git a/plugins/analysis-stempel/pom.xml b/plugins/analysis-stempel/pom.xml index febe5eb94ab..7fcce1d14af 100644 --- a/plugins/analysis-stempel/pom.xml +++ b/plugins/analysis-stempel/pom.xml @@ -7,7 +7,7 @@ org.elasticsearch.plugin elasticsearch-plugin - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT elasticsearch-analysis-stempel diff --git a/plugins/cloud-aws/pom.xml b/plugins/cloud-aws/pom.xml index 04417a9b724..03d157eadff 100644 --- a/plugins/cloud-aws/pom.xml +++ b/plugins/cloud-aws/pom.xml @@ -7,7 +7,7 @@ org.elasticsearch.plugin elasticsearch-plugin - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT elasticsearch-cloud-aws diff --git a/plugins/cloud-azure/pom.xml b/plugins/cloud-azure/pom.xml index ff67fc31600..c7c83816320 100644 --- a/plugins/cloud-azure/pom.xml +++ b/plugins/cloud-azure/pom.xml @@ -18,7 +18,7 @@ governing permissions and limitations under the License. --> org.elasticsearch.plugin elasticsearch-plugin - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT elasticsearch-cloud-azure diff --git a/plugins/cloud-gce/pom.xml b/plugins/cloud-gce/pom.xml index 30a8c965384..1d62fdb327e 100644 --- a/plugins/cloud-gce/pom.xml +++ b/plugins/cloud-gce/pom.xml @@ -18,7 +18,7 @@ governing permissions and limitations under the License. --> org.elasticsearch.plugin elasticsearch-plugin - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT elasticsearch-cloud-gce diff --git a/plugins/delete-by-query/pom.xml b/plugins/delete-by-query/pom.xml index 222d00585ff..d7ea468088e 100644 --- a/plugins/delete-by-query/pom.xml +++ b/plugins/delete-by-query/pom.xml @@ -18,7 +18,7 @@ governing permissions and limitations under the License. --> org.elasticsearch.plugin elasticsearch-plugin - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT elasticsearch-delete-by-query diff --git a/plugins/jvm-example/pom.xml b/plugins/jvm-example/pom.xml index 6f7b3420880..0bfd84b82b9 100644 --- a/plugins/jvm-example/pom.xml +++ b/plugins/jvm-example/pom.xml @@ -7,7 +7,7 @@ org.elasticsearch.plugin elasticsearch-plugin - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT elasticsearch-jvm-example diff --git a/plugins/lang-javascript/pom.xml b/plugins/lang-javascript/pom.xml index e1ae181e7c1..f283aa73989 100644 --- a/plugins/lang-javascript/pom.xml +++ b/plugins/lang-javascript/pom.xml @@ -7,7 +7,7 @@ org.elasticsearch.plugin elasticsearch-plugin - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT elasticsearch-lang-javascript diff --git a/plugins/lang-python/pom.xml b/plugins/lang-python/pom.xml index a88bdd66ac0..704aff5379c 100644 --- a/plugins/lang-python/pom.xml +++ b/plugins/lang-python/pom.xml @@ -7,7 +7,7 @@ org.elasticsearch.plugin elasticsearch-plugin - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT elasticsearch-lang-python diff --git a/plugins/mapper-size/pom.xml b/plugins/mapper-size/pom.xml index 4b80b5fa0f1..2ec3d475e2b 100644 --- a/plugins/mapper-size/pom.xml +++ b/plugins/mapper-size/pom.xml @@ -18,7 +18,7 @@ governing permissions and limitations under the License. --> org.elasticsearch.plugin elasticsearch-plugin - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT elasticsearch-mapper-size diff --git a/plugins/pom.xml b/plugins/pom.xml index df783fd34e4..78e3d65aa0d 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -7,7 +7,7 @@ org.elasticsearch.plugin elasticsearch-plugin - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT pom Elasticsearch Plugin POM 2009 @@ -16,7 +16,7 @@ org.elasticsearch elasticsearch-parent - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT diff --git a/plugins/site-example/pom.xml b/plugins/site-example/pom.xml index 0a6beb1a0b0..f346678ffc0 100644 --- a/plugins/site-example/pom.xml +++ b/plugins/site-example/pom.xml @@ -7,7 +7,7 @@ org.elasticsearch.plugin elasticsearch-plugin - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT elasticsearch-site-example diff --git a/pom.xml b/pom.xml index 649b4cc9be2..ee5bb0df3a9 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.elasticsearch elasticsearch-parent - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT pom Elasticsearch Parent POM Elasticsearch Parent POM diff --git a/qa/pom.xml b/qa/pom.xml index 64af314e5b3..e303ee27c32 100644 --- a/qa/pom.xml +++ b/qa/pom.xml @@ -7,7 +7,7 @@ org.elasticsearch.qa elasticsearch-qa - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT pom QA: Parent POM 2015 @@ -15,7 +15,7 @@ org.elasticsearch elasticsearch-parent - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT diff --git a/qa/smoke-test-multinode/pom.xml b/qa/smoke-test-multinode/pom.xml index b03c57c1abe..4b44c58665b 100644 --- a/qa/smoke-test-multinode/pom.xml +++ b/qa/smoke-test-multinode/pom.xml @@ -8,7 +8,7 @@ org.elasticsearch.qa elasticsearch-qa - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT