From e516427bfc472024f1d2b5d65b0002ccf0b0eb36 Mon Sep 17 00:00:00 2001
From: Robert Muir <rmuir@apache.org>
Date: Thu, 9 Jul 2015 20:04:08 -0400
Subject: [PATCH] bump version to 2.0.0.beta1-SNAPSHOT and fix broken assert.

this was already done in ES core, but commercial plugins are now sitting out of sync.

also 'mvn verify' would sometimes fail, because apparently the list of plugins from the plugin api
is not defined (my suspicion: filesystem order, which is undefined). For now I changed the assert
to allow any order.

Original commit: elastic/x-pack-elasticsearch@9ea0ac457f319f6b8f1e41a5d20651d9a628d3fb
---
 pom.xml                                                     | 6 +++---
 .../org/elasticsearch/shield/VersionCompatibilityTests.java | 2 +-
 .../java/org/elasticsearch/test/ShieldIntegrationTest.java  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1b2e5c2e1ef..ad2c189ae06 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>org.elasticsearch</groupId>
     <artifactId>elasticsearch-shield</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.beta1-SNAPSHOT</version>
 
     <scm>
         <connection>scm:git:git@github.com:elasticsearch/elasticsearch-shield.git</connection>
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.elasticsearch.plugin</groupId>
         <artifactId>elasticsearch-plugin</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0.beta1-SNAPSHOT</version>
     </parent>
 
     <repositories>
@@ -50,7 +50,7 @@
         <elasticsearch.license.header>dev-tools/elasticsearch_license_header.txt</elasticsearch.license.header>
         <elasticsearch.license.headerDefinition>dev-tools/license_header_definition.xml</elasticsearch.license.headerDefinition>
         <elasticsearch.integ.antfile>dev-tools/integration-tests.xml</elasticsearch.integ.antfile>
-        <license.plugin.version>2.0.0-SNAPSHOT</license.plugin.version>
+        <license.plugin.version>2.0.0.beta1-SNAPSHOT</license.plugin.version>
         <tests.rest.blacklist>indices.get/10_basic/*allow_no_indices*,cat.count/10_basic/Test cat count output,cat.aliases/10_basic/Empty cluster,indices.segments/10_basic/no segments test,indices.clear_cache/10_basic/clear_cache test,indices.status/10_basic/Indices status test,cat.indices/10_basic/Test cat indices output,cat.recovery/10_basic/Test cat recovery output,cat.shards/10_basic/Test cat shards output,termvector/20_issue7121/*,index/10_with_id/Index with ID,indices.get_alias/20_emtpy/*,cat.segments/10_basic/Test cat segments output,indices.put_settings/10_basic/Test indices settings allow_no_indices,indices.put_settings/10_basic/Test indices settings ignore_unavailable,indices.refresh/10_basic/Indices refresh test no-match wildcard,indices.stats/10_index/Index - star*,indices.recovery/10_basic/Indices recovery test*,template/30_render_search_template/*</tests.rest.blacklist>
     </properties>
 
diff --git a/src/test/java/org/elasticsearch/shield/VersionCompatibilityTests.java b/src/test/java/org/elasticsearch/shield/VersionCompatibilityTests.java
index 0085635ca23..070fe5d289a 100644
--- a/src/test/java/org/elasticsearch/shield/VersionCompatibilityTests.java
+++ b/src/test/java/org/elasticsearch/shield/VersionCompatibilityTests.java
@@ -32,6 +32,6 @@ public class VersionCompatibilityTests extends ElasticsearchTestCase {
          * 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), 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_beta1), is(true));
     }
 }
diff --git a/src/test/java/org/elasticsearch/test/ShieldIntegrationTest.java b/src/test/java/org/elasticsearch/test/ShieldIntegrationTest.java
index f70340d056c..3d30b48cd24 100644
--- a/src/test/java/org/elasticsearch/test/ShieldIntegrationTest.java
+++ b/src/test/java/org/elasticsearch/test/ShieldIntegrationTest.java
@@ -35,7 +35,7 @@ import java.util.Random;
 
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoTimeout;
 import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.Matchers.hasSize;
 
 /**
@@ -141,7 +141,7 @@ public abstract class ShieldIntegrationTest extends ElasticsearchIntegrationTest
                 public String apply(PluginInfo pluginInfo) {
                     return pluginInfo.getName();
                 }
-            }), contains(ShieldPlugin.NAME, licensePluginName()));
+            }), containsInAnyOrder(ShieldPlugin.NAME, licensePluginName()));
         }
     }