From c4e213fc9237ca33029d0a3806743d3ecf6a0af5 Mon Sep 17 00:00:00 2001
From: uboness <uboness@gmail.com>
Date: Wed, 12 Aug 2015 20:55:26 +0200
Subject: [PATCH] Updated version to 2.0.0-SNAPSHOT

Original commit: elastic/x-pack-elasticsearch@8fb8035596e65f7dc7e0afa6a9f0fdf63bfde3cc
---
 marvel/pom.xml                                         |  2 +-
 .../java/org/elasticsearch/marvel/MarvelVersion.java   | 10 +++++-----
 .../org/elasticsearch/marvel/MarvelVersionTests.java   |  4 ++--
 .../test/resources/samples/marvel_cluster_stats.json   |  2 +-
 pom.xml                                                |  4 ++--
 qa/pom.xml                                             |  3 +--
 qa/smoke-test-plugins-ssl/pom.xml                      |  4 ++--
 qa/smoke-test-plugins/pom.xml                          |  4 ++--
 qa/smoke-test-watcher-with-shield/pom.xml              |  4 ++--
 shield/pom.xml                                         |  4 ++--
 .../shield/VersionCompatibilityTests.java              |  2 +-
 watcher/pom.xml                                        |  2 +-
 .../java/org/elasticsearch/watcher/WatcherVersion.java | 10 +++++-----
 x-dev-tools/pom.xml                                    |  7 ++++++-
 14 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/marvel/pom.xml b/marvel/pom.xml
index 4186700461a..92812a49a09 100644
--- a/marvel/pom.xml
+++ b/marvel/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.elasticsearch.plugin</groupId>
         <artifactId>x-plugins</artifactId>
-        <version>2.0.0-beta1-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <properties>
diff --git a/marvel/src/main/java/org/elasticsearch/marvel/MarvelVersion.java b/marvel/src/main/java/org/elasticsearch/marvel/MarvelVersion.java
index 99ac77bea2f..e049c72205c 100644
--- a/marvel/src/main/java/org/elasticsearch/marvel/MarvelVersion.java
+++ b/marvel/src/main/java/org/elasticsearch/marvel/MarvelVersion.java
@@ -21,10 +21,10 @@ public class MarvelVersion implements Serializable {
     // AA values below 50 are beta builds, and below 99 are RC builds, with 99 indicating a release
     // the (internal) format of the id is there so we can easily do after/before checks on the id
 
-    public static final int V_2_0_0_Beta1_ID = /*00*/2000001;
-    public static final MarvelVersion V_2_0_0_Beta1 = new MarvelVersion(V_2_0_0_Beta1_ID, true, Version.V_2_0_0_beta1, LicenseVersion.V_1_0_0);
+    public static final int V_2_0_0_ID = /*00*/2000099;
+    public static final MarvelVersion V_2_0_0 = new MarvelVersion(V_2_0_0_ID, true, Version.V_2_0_0, LicenseVersion.V_1_0_0);
 
-    public static final MarvelVersion CURRENT = V_2_0_0_Beta1;
+    public static final MarvelVersion CURRENT = V_2_0_0;
 
     public static MarvelVersion readVersion(StreamInput in) throws IOException {
         return fromId(in.readVInt());
@@ -32,8 +32,8 @@ public class MarvelVersion implements Serializable {
 
     public static MarvelVersion fromId(int id) {
         switch (id) {
-            case V_2_0_0_Beta1_ID:
-                return V_2_0_0_Beta1;
+            case V_2_0_0_ID:
+                return V_2_0_0;
             default:
                 return new MarvelVersion(id, null, Version.CURRENT, LicenseVersion.CURRENT);
         }
diff --git a/marvel/src/test/java/org/elasticsearch/marvel/MarvelVersionTests.java b/marvel/src/test/java/org/elasticsearch/marvel/MarvelVersionTests.java
index d2a99057be9..573b89ab554 100644
--- a/marvel/src/test/java/org/elasticsearch/marvel/MarvelVersionTests.java
+++ b/marvel/src/test/java/org/elasticsearch/marvel/MarvelVersionTests.java
@@ -14,11 +14,11 @@ public class MarvelVersionTests extends ESTestCase {
 
     @Test
     public void testVersionFromString() {
-        assertThat(MarvelVersion.fromString("2.0.0-beta1"), equalTo(MarvelVersion.V_2_0_0_Beta1));
+        assertThat(MarvelVersion.fromString("2.0.0"), equalTo(MarvelVersion.V_2_0_0));
     }
 
     @Test
     public void testVersionNumber() {
-        assertThat(MarvelVersion.V_2_0_0_Beta1.number(), equalTo("2.0.0-beta1"));
+        assertThat(MarvelVersion.V_2_0_0.number(), equalTo("2.0.0"));
     }
 }
\ No newline at end of file
diff --git a/marvel/src/test/resources/samples/marvel_cluster_stats.json b/marvel/src/test/resources/samples/marvel_cluster_stats.json
index e8241d95bab..3c13df54ab1 100644
--- a/marvel/src/test/resources/samples/marvel_cluster_stats.json
+++ b/marvel/src/test/resources/samples/marvel_cluster_stats.json
@@ -23,7 +23,7 @@
         "total": 1
       },
       "versions": [
-        "2.0.0-beta1-SNAPSHOT"
+        "2.0.0-SNAPSHOT"
       ],
       "jvm": {
         "max_uptime_in_millis": 75191
diff --git a/pom.xml b/pom.xml
index 0e3589909a9..b1f19c03143 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,14 +7,14 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>x-plugins</artifactId>
-    <version>2.0.0-beta1-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Elasticsearch X-Plugins - Parent POM</name>
 
     <parent>
         <groupId>org.elasticsearch.plugin</groupId>
         <artifactId>elasticsearch-plugin</artifactId>
-        <version>2.0.0-beta1-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <properties>
diff --git a/qa/pom.xml b/qa/pom.xml
index d2b2c0dc5ca..f945456bbef 100644
--- a/qa/pom.xml
+++ b/qa/pom.xml
@@ -7,7 +7,6 @@
 
     <groupId>org.elasticsearch.qa</groupId>
     <artifactId>x-plugins-qa</artifactId>
-    <version>2.0.0-beta1-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>QA: Parent POM</name>
     <inceptionYear>2015</inceptionYear>
@@ -15,7 +14,7 @@
     <parent>
         <groupId>org.elasticsearch.plugin</groupId>
         <artifactId>x-plugins</artifactId>
-        <version>2.0.0-beta1-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <properties>
diff --git a/qa/smoke-test-plugins-ssl/pom.xml b/qa/smoke-test-plugins-ssl/pom.xml
index 554abd11818..50a489d9037 100644
--- a/qa/smoke-test-plugins-ssl/pom.xml
+++ b/qa/smoke-test-plugins-ssl/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.elasticsearch.qa</groupId>
     <artifactId>x-plugins-qa</artifactId>
-    <version>2.0.0-beta1-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
   </parent>
 
   <!-- 
@@ -34,7 +34,7 @@
     <dependency>
       <groupId>org.elasticsearch.plugin</groupId>
       <artifactId>elasticsearch-shield</artifactId>
-      <version>2.0.0-beta1-SNAPSHOT</version>
+      <version>${elasticsearch.version}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/qa/smoke-test-plugins/pom.xml b/qa/smoke-test-plugins/pom.xml
index 6193fd9205f..c00f99ccc70 100644
--- a/qa/smoke-test-plugins/pom.xml
+++ b/qa/smoke-test-plugins/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.elasticsearch.qa</groupId>
     <artifactId>x-plugins-qa</artifactId>
-    <version>2.0.0-beta1-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
   </parent>
 
   <!-- 
@@ -32,7 +32,7 @@
     <dependency>
       <groupId>org.elasticsearch.plugin</groupId>
       <artifactId>elasticsearch-shield</artifactId>
-      <version>2.0.0-beta1-SNAPSHOT</version>
+      <version>${elasticsearch.version}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/qa/smoke-test-watcher-with-shield/pom.xml b/qa/smoke-test-watcher-with-shield/pom.xml
index 18f1146dd6b..0b56fcf60c3 100644
--- a/qa/smoke-test-watcher-with-shield/pom.xml
+++ b/qa/smoke-test-watcher-with-shield/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.elasticsearch.qa</groupId>
     <artifactId>x-plugins-qa</artifactId>
-    <version>2.0.0-beta1-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>smoke-test-watcher-with-shield</artifactId>
@@ -44,7 +44,7 @@
     <dependency>
       <groupId>org.elasticsearch.plugin</groupId>
       <artifactId>elasticsearch-shield</artifactId>
-      <version>${project.version}</version>
+      <version>${elasticsearch.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/shield/pom.xml b/shield/pom.xml
index 39dc037d62a..18f6f6a4e1b 100644
--- a/shield/pom.xml
+++ b/shield/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.elasticsearch.plugin</groupId>
         <artifactId>x-plugins</artifactId>
-        <version>2.0.0-beta1-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <properties>
@@ -45,7 +45,7 @@
         <dependency>
             <groupId>org.elasticsearch.plugin</groupId>
             <artifactId>elasticsearch-license</artifactId>
-            <version>${project.version}</version>
+            <version>${elasticsearch.version}</version>
             <scope>provided</scope>
         </dependency>
 
diff --git a/shield/src/test/java/org/elasticsearch/shield/VersionCompatibilityTests.java b/shield/src/test/java/org/elasticsearch/shield/VersionCompatibilityTests.java
index 2b2fddeb00b..fdd5571fd90 100644
--- a/shield/src/test/java/org/elasticsearch/shield/VersionCompatibilityTests.java
+++ b/shield/src/test/java/org/elasticsearch/shield/VersionCompatibilityTests.java
@@ -32,6 +32,6 @@ public class VersionCompatibilityTests extends ESTestCase {
          * Once es core supports merging cluster level custom metadata (licenses in our case), the tribe node will see some license coming from the tribe and everything will be ok.
          *
          */
-        assertThat("Remove workaround in LicenseService class when es core supports merging cluster level custom metadata", Version.CURRENT.onOrBefore(Version.V_2_0_0_beta1), is(true));
+        assertThat("Remove workaround in LicenseService class when es core supports merging cluster level custom metadata", Version.CURRENT.onOrBefore(Version.V_2_0_0), is(true));
     }
 }
diff --git a/watcher/pom.xml b/watcher/pom.xml
index cb0d388564f..09c4f428020 100644
--- a/watcher/pom.xml
+++ b/watcher/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.elasticsearch.plugin</groupId>
         <artifactId>x-plugins</artifactId>
-        <version>2.0.0-beta1-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <properties>
diff --git a/watcher/src/main/java/org/elasticsearch/watcher/WatcherVersion.java b/watcher/src/main/java/org/elasticsearch/watcher/WatcherVersion.java
index b6a4cb24e1f..2a18ffa8445 100644
--- a/watcher/src/main/java/org/elasticsearch/watcher/WatcherVersion.java
+++ b/watcher/src/main/java/org/elasticsearch/watcher/WatcherVersion.java
@@ -32,10 +32,10 @@ public class WatcherVersion implements Serializable {
     public static final WatcherVersion V_1_0_0_RC1 = new WatcherVersion(V_1_0_0_RC1_ID, false, Version.V_1_5_0, LicenseVersion.V_1_0_0);
     public static final int V_1_0_0_ID = /*00*/1000099;
     public static final WatcherVersion V_1_0_0 = new WatcherVersion(V_1_0_0_ID, false, Version.V_1_5_0, LicenseVersion.V_1_0_0);
-    public static final int V_2_0_0_Beta1_ID = /*00*/200001;
-    public static final WatcherVersion V_2_0_0_Beta1 = new WatcherVersion(V_2_0_0_Beta1_ID, true, Version.V_1_5_0, LicenseVersion.V_2_0_0_beta1);
+    public static final int V_2_0_0_ID = /*00*/2000099;
+    public static final WatcherVersion V_2_0_0 = new WatcherVersion(V_2_0_0_ID, true, Version.V_1_5_0, LicenseVersion.V_2_0_0);
 
-    public static final WatcherVersion CURRENT = V_2_0_0_Beta1;
+    public static final WatcherVersion CURRENT = V_2_0_0;
 
     public static WatcherVersion readVersion(StreamInput in) throws IOException {
         return fromId(in.readVInt());
@@ -51,8 +51,8 @@ public class WatcherVersion implements Serializable {
                 return V_1_0_0_RC1;
             case V_1_0_0_ID:
                 return V_1_0_0;
-            case V_2_0_0_Beta1_ID:
-                return V_2_0_0_Beta1;
+            case V_2_0_0_ID:
+                return V_2_0_0;
             default:
                 return new WatcherVersion(id, null, Version.CURRENT, LicenseVersion.CURRENT);
         }
diff --git a/x-dev-tools/pom.xml b/x-dev-tools/pom.xml
index 5a40ada65c3..79cba37db86 100644
--- a/x-dev-tools/pom.xml
+++ b/x-dev-tools/pom.xml
@@ -1,12 +1,15 @@
 <project>
+
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.elasticsearch</groupId>
   <artifactId>elasticsearch-x-dev-tools</artifactId>
-  <version>2.0.0-beta1-SNAPSHOT</version>
+  <version>2.0.0-SNAPSHOT</version>
   <name>Elasticsearch Commercial Plugin Build Resources</name>
+
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
+
   <build>
     <plugins>
       <plugin>
@@ -28,6 +31,7 @@
       </plugin>
     </plugins>
   </build>
+
   <profiles>
     <profile>
       <id>deploy-internal</id>
@@ -61,5 +65,6 @@
       </activation>
     </profile>
   </profiles>
+
 </project>