honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updated version to 2.0.0-SNAPSHOT 

Original commit: elastic/x-pack-elasticsearch@8fb8035596
This commit is contained in:
uboness 2015-08-12 20:55:26 +02:00
parent ae7d9c3048
commit c4e213fc92
14 changed files with 33 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
marvel/pom.xml
View File

@ -12,7 +12,7 @@
<parent> <parent>
<groupId>org.elasticsearch.plugin</groupId> <groupId>org.elasticsearch.plugin</groupId>
<artifactId>x-plugins</artifactId> <artifactId>x-plugins</artifactId>
<version>2.0.0-beta1-SNAPSHOT</version> <version>2.0.0-SNAPSHOT</version>
</parent> </parent>
<properties> <properties>

10
marvel/src/main/java/org/elasticsearch/marvel/MarvelVersion.java
View File

@ -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 // 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 // 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 int V_2_0_0_ID = /*00*/2000099;
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 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 { public static MarvelVersion readVersion(StreamInput in) throws IOException {
return fromId(in.readVInt()); return fromId(in.readVInt());
@ -32,8 +32,8 @@ public class MarvelVersion implements Serializable {
public static MarvelVersion fromId(int id) { public static MarvelVersion fromId(int id) {
switch (id) { switch (id) {
case V_2_0_0_Beta1_ID: case V_2_0_0_ID:
return V_2_0_0_Beta1; return V_2_0_0;
default: default:
return new MarvelVersion(id, null, Version.CURRENT, LicenseVersion.CURRENT); return new MarvelVersion(id, null, Version.CURRENT, LicenseVersion.CURRENT);
} }

4
marvel/src/test/java/org/elasticsearch/marvel/MarvelVersionTests.java
View File

@ -14,11 +14,11 @@ public class MarvelVersionTests extends ESTestCase {
@Test @Test
public void testVersionFromString() { 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 @Test
public void testVersionNumber() { 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"));
} }
} }

2
marvel/src/test/resources/samples/marvel_cluster_stats.json
View File

@ -23,7 +23,7 @@
"total": 1 "total": 1
}, },
"versions": [ "versions": [
"2.0.0-beta1-SNAPSHOT" "2.0.0-SNAPSHOT"
], ],
"jvm": { "jvm": {
"max_uptime_in_millis": 75191 "max_uptime_in_millis": 75191

4
pom.xml
View File

@ -7,14 +7,14 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>x-plugins</artifactId> <artifactId>x-plugins</artifactId>
<version>2.0.0-beta1-SNAPSHOT</version> <version>2.0.0-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>Elasticsearch X-Plugins - Parent POM</name> <name>Elasticsearch X-Plugins - Parent POM</name>
<parent> <parent>
<groupId>org.elasticsearch.plugin</groupId> <groupId>org.elasticsearch.plugin</groupId>
<artifactId>elasticsearch-plugin</artifactId> <artifactId>elasticsearch-plugin</artifactId>
<version>2.0.0-beta1-SNAPSHOT</version> <version>2.0.0-SNAPSHOT</version>
</parent> </parent>
<properties> <properties>

3
qa/pom.xml
View File

@ -7,7 +7,6 @@
<groupId>org.elasticsearch.qa</groupId> <groupId>org.elasticsearch.qa</groupId>
<artifactId>x-plugins-qa</artifactId> <artifactId>x-plugins-qa</artifactId>
<version>2.0.0-beta1-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>QA: Parent POM</name> <name>QA: Parent POM</name>
<inceptionYear>2015</inceptionYear> <inceptionYear>2015</inceptionYear>
@ -15,7 +14,7 @@
<parent> <parent>
<groupId>org.elasticsearch.plugin</groupId> <groupId>org.elasticsearch.plugin</groupId>
<artifactId>x-plugins</artifactId> <artifactId>x-plugins</artifactId>
<version>2.0.0-beta1-SNAPSHOT</version> <version>2.0.0-SNAPSHOT</version>
</parent> </parent>
<properties> <properties>

4
qa/smoke-test-plugins-ssl/pom.xml
View File

@ -8,7 +8,7 @@
<parent> <parent>
<groupId>org.elasticsearch.qa</groupId> <groupId>org.elasticsearch.qa</groupId>
<artifactId>x-plugins-qa</artifactId> <artifactId>x-plugins-qa</artifactId>
<version>2.0.0-beta1-SNAPSHOT</version> <version>2.0.0-SNAPSHOT</version>
</parent> </parent>
<!-- <!--
@ -34,7 +34,7 @@
<dependency> <dependency>
<groupId>org.elasticsearch.plugin</groupId> <groupId>org.elasticsearch.plugin</groupId>
<artifactId>elasticsearch-shield</artifactId> <artifactId>elasticsearch-shield</artifactId>
<version>2.0.0-beta1-SNAPSHOT</version> <version>${elasticsearch.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>

4
qa/smoke-test-plugins/pom.xml
View File

@ -8,7 +8,7 @@
<parent> <parent>
<groupId>org.elasticsearch.qa</groupId> <groupId>org.elasticsearch.qa</groupId>
<artifactId>x-plugins-qa</artifactId> <artifactId>x-plugins-qa</artifactId>
<version>2.0.0-beta1-SNAPSHOT</version> <version>2.0.0-SNAPSHOT</version>
</parent> </parent>
<!-- <!--
@ -32,7 +32,7 @@
<dependency> <dependency>
<groupId>org.elasticsearch.plugin</groupId> <groupId>org.elasticsearch.plugin</groupId>
<artifactId>elasticsearch-shield</artifactId> <artifactId>elasticsearch-shield</artifactId>
<version>2.0.0-beta1-SNAPSHOT</version> <version>${elasticsearch.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>

4
qa/smoke-test-watcher-with-shield/pom.xml
View File

@ -25,7 +25,7 @@
<parent> <parent>
<groupId>org.elasticsearch.qa</groupId> <groupId>org.elasticsearch.qa</groupId>
<artifactId>x-plugins-qa</artifactId> <artifactId>x-plugins-qa</artifactId>
<version>2.0.0-beta1-SNAPSHOT</version> <version>2.0.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>smoke-test-watcher-with-shield</artifactId> <artifactId>smoke-test-watcher-with-shield</artifactId>
@ -44,7 +44,7 @@
<dependency> <dependency>
<groupId>org.elasticsearch.plugin</groupId> <groupId>org.elasticsearch.plugin</groupId>
<artifactId>elasticsearch-shield</artifactId> <artifactId>elasticsearch-shield</artifactId>
<version>${project.version}</version> <version>${elasticsearch.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>

4
shield/pom.xml
View File

@ -12,7 +12,7 @@
<parent> <parent>
<groupId>org.elasticsearch.plugin</groupId> <groupId>org.elasticsearch.plugin</groupId>
<artifactId>x-plugins</artifactId> <artifactId>x-plugins</artifactId>
<version>2.0.0-beta1-SNAPSHOT</version> <version>2.0.0-SNAPSHOT</version>
</parent> </parent>
<properties> <properties>
@ -45,7 +45,7 @@
<dependency> <dependency>
<groupId>org.elasticsearch.plugin</groupId> <groupId>org.elasticsearch.plugin</groupId>
<artifactId>elasticsearch-license</artifactId> <artifactId>elasticsearch-license</artifactId>
<version>${project.version}</version> <version>${elasticsearch.version}</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>

2
shield/src/test/java/org/elasticsearch/shield/VersionCompatibilityTests.java
View File

@ -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. * 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));
} }
} }

2
watcher/pom.xml
View File

@ -12,7 +12,7 @@
<parent> <parent>
<groupId>org.elasticsearch.plugin</groupId> <groupId>org.elasticsearch.plugin</groupId>
<artifactId>x-plugins</artifactId> <artifactId>x-plugins</artifactId>
<version>2.0.0-beta1-SNAPSHOT</version> <version>2.0.0-SNAPSHOT</version>
</parent> </parent>
<properties> <properties>

10
watcher/src/main/java/org/elasticsearch/watcher/WatcherVersion.java
View File

@ -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 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 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_ID = /*00*/2000099;
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 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 { public static WatcherVersion readVersion(StreamInput in) throws IOException {
return fromId(in.readVInt()); return fromId(in.readVInt());
@ -51,8 +51,8 @@ public class WatcherVersion implements Serializable {
return V_1_0_0_RC1; return V_1_0_0_RC1;
case V_1_0_0_ID: case V_1_0_0_ID:
return V_1_0_0; return V_1_0_0;
case V_2_0_0_Beta1_ID: case V_2_0_0_ID:
return V_2_0_0_Beta1; return V_2_0_0;
default: default:
return new WatcherVersion(id, null, Version.CURRENT, LicenseVersion.CURRENT); return new WatcherVersion(id, null, Version.CURRENT, LicenseVersion.CURRENT);
} }

7
x-dev-tools/pom.xml
View File

@ -1,12 +1,15 @@
<project> <project>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.elasticsearch</groupId> <groupId>org.elasticsearch</groupId>
<artifactId>elasticsearch-x-dev-tools</artifactId> <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> <name>Elasticsearch Commercial Plugin Build Resources</name>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties> </properties>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
@ -28,6 +31,7 @@
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
<profiles> <profiles>
<profile> <profile>
<id>deploy-internal</id> <id>deploy-internal</id>
@ -61,5 +65,6 @@
</activation> </activation>
</profile> </profile>
</profiles> </profiles>
</project> </project>