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

Move master to [2.1.0-SNAPSHOT]

This commit is contained in:
Simon Willnauer 2015-08-14 23:43:47 +02:00
parent 6292bc07f9
commit b447e2ae99
32 changed files with 38 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/pom.xml
View File

@ -6,7 +6,7 @@
<parent> <parent>
<groupId>org.elasticsearch</groupId> <groupId>org.elasticsearch</groupId>
<artifactId>elasticsearch-parent</artifactId> <artifactId>elasticsearch-parent</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>2.1.0-SNAPSHOT</version>
</parent> </parent>
<groupId>org.elasticsearch</groupId> <groupId>org.elasticsearch</groupId>

6
core/src/main/java/org/elasticsearch/Version.java
View File

@ -257,8 +257,10 @@ public class Version {
public static final Version V_2_0_0_beta1 = new Version(V_2_0_0_beta1_ID, true, org.apache.lucene.util.Version.LUCENE_5_2_1); public static final Version V_2_0_0_beta1 = new Version(V_2_0_0_beta1_ID, true, org.apache.lucene.util.Version.LUCENE_5_2_1);
public static final int V_2_0_0_ID = 2000099; public static final int V_2_0_0_ID = 2000099;
public static final Version V_2_0_0 = new Version(V_2_0_0_ID, true, org.apache.lucene.util.Version.LUCENE_5_2_1); public static final Version V_2_0_0 = new Version(V_2_0_0_ID, true, org.apache.lucene.util.Version.LUCENE_5_2_1);
public static final int V_2_1_0_ID = 2010099;
public static final Version V_2_1_0 = new Version(V_2_1_0_ID, true, org.apache.lucene.util.Version.LUCENE_5_2_1);
public static final Version CURRENT = V_2_0_0; public static final Version CURRENT = V_2_1_0;
static { static {
assert CURRENT.luceneVersion.equals(Lucene.VERSION) : "Version must be upgraded to [" + Lucene.VERSION + "] is still set to [" + CURRENT.luceneVersion + "]"; assert CURRENT.luceneVersion.equals(Lucene.VERSION) : "Version must be upgraded to [" + Lucene.VERSION + "] is still set to [" + CURRENT.luceneVersion + "]";
@ -270,6 +272,8 @@ public class Version {
public static Version fromId(int id) { public static Version fromId(int id) {
switch (id) { switch (id) {
case V_2_1_0_ID:
return V_2_1_0;
case V_2_0_0_ID: case V_2_0_0_ID:
return V_2_0_0; return V_2_0_0;
case V_2_0_0_beta1_ID: case V_2_0_0_beta1_ID:

2
dev-tools/pom.xml
View File

@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.elasticsearch</groupId> <groupId>org.elasticsearch</groupId>
<artifactId>elasticsearch-dev-tools</artifactId> <artifactId>elasticsearch-dev-tools</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>2.1.0-SNAPSHOT</version>
<name>Elasticsearch Build Resources</name> <name>Elasticsearch Build Resources</name>
<description>Tools to assist in building and developing in the Elasticsearch project</description> <description>Tools to assist in building and developing in the Elasticsearch project</description>
<parent> <parent>

2
distribution/deb/pom.xml
View File

@ -6,7 +6,7 @@
<parent> <parent>
<groupId>org.elasticsearch.distribution</groupId> <groupId>org.elasticsearch.distribution</groupId>
<artifactId>elasticsearch-distribution</artifactId> <artifactId>elasticsearch-distribution</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>2.1.0-SNAPSHOT</version>
</parent> </parent>
<groupId>org.elasticsearch.distribution.deb</groupId> <groupId>org.elasticsearch.distribution.deb</groupId>

2
distribution/fully-loaded/pom.xml
View File

@ -6,7 +6,7 @@
<parent> <parent>
<groupId>org.elasticsearch.distribution</groupId> <groupId>org.elasticsearch.distribution</groupId>
<artifactId>elasticsearch-distribution</artifactId> <artifactId>elasticsearch-distribution</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>2.1.0-SNAPSHOT</version>
</parent> </parent>
<groupId>org.elasticsearch.distribution.fully-loaded</groupId> <groupId>org.elasticsearch.distribution.fully-loaded</groupId>

2
distribution/pom.xml
View File

@ -6,7 +6,7 @@
<parent> <parent>
<groupId>org.elasticsearch</groupId> <groupId>org.elasticsearch</groupId>
<artifactId>elasticsearch-parent</artifactId> <artifactId>elasticsearch-parent</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>2.1.0-SNAPSHOT</version>
</parent> </parent>
<groupId>org.elasticsearch.distribution</groupId> <groupId>org.elasticsearch.distribution</groupId>

2
distribution/rpm/pom.xml
View File

@ -6,7 +6,7 @@
<parent> <parent>
<groupId>org.elasticsearch.distribution</groupId> <groupId>org.elasticsearch.distribution</groupId>
<artifactId>elasticsearch-distribution</artifactId> <artifactId>elasticsearch-distribution</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>2.1.0-SNAPSHOT</version>
</parent> </parent>
<groupId>org.elasticsearch.distribution.rpm</groupId> <groupId>org.elasticsearch.distribution.rpm</groupId>

2
distribution/shaded/pom.xml
View File

@ -6,7 +6,7 @@
<parent> <parent>
<groupId>org.elasticsearch.distribution</groupId> <groupId>org.elasticsearch.distribution</groupId>
<artifactId>elasticsearch-distribution</artifactId> <artifactId>elasticsearch-distribution</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>2.1.0-SNAPSHOT</version>
</parent> </parent>
<groupId>org.elasticsearch.distribution.shaded</groupId> <groupId>org.elasticsearch.distribution.shaded</groupId>

2
distribution/tar/pom.xml
View File

@ -6,7 +6,7 @@
<parent> <parent>
<groupId>org.elasticsearch.distribution</groupId> <groupId>org.elasticsearch.distribution</groupId>
<artifactId>elasticsearch-distribution</artifactId> <artifactId>elasticsearch-distribution</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>2.1.0-SNAPSHOT</version>
</parent> </parent>
<groupId>org.elasticsearch.distribution.tar</groupId> <groupId>org.elasticsearch.distribution.tar</groupId>

2
distribution/zip/pom.xml
View File

@ -6,7 +6,7 @@
<parent> <parent>
<groupId>org.elasticsearch.distribution</groupId> <groupId>org.elasticsearch.distribution</groupId>
<artifactId>elasticsearch-distribution</artifactId> <artifactId>elasticsearch-distribution</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>2.1.0-SNAPSHOT</version>
</parent> </parent>
<groupId>org.elasticsearch.distribution.zip</groupId> <groupId>org.elasticsearch.distribution.zip</groupId>

2
plugins/analysis-icu/pom.xml
View File

@ -7,7 +7,7 @@
<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.1.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>elasticsearch-analysis-icu</artifactId> <artifactId>elasticsearch-analysis-icu</artifactId>

2
plugins/analysis-kuromoji/pom.xml
View File

@ -7,7 +7,7 @@
<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.1.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>elasticsearch-analysis-kuromoji</artifactId> <artifactId>elasticsearch-analysis-kuromoji</artifactId>

2
plugins/analysis-phonetic/pom.xml
View File

@ -7,7 +7,7 @@
<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.1.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>elasticsearch-analysis-phonetic</artifactId> <artifactId>elasticsearch-analysis-phonetic</artifactId>

2
plugins/analysis-smartcn/pom.xml
View File

@ -7,7 +7,7 @@
<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.1.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>elasticsearch-analysis-smartcn</artifactId> <artifactId>elasticsearch-analysis-smartcn</artifactId>

2
plugins/analysis-stempel/pom.xml
View File

@ -7,7 +7,7 @@
<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.1.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>elasticsearch-analysis-stempel</artifactId> <artifactId>elasticsearch-analysis-stempel</artifactId>

2
plugins/cloud-aws/pom.xml
View File

@ -7,7 +7,7 @@
<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.1.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>elasticsearch-cloud-aws</artifactId> <artifactId>elasticsearch-cloud-aws</artifactId>

2
plugins/cloud-azure/pom.xml
View File

@ -18,7 +18,7 @@ governing permissions and limitations under the License. -->
<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.1.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>elasticsearch-cloud-azure</artifactId> <artifactId>elasticsearch-cloud-azure</artifactId>

2
plugins/cloud-gce/pom.xml
View File

@ -18,7 +18,7 @@ governing permissions and limitations under the License. -->
<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.1.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>elasticsearch-cloud-gce</artifactId> <artifactId>elasticsearch-cloud-gce</artifactId>

2
plugins/delete-by-query/pom.xml
View File

@ -18,7 +18,7 @@ governing permissions and limitations under the License. -->
<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.1.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>elasticsearch-delete-by-query</artifactId> <artifactId>elasticsearch-delete-by-query</artifactId>

2
plugins/jvm-example/pom.xml
View File

@ -7,7 +7,7 @@
<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.1.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>elasticsearch-jvm-example</artifactId> <artifactId>elasticsearch-jvm-example</artifactId>

2
plugins/lang-javascript/pom.xml
View File

@ -7,7 +7,7 @@
<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.1.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>elasticsearch-lang-javascript</artifactId> <artifactId>elasticsearch-lang-javascript</artifactId>

2
plugins/lang-python/pom.xml
View File

@ -7,7 +7,7 @@
<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.1.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>elasticsearch-lang-python</artifactId> <artifactId>elasticsearch-lang-python</artifactId>

2
plugins/mapper-size/pom.xml
View File

@ -18,7 +18,7 @@ governing permissions and limitations under the License. -->
<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.1.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>elasticsearch-mapper-size</artifactId> <artifactId>elasticsearch-mapper-size</artifactId>

4
plugins/pom.xml
View File

@ -7,7 +7,7 @@
<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.1.0-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>Elasticsearch Plugin POM</name> <name>Elasticsearch Plugin POM</name>
<inceptionYear>2009</inceptionYear> <inceptionYear>2009</inceptionYear>
@ -16,7 +16,7 @@
<parent> <parent>
<groupId>org.elasticsearch</groupId> <groupId>org.elasticsearch</groupId>
<artifactId>elasticsearch-parent</artifactId> <artifactId>elasticsearch-parent</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>2.1.0-SNAPSHOT</version>
</parent> </parent>
<properties> <properties>

2
plugins/site-example/pom.xml
View File

@ -7,7 +7,7 @@
<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.1.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>elasticsearch-site-example</artifactId> <artifactId>elasticsearch-site-example</artifactId>

2
pom.xml
View File

@ -6,7 +6,7 @@
<groupId>org.elasticsearch</groupId> <groupId>org.elasticsearch</groupId>
<artifactId>elasticsearch-parent</artifactId> <artifactId>elasticsearch-parent</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>2.1.0-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>Elasticsearch Parent POM</name> <name>Elasticsearch Parent POM</name>
<description>Elasticsearch Parent POM</description> <description>Elasticsearch Parent POM</description>

4
qa/pom.xml
View File

@ -7,7 +7,7 @@
<groupId>org.elasticsearch.qa</groupId> <groupId>org.elasticsearch.qa</groupId>
<artifactId>elasticsearch-qa</artifactId> <artifactId>elasticsearch-qa</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>2.1.0-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 +15,7 @@
<parent> <parent>
<groupId>org.elasticsearch</groupId> <groupId>org.elasticsearch</groupId>
<artifactId>elasticsearch-parent</artifactId> <artifactId>elasticsearch-parent</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>2.1.0-SNAPSHOT</version>
</parent> </parent>
<properties> <properties>

2
qa/smoke-test-multinode/pom.xml
View File

@ -8,7 +8,7 @@
<parent> <parent>
<groupId>org.elasticsearch.qa</groupId> <groupId>org.elasticsearch.qa</groupId>
<artifactId>elasticsearch-qa</artifactId> <artifactId>elasticsearch-qa</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>2.1.0-SNAPSHOT</version>
</parent> </parent>
<!-- <!--

2
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>elasticsearch-qa</artifactId> <artifactId>elasticsearch-qa</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>2.1.0-SNAPSHOT</version>
</parent> </parent>
<!-- <!--

2
qa/smoke-test-shaded/pom.xml
View File

@ -7,7 +7,7 @@
<parent> <parent>
<groupId>org.elasticsearch.qa</groupId> <groupId>org.elasticsearch.qa</groupId>
<artifactId>elasticsearch-qa</artifactId> <artifactId>elasticsearch-qa</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>2.1.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>smoke-test-shaded</artifactId> <artifactId>smoke-test-shaded</artifactId>

2
qa/vagrant/pom.xml
View File

@ -6,7 +6,7 @@
<parent> <parent>
<groupId>org.elasticsearch.qa</groupId> <groupId>org.elasticsearch.qa</groupId>
<artifactId>elasticsearch-qa</artifactId> <artifactId>elasticsearch-qa</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>2.1.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>elasticsearch-distribution-tests</artifactId> <artifactId>elasticsearch-distribution-tests</artifactId>

2
rest-api-spec/pom.xml
View File

@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.elasticsearch</groupId> <groupId>org.elasticsearch</groupId>
<artifactId>elasticsearch-rest-api-spec</artifactId> <artifactId>elasticsearch-rest-api-spec</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>2.1.0-SNAPSHOT</version>
<name>Elasticsearch Rest API Spec</name> <name>Elasticsearch Rest API Spec</name>
<description>REST API Specification and tests for use with the Elasticsearch REST Test framework</description> <description>REST API Specification and tests for use with the Elasticsearch REST Test framework</description>
<parent> <parent>