From 6f9a06719793e97ec3c18a8c617ed76610d67e08 Mon Sep 17 00:00:00 2001 From: Robert Muir Date: Tue, 4 Aug 2015 15:38:21 -0400 Subject: [PATCH] Change master branch back to 2.0-beta1 --- core/pom.xml | 2 +- core/src/main/java/org/elasticsearch/Version.java | 6 +----- core/src/test/java/org/elasticsearch/VersionTests.java | 4 ---- 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/lang-javascript/pom.xml | 2 +- plugins/lang-python/pom.xml | 2 +- plugins/pom.xml | 4 ++-- plugins/site-example/pom.xml | 2 +- pom.xml | 2 +- rest-api-spec/pom.xml | 4 ++-- 26 files changed, 27 insertions(+), 35 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index 325232d087e..d4fb7f95342 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -6,7 +6,7 @@ org.elasticsearch elasticsearch-parent - 2.0.0-SNAPSHOT + 2.0.0-beta1-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..5ba63c4811b 100644 --- a/core/src/main/java/org/elasticsearch/Version.java +++ b/core/src/main/java/org/elasticsearch/Version.java @@ -255,10 +255,8 @@ public class Version { public static final int V_2_0_0_beta1_ID = 2000001; 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 Version CURRENT = V_2_0_0; + public static final Version CURRENT = V_2_0_0_beta1; static { assert CURRENT.luceneVersion.equals(Lucene.VERSION) : "Version must be upgraded to [" + Lucene.VERSION + "] is still set to [" + CURRENT.luceneVersion + "]"; @@ -270,8 +268,6 @@ public class Version { public static Version fromId(int id) { switch (id) { - case V_2_0_0_ID: - return V_2_0_0; case V_2_0_0_beta1_ID: return V_2_0_0_beta1; case V_1_7_2_ID: diff --git a/core/src/test/java/org/elasticsearch/VersionTests.java b/core/src/test/java/org/elasticsearch/VersionTests.java index 76c0d8d19d3..3f4891cd825 100644 --- a/core/src/test/java/org/elasticsearch/VersionTests.java +++ b/core/src/test/java/org/elasticsearch/VersionTests.java @@ -203,10 +203,6 @@ public class VersionTests extends ESTestCase { // only the latest version for a branch should be a snapshot (ie unreleased) String branchName = "" + v.major + "." + v.minor; - if (v.equals(Version.V_2_0_0_beta1)) { - assertTrue("Remove this once beta1 is released", v.snapshot()); - continue; // this is just a temporary fix until we have a snapshot for the beta since we now have 2 unreleased version of the same major.minor group - } Version maxBranchVersion = maxBranchVersions.get(branchName); if (maxBranchVersion == null) { maxBranchVersions.put(branchName, v); diff --git a/dev-tools/pom.xml b/dev-tools/pom.xml index 0daa4cbad51..369c003beee 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.0.0-beta1-SNAPSHOT Elasticsearch Build Resources org.sonatype.oss diff --git a/distribution/deb/pom.xml b/distribution/deb/pom.xml index 5706f8f55dc..c944dcc7c04 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.0.0-beta1-SNAPSHOT org.elasticsearch.distribution.deb diff --git a/distribution/fully-loaded/pom.xml b/distribution/fully-loaded/pom.xml index 91988f187ab..9fef31640d9 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.0.0-beta1-SNAPSHOT org.elasticsearch.distribution.fully-loaded diff --git a/distribution/pom.xml b/distribution/pom.xml index d3b518fd1a1..9a01416ba30 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -6,7 +6,7 @@ org.elasticsearch elasticsearch-parent - 2.0.0-SNAPSHOT + 2.0.0-beta1-SNAPSHOT org.elasticsearch.distribution diff --git a/distribution/rpm/pom.xml b/distribution/rpm/pom.xml index d48aca8a125..698c310ecc3 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.0.0-beta1-SNAPSHOT org.elasticsearch.distribution.rpm diff --git a/distribution/shaded/pom.xml b/distribution/shaded/pom.xml index 698b0907d66..3163a8053b3 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.0.0-beta1-SNAPSHOT org.elasticsearch.distribution.shaded diff --git a/distribution/tar/pom.xml b/distribution/tar/pom.xml index c0ebae4b760..3c41c5d87e5 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.0.0-beta1-SNAPSHOT org.elasticsearch.distribution.tar diff --git a/distribution/zip/pom.xml b/distribution/zip/pom.xml index 3749e9087c6..afa3dc286eb 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.0.0-beta1-SNAPSHOT org.elasticsearch.distribution.zip diff --git a/plugins/analysis-icu/pom.xml b/plugins/analysis-icu/pom.xml index d0679295787..1214cbc82c0 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.0.0-beta1-SNAPSHOT elasticsearch-analysis-icu diff --git a/plugins/analysis-kuromoji/pom.xml b/plugins/analysis-kuromoji/pom.xml index 1ac11b858b6..7cb0fa762ea 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.0.0-beta1-SNAPSHOT elasticsearch-analysis-kuromoji diff --git a/plugins/analysis-phonetic/pom.xml b/plugins/analysis-phonetic/pom.xml index f355a255a3f..f5bafe2b865 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.0.0-beta1-SNAPSHOT elasticsearch-analysis-phonetic diff --git a/plugins/analysis-smartcn/pom.xml b/plugins/analysis-smartcn/pom.xml index b0ed1943d23..178d5f142a6 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.0.0-beta1-SNAPSHOT elasticsearch-analysis-smartcn diff --git a/plugins/analysis-stempel/pom.xml b/plugins/analysis-stempel/pom.xml index febe5eb94ab..4f8f59c0611 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.0.0-beta1-SNAPSHOT elasticsearch-analysis-stempel diff --git a/plugins/cloud-aws/pom.xml b/plugins/cloud-aws/pom.xml index 04417a9b724..35edcf5d238 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.0.0-beta1-SNAPSHOT elasticsearch-cloud-aws diff --git a/plugins/cloud-azure/pom.xml b/plugins/cloud-azure/pom.xml index ff67fc31600..c339c114cb1 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.0.0-beta1-SNAPSHOT elasticsearch-cloud-azure diff --git a/plugins/cloud-gce/pom.xml b/plugins/cloud-gce/pom.xml index f0133c8ef6e..48a7b26542e 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.0.0-beta1-SNAPSHOT elasticsearch-cloud-gce diff --git a/plugins/delete-by-query/pom.xml b/plugins/delete-by-query/pom.xml index 222d00585ff..62ee8fdb9b1 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.0.0-beta1-SNAPSHOT elasticsearch-delete-by-query diff --git a/plugins/lang-javascript/pom.xml b/plugins/lang-javascript/pom.xml index e1ae181e7c1..eb6e21cd704 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.0.0-beta1-SNAPSHOT elasticsearch-lang-javascript diff --git a/plugins/lang-python/pom.xml b/plugins/lang-python/pom.xml index a88bdd66ac0..b69a07b0ed7 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.0.0-beta1-SNAPSHOT elasticsearch-lang-python diff --git a/plugins/pom.xml b/plugins/pom.xml index 77278b0d7fb..2d8e9387d9c 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -7,7 +7,7 @@ org.elasticsearch.plugin elasticsearch-plugin - 2.0.0-SNAPSHOT + 2.0.0-beta1-SNAPSHOT pom Elasticsearch Plugin POM 2009 @@ -15,7 +15,7 @@ org.elasticsearch elasticsearch-parent - 2.0.0-SNAPSHOT + 2.0.0-beta1-SNAPSHOT diff --git a/plugins/site-example/pom.xml b/plugins/site-example/pom.xml index 0a6beb1a0b0..15060e0bd52 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.0.0-beta1-SNAPSHOT elasticsearch-site-example diff --git a/pom.xml b/pom.xml index 2262f68dfa9..188ed85015e 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.elasticsearch elasticsearch-parent - 2.0.0-SNAPSHOT + 2.0.0-beta1-SNAPSHOT pom Elasticsearch Parent POM Elasticsearch Parent POM diff --git a/rest-api-spec/pom.xml b/rest-api-spec/pom.xml index 46f2e6e7213..178c55b8770 100644 --- a/rest-api-spec/pom.xml +++ b/rest-api-spec/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.elasticsearch elasticsearch-rest-api-spec - 2.0.0-SNAPSHOT + 2.0.0-beta1-SNAPSHOT Elasticsearch Rest API Spec org.sonatype.oss @@ -34,4 +34,4 @@ - \ No newline at end of file +