bump build versions to 2.0.0.beta1-SNAPSHOT
Original commit: elastic/x-pack-elasticsearch@d254c9304f
This commit is contained in:
parent
36f5bbd232
commit
35d7c2d61a
8
pom.xml
8
pom.xml
|
@ -7,7 +7,7 @@
|
||||||
|
|
||||||
<groupId>org.elasticsearch</groupId>
|
<groupId>org.elasticsearch</groupId>
|
||||||
<artifactId>elasticsearch-watcher</artifactId>
|
<artifactId>elasticsearch-watcher</artifactId>
|
||||||
<version>2.0.0-beta1-SNAPSHOT</version>
|
<version>2.0.0.beta1-SNAPSHOT</version>
|
||||||
|
|
||||||
<scm>
|
<scm>
|
||||||
<connection>scm:git:git@github.com:elastic/elasticsearch-watcher.git</connection>
|
<connection>scm:git:git@github.com:elastic/elasticsearch-watcher.git</connection>
|
||||||
|
@ -18,15 +18,15 @@
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>org.elasticsearch.plugin</groupId>
|
<groupId>org.elasticsearch.plugin</groupId>
|
||||||
<artifactId>elasticsearch-plugin</artifactId>
|
<artifactId>elasticsearch-plugin</artifactId>
|
||||||
<version>2.0.0-SNAPSHOT</version>
|
<version>2.0.0.beta1-SNAPSHOT</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<elasticsearch.license.header>dev-tools/elasticsearch_license_header.txt</elasticsearch.license.header>
|
<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.license.headerDefinition>dev-tools/license_header_definition.xml</elasticsearch.license.headerDefinition>
|
||||||
<elasticsearch.integ.antfile>dev-tools/integration-tests.xml</elasticsearch.integ.antfile>
|
<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>
|
||||||
<shield.plugin.version>2.0.0-SNAPSHOT</shield.plugin.version>
|
<shield.plugin.version>2.0.0.beta1-SNAPSHOT</shield.plugin.version>
|
||||||
<tests.rest.load_packaged>false</tests.rest.load_packaged>
|
<tests.rest.load_packaged>false</tests.rest.load_packaged>
|
||||||
<tests.timewarp>true</tests.timewarp>
|
<tests.timewarp>true</tests.timewarp>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
|
@ -33,7 +33,7 @@ public class WatcherVersion implements Serializable {
|
||||||
public static final int V_1_0_0_ID = /*00*/1000099;
|
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 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 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);
|
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 WatcherVersion CURRENT = V_2_0_0_Beta1;
|
public static final WatcherVersion CURRENT = V_2_0_0_Beta1;
|
||||||
|
|
||||||
|
|
|
@ -20,7 +20,7 @@ import org.elasticsearch.watcher.WatcherVersion;
|
||||||
*/
|
*/
|
||||||
public class ShieldIntegration {
|
public class ShieldIntegration {
|
||||||
|
|
||||||
private static final int MIN_SHIELD_VERSION = /*00*/2000099; // 2.0.0
|
private static final int MIN_SHIELD_VERSION = /*00*/2000001; // 2.0.0_beta1
|
||||||
|
|
||||||
private final boolean installed;
|
private final boolean installed;
|
||||||
private final boolean enabled;
|
private final boolean enabled;
|
||||||
|
|
Loading…
Reference in New Issue