Cut over master to 2.0.0-SNAPSHOT

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>

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:

core/src/test/java/org/elasticsearch/VersionTests.java

@@ -203,6 +203,10 @@ 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);

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>
   <description>Tools to assist in building and developing in the Elasticsearch project</description>
   <parent>

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>
 
     <groupId>org.elasticsearch.distribution.deb</groupId>

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>
 
     <groupId>org.elasticsearch.distribution.fully-loaded</groupId>

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>

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>
 
     <groupId>org.elasticsearch.distribution.rpm</groupId>

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>
 
     <groupId>org.elasticsearch.distribution.shaded</groupId>

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>
 
     <groupId>org.elasticsearch.distribution.tar</groupId>

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>
 
     <groupId>org.elasticsearch.distribution.zip</groupId>

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>

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>

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>

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>

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>

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>

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>

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>

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>

plugins/jvm-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-jvm-example</artifactId>

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>

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>

plugins/mapper-size/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-mapper-size</artifactId>

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>
@@ -16,7 +16,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>

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>

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>

qa/pom.xml

@@ -7,7 +7,7 @@
 
     <groupId>org.elasticsearch.qa</groupId>
     <artifactId>elasticsearch-qa</artifactId>
-    <version>2.0.0-beta1-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>QA: Parent POM</name>
     <inceptionYear>2015</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>

qa/smoke-test-multinode/pom.xml

@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.elasticsearch.qa</groupId>
     <artifactId>elasticsearch-qa</artifactId>
-    <version>2.0.0-beta1-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
   </parent>
 
   <!-- 

qa/smoke-test-plugins/pom.xml

@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.elasticsearch.qa</groupId>
     <artifactId>elasticsearch-qa</artifactId>
-    <version>2.0.0-beta1-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
   </parent>
 
   <!-- 

qa/smoke-test-shaded/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.elasticsearch.qa</groupId>
         <artifactId>elasticsearch-qa</artifactId>
-        <version>2.0.0-beta1-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>smoke-test-shaded</artifactId>
@@ -23,7 +23,7 @@
         <dependency>
             <groupId>org.elasticsearch.distribution.shaded</groupId>
             <artifactId>elasticsearch</artifactId>
-            <version>2.0.0-beta1-SNAPSHOT</version>
+            <version>2.0.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>

qa/vagrant/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.elasticsearch.qa</groupId>
         <artifactId>elasticsearch-qa</artifactId>
-        <version>2.0.0-beta1-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>elasticsearch-distribution-tests</artifactId>

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>
   <description>REST API Specification and tests for use with the Elasticsearch REST Test framework</description>
   <parent>