From 7d12d314ad302e369c370f7f5a412cb19479b322 Mon Sep 17 00:00:00 2001 From: uboness Date: Wed, 20 May 2015 15:29:52 +0200 Subject: [PATCH] moving version to 2.0.0-SNAPSHOT Original commit: elastic/x-pack-elasticsearch@58e7b38de58796a08958aee28e230fc88e3cfbec --- pom.xml | 2 +- rest-api-spec/test/watch_info/10_basic.yaml | 2 +- .../java/org/elasticsearch/watcher/WatcherVersion.java | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index b35f5a01c5f..75152b7d825 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ org.elasticsearch elasticsearch-watcher - 1.0.0-Beta1 + 2.0.0-SNAPSHOT scm:git:git@github.com:elastic/elasticsearch-watcher.git diff --git a/rest-api-spec/test/watch_info/10_basic.yaml b/rest-api-spec/test/watch_info/10_basic.yaml index 6da2e78ceb2..e30b7db31e6 100644 --- a/rest-api-spec/test/watch_info/10_basic.yaml +++ b/rest-api-spec/test/watch_info/10_basic.yaml @@ -3,4 +3,4 @@ - do: {watcher.info: {}} - is_true: version.build_hash - is_true: version.build_timestamp - - is_false: version.build_snapshot + - is_true: version.build_snapshot diff --git a/src/main/java/org/elasticsearch/watcher/WatcherVersion.java b/src/main/java/org/elasticsearch/watcher/WatcherVersion.java index 545125fb806..9233ae09204 100644 --- a/src/main/java/org/elasticsearch/watcher/WatcherVersion.java +++ b/src/main/java/org/elasticsearch/watcher/WatcherVersion.java @@ -26,8 +26,10 @@ public class WatcherVersion implements Serializable { public static final int V_1_0_0_Beta1_ID = /*00*/1000001; public static final WatcherVersion V_1_0_0_Beta1 = new WatcherVersion(V_1_0_0_Beta1_ID, false, Version.V_1_5_0, LicenseVersion.V_1_0_0); + 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, false, Version.V_1_5_0, LicenseVersion.V_1_0_0); - public static final WatcherVersion CURRENT = V_1_0_0_Beta1; + public static final WatcherVersion CURRENT = V_2_0_0; public static WatcherVersion readVersion(StreamInput in) throws IOException { return fromId(in.readVInt()); @@ -37,7 +39,8 @@ public class WatcherVersion implements Serializable { switch (id) { case V_1_0_0_Beta1_ID: return V_1_0_0_Beta1; - + case V_2_0_0_ID: + return V_2_0_0; default: return new WatcherVersion(id, null, Version.CURRENT, LicenseVersion.CURRENT); }