From 6753f7f03e6e2d8abfc3a00ae8c3e0b8722e3215 Mon Sep 17 00:00:00 2001
From: Simon Willnauer <simonw@apache.org>
Date: Mon, 3 Aug 2015 17:38:30 +0200
Subject: [PATCH] Cut over master to 2.0.0-SNAPSHOT

---
 core/pom.xml                                           | 2 +-
 core/src/main/java/org/elasticsearch/Version.java      | 6 +++++-
 core/src/test/java/org/elasticsearch/VersionTests.java | 5 +++++
 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                                  | 2 +-
 26 files changed, 35 insertions(+), 26 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index d4fb7f95342..325232d087e 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.elasticsearch</groupId>
         <artifactId>elasticsearch-parent</artifactId>
-        <version>2.0.0-beta1-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.elasticsearch</groupId>
diff --git a/core/src/main/java/org/elasticsearch/Version.java b/core/src/main/java/org/elasticsearch/Version.java
index 5ba63c4811b..d820a1b2427 100644
--- a/core/src/main/java/org/elasticsearch/Version.java
+++ b/core/src/main/java/org/elasticsearch/Version.java
@@ -255,8 +255,10 @@ 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_beta1;
+    public static final Version CURRENT = V_2_0_0;
 
     static {
         assert CURRENT.luceneVersion.equals(Lucene.VERSION) : "Version must be upgraded to [" + Lucene.VERSION + "] is still set to [" + CURRENT.luceneVersion + "]";
@@ -268,6 +270,8 @@ 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 4161578a5a6..76c0d8d19d3 100644
--- a/core/src/test/java/org/elasticsearch/VersionTests.java
+++ b/core/src/test/java/org/elasticsearch/VersionTests.java
@@ -203,10 +203,15 @@ 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);
                 } else if (v.after(maxBranchVersion)) {
+
                     assertFalse("Version " + maxBranchVersion + " cannot be a snapshot because version " + v + " exists", maxBranchVersion.snapshot());
                     maxBranchVersions.put(branchName, v);
                 }
diff --git a/dev-tools/pom.xml b/dev-tools/pom.xml
index 369c003beee..0daa4cbad51 100644
--- a/dev-tools/pom.xml
+++ b/dev-tools/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.elasticsearch</groupId>
   <artifactId>elasticsearch-dev-tools</artifactId>
-  <version>2.0.0-beta1-SNAPSHOT</version>
+  <version>2.0.0-SNAPSHOT</version>
   <name>Elasticsearch Build Resources</name>
   <parent>
       <groupId>org.sonatype.oss</groupId>
diff --git a/distribution/deb/pom.xml b/distribution/deb/pom.xml
index 6ccb9045d72..34fc6c95b8d 100644
--- a/distribution/deb/pom.xml
+++ b/distribution/deb/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.elasticsearch.distribution</groupId>
         <artifactId>elasticsearch-distribution</artifactId>
-        <version>2.0.0-beta1-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>elasticsearch-deb</artifactId>
diff --git a/distribution/fully-loaded/pom.xml b/distribution/fully-loaded/pom.xml
index babca43359e..ff3d69a5ab7 100644
--- a/distribution/fully-loaded/pom.xml
+++ b/distribution/fully-loaded/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.elasticsearch.distribution</groupId>
         <artifactId>elasticsearch-distribution</artifactId>
-        <version>2.0.0-beta1-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>elasticsearch-fully-loaded</artifactId>
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 6e3ae4e78c7..0190c3b38c3 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.elasticsearch</groupId>
         <artifactId>elasticsearch-parent</artifactId>
-        <version>2.0.0-beta1-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.elasticsearch.distribution</groupId>
diff --git a/distribution/rpm/pom.xml b/distribution/rpm/pom.xml
index d596dbfcab8..8c80406f167 100644
--- a/distribution/rpm/pom.xml
+++ b/distribution/rpm/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.elasticsearch.distribution</groupId>
         <artifactId>elasticsearch-distribution</artifactId>
-        <version>2.0.0-beta1-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>elasticsearch-rpm</artifactId>
diff --git a/distribution/shaded/pom.xml b/distribution/shaded/pom.xml
index f7704f94e9a..5426572f65d 100644
--- a/distribution/shaded/pom.xml
+++ b/distribution/shaded/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.elasticsearch.distribution</groupId>
         <artifactId>elasticsearch-distribution</artifactId>
-        <version>2.0.0-beta1-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>elasticsearch-shaded</artifactId>
diff --git a/distribution/tar/pom.xml b/distribution/tar/pom.xml
index f62803ce499..aea4f4875d8 100644
--- a/distribution/tar/pom.xml
+++ b/distribution/tar/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.elasticsearch.distribution</groupId>
         <artifactId>elasticsearch-distribution</artifactId>
-        <version>2.0.0-beta1-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>elasticsearch-tar</artifactId>
diff --git a/distribution/zip/pom.xml b/distribution/zip/pom.xml
index 4d3f19d93e1..c94a7bdd17d 100644
--- a/distribution/zip/pom.xml
+++ b/distribution/zip/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.elasticsearch.distribution</groupId>
         <artifactId>elasticsearch-distribution</artifactId>
-        <version>2.0.0-beta1-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>elasticsearch-zip</artifactId>
diff --git a/plugins/analysis-icu/pom.xml b/plugins/analysis-icu/pom.xml
index 1214cbc82c0..d0679295787 100644
--- a/plugins/analysis-icu/pom.xml
+++ b/plugins/analysis-icu/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.elasticsearch.plugin</groupId>
         <artifactId>elasticsearch-plugin</artifactId>
-        <version>2.0.0-beta1-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>elasticsearch-analysis-icu</artifactId>
diff --git a/plugins/analysis-kuromoji/pom.xml b/plugins/analysis-kuromoji/pom.xml
index 7cb0fa762ea..1ac11b858b6 100644
--- a/plugins/analysis-kuromoji/pom.xml
+++ b/plugins/analysis-kuromoji/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.elasticsearch.plugin</groupId>
         <artifactId>elasticsearch-plugin</artifactId>
-        <version>2.0.0-beta1-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>elasticsearch-analysis-kuromoji</artifactId>
diff --git a/plugins/analysis-phonetic/pom.xml b/plugins/analysis-phonetic/pom.xml
index f5bafe2b865..f355a255a3f 100644
--- a/plugins/analysis-phonetic/pom.xml
+++ b/plugins/analysis-phonetic/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.elasticsearch.plugin</groupId>
         <artifactId>elasticsearch-plugin</artifactId>
-        <version>2.0.0-beta1-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>elasticsearch-analysis-phonetic</artifactId>
diff --git a/plugins/analysis-smartcn/pom.xml b/plugins/analysis-smartcn/pom.xml
index 178d5f142a6..b0ed1943d23 100644
--- a/plugins/analysis-smartcn/pom.xml
+++ b/plugins/analysis-smartcn/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.elasticsearch.plugin</groupId>
         <artifactId>elasticsearch-plugin</artifactId>
-        <version>2.0.0-beta1-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>elasticsearch-analysis-smartcn</artifactId>
diff --git a/plugins/analysis-stempel/pom.xml b/plugins/analysis-stempel/pom.xml
index 4f8f59c0611..febe5eb94ab 100644
--- a/plugins/analysis-stempel/pom.xml
+++ b/plugins/analysis-stempel/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.elasticsearch.plugin</groupId>
         <artifactId>elasticsearch-plugin</artifactId>
-        <version>2.0.0-beta1-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>elasticsearch-analysis-stempel</artifactId>
diff --git a/plugins/cloud-aws/pom.xml b/plugins/cloud-aws/pom.xml
index 35edcf5d238..04417a9b724 100644
--- a/plugins/cloud-aws/pom.xml
+++ b/plugins/cloud-aws/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.elasticsearch.plugin</groupId>
         <artifactId>elasticsearch-plugin</artifactId>
-        <version>2.0.0-beta1-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>elasticsearch-cloud-aws</artifactId>
diff --git a/plugins/cloud-azure/pom.xml b/plugins/cloud-azure/pom.xml
index c339c114cb1..ff67fc31600 100644
--- a/plugins/cloud-azure/pom.xml
+++ b/plugins/cloud-azure/pom.xml
@@ -18,7 +18,7 @@ governing permissions and limitations under the License. -->
     <parent>
         <groupId>org.elasticsearch.plugin</groupId>
         <artifactId>elasticsearch-plugin</artifactId>
-        <version>2.0.0-beta1-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>elasticsearch-cloud-azure</artifactId>
diff --git a/plugins/cloud-gce/pom.xml b/plugins/cloud-gce/pom.xml
index 48a7b26542e..f0133c8ef6e 100644
--- a/plugins/cloud-gce/pom.xml
+++ b/plugins/cloud-gce/pom.xml
@@ -18,7 +18,7 @@ governing permissions and limitations under the License. -->
     <parent>
         <groupId>org.elasticsearch.plugin</groupId>
         <artifactId>elasticsearch-plugin</artifactId>
-        <version>2.0.0-beta1-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>elasticsearch-cloud-gce</artifactId>
diff --git a/plugins/delete-by-query/pom.xml b/plugins/delete-by-query/pom.xml
index 62ee8fdb9b1..222d00585ff 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. -->
     <parent>
         <groupId>org.elasticsearch.plugin</groupId>
         <artifactId>elasticsearch-plugin</artifactId>
-        <version>2.0.0-beta1-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>elasticsearch-delete-by-query</artifactId>
diff --git a/plugins/lang-javascript/pom.xml b/plugins/lang-javascript/pom.xml
index eb6e21cd704..e1ae181e7c1 100644
--- a/plugins/lang-javascript/pom.xml
+++ b/plugins/lang-javascript/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.elasticsearch.plugin</groupId>
         <artifactId>elasticsearch-plugin</artifactId>
-        <version>2.0.0-beta1-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>elasticsearch-lang-javascript</artifactId>
diff --git a/plugins/lang-python/pom.xml b/plugins/lang-python/pom.xml
index b69a07b0ed7..a88bdd66ac0 100644
--- a/plugins/lang-python/pom.xml
+++ b/plugins/lang-python/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.elasticsearch.plugin</groupId>
         <artifactId>elasticsearch-plugin</artifactId>
-        <version>2.0.0-beta1-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>elasticsearch-lang-python</artifactId>
diff --git a/plugins/pom.xml b/plugins/pom.xml
index b007dd7c72a..4bc761b14b5 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -7,7 +7,7 @@
 
     <groupId>org.elasticsearch.plugin</groupId>
     <artifactId>elasticsearch-plugin</artifactId>
-    <version>2.0.0-beta1-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Elasticsearch Plugin POM</name>
     <inceptionYear>2009</inceptionYear>
@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.elasticsearch</groupId>
         <artifactId>elasticsearch-parent</artifactId>
-        <version>2.0.0-beta1-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <properties>
diff --git a/plugins/site-example/pom.xml b/plugins/site-example/pom.xml
index 15060e0bd52..0a6beb1a0b0 100644
--- a/plugins/site-example/pom.xml
+++ b/plugins/site-example/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.elasticsearch.plugin</groupId>
         <artifactId>elasticsearch-plugin</artifactId>
-        <version>2.0.0-beta1-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>elasticsearch-site-example</artifactId>
diff --git a/pom.xml b/pom.xml
index 501f5a457c0..366eb021b98 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>org.elasticsearch</groupId>
     <artifactId>elasticsearch-parent</artifactId>
-    <version>2.0.0-beta1-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Elasticsearch Parent POM</name>
     <description>Elasticsearch Parent POM</description>
diff --git a/rest-api-spec/pom.xml b/rest-api-spec/pom.xml
index 3b14e1722cd..46f2e6e7213 100644
--- a/rest-api-spec/pom.xml
+++ b/rest-api-spec/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.elasticsearch</groupId>
   <artifactId>elasticsearch-rest-api-spec</artifactId>
-  <version>2.0.0-beta1-SNAPSHOT</version>
+  <version>2.0.0-SNAPSHOT</version>
   <name>Elasticsearch Rest API Spec</name>
   <parent>
       <groupId>org.sonatype.oss</groupId>