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

Cut over master to 2.0.0-SNAPSHOT

This commit is contained in:
Simon Willnauer 2015-08-03 17:38:30 +02:00 committed by Clinton Gormley
parent 79d1568b58
commit 605253a39f
33 changed files with 43 additions and 35 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>
<groupId>org.elasticsearch</groupId>
<artifactId>elasticsearch-parent</artifactId>
<version>2.0.0-beta1-SNAPSHOT</version>
<version>2.0.0-SNAPSHOT</version>
</parent>
<groupId>org.elasticsearch</groupId>

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

@ -255,8 +255,10 @@ public class Version {
public static final int V_2_0_0_beta1_ID = 2000001;
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 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 CURRENT = V_2_0_0_beta1;
public static final Version CURRENT = V_2_0_0;
static {
assert CURRENT.luceneVersion.equals(Lucene.VERSION) : "Version must be upgraded to [" + Lucene.VERSION + "] is still set to [" + CURRENT.luceneVersion + "]";
@ -268,6 +270,8 @@ public class Version {
public static Version fromId(int id) {
switch (id) {
case V_2_0_0_ID:
return V_2_0_0;
case V_2_0_0_beta1_ID:
return V_2_0_0_beta1;
case V_1_7_2_ID:

4
core/src/test/java/org/elasticsearch/VersionTests.java
View File

@ -203,6 +203,10 @@ public class VersionTests extends ESTestCase {
// only the latest version for a branch should be a snapshot (ie unreleased)
String branchName = "" + v.major + "." + v.minor;
if (v.equals(Version.V_2_0_0_beta1)) {
assertTrue("Remove this once beta1 is released", v.snapshot());
continue; // this is just a temporary fix until we have a snapshot for the beta since we now have 2 unreleased version of the same major.minor group
}
Version maxBranchVersion = maxBranchVersions.get(branchName);
if (maxBranchVersion == null) {
maxBranchVersions.put(branchName, v);

2
dev-tools/pom.xml
View File

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

2
distribution/deb/pom.xml
View File

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

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

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

2
distribution/pom.xml
View File

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

2
distribution/rpm/pom.xml
View File

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

2
distribution/shaded/pom.xml
View File

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

2
distribution/tar/pom.xml
View File

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

2
distribution/zip/pom.xml
View File

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

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

@ -7,7 +7,7 @@
<parent>
<groupId>org.elasticsearch.plugin</groupId>
<artifactId>elasticsearch-plugin</artifactId>
<version>2.0.0-beta1-SNAPSHOT</version>
<version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>elasticsearch-analysis-icu</artifactId>

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

@ -7,7 +7,7 @@
<parent>
<groupId>org.elasticsearch.plugin</groupId>
<artifactId>elasticsearch-plugin</artifactId>
<version>2.0.0-beta1-SNAPSHOT</version>
<version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>elasticsearch-analysis-kuromoji</artifactId>

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

@ -7,7 +7,7 @@
<parent>
<groupId>org.elasticsearch.plugin</groupId>
<artifactId>elasticsearch-plugin</artifactId>
<version>2.0.0-beta1-SNAPSHOT</version>
<version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>elasticsearch-analysis-phonetic</artifactId>

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

@ -7,7 +7,7 @@
<parent>
<groupId>org.elasticsearch.plugin</groupId>
<artifactId>elasticsearch-plugin</artifactId>
<version>2.0.0-beta1-SNAPSHOT</version>
<version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>elasticsearch-analysis-smartcn</artifactId>

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

@ -7,7 +7,7 @@
<parent>
<groupId>org.elasticsearch.plugin</groupId>
<artifactId>elasticsearch-plugin</artifactId>
<version>2.0.0-beta1-SNAPSHOT</version>
<version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>elasticsearch-analysis-stempel</artifactId>

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

@ -7,7 +7,7 @@
<parent>
<groupId>org.elasticsearch.plugin</groupId>
<artifactId>elasticsearch-plugin</artifactId>
<version>2.0.0-beta1-SNAPSHOT</version>
<version>2.0.0-SNAPSHOT</version>
</parent>
<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>
<groupId>org.elasticsearch.plugin</groupId>
<artifactId>elasticsearch-plugin</artifactId>
<version>2.0.0-beta1-SNAPSHOT</version>
<version>2.0.0-SNAPSHOT</version>
</parent>
<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>
<groupId>org.elasticsearch.plugin</groupId>
<artifactId>elasticsearch-plugin</artifactId>
<version>2.0.0-beta1-SNAPSHOT</version>
<version>2.0.0-SNAPSHOT</version>
</parent>
<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>
<groupId>org.elasticsearch.plugin</groupId>
<artifactId>elasticsearch-plugin</artifactId>
<version>2.0.0-beta1-SNAPSHOT</version>
<version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>elasticsearch-delete-by-query</artifactId>

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

@ -7,7 +7,7 @@
<parent>
<groupId>org.elasticsearch.plugin</groupId>
<artifactId>elasticsearch-plugin</artifactId>
<version>2.0.0-beta1-SNAPSHOT</version>
<version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>elasticsearch-jvm-example</artifactId>

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

@ -7,7 +7,7 @@
<parent>
<groupId>org.elasticsearch.plugin</groupId>
<artifactId>elasticsearch-plugin</artifactId>
<version>2.0.0-beta1-SNAPSHOT</version>
<version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>elasticsearch-lang-javascript</artifactId>

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

@ -7,7 +7,7 @@
<parent>
<groupId>org.elasticsearch.plugin</groupId>
<artifactId>elasticsearch-plugin</artifactId>
<version>2.0.0-beta1-SNAPSHOT</version>
<version>2.0.0-SNAPSHOT</version>
</parent>
<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>
<groupId>org.elasticsearch.plugin</groupId>
<artifactId>elasticsearch-plugin</artifactId>
<version>2.0.0-beta1-SNAPSHOT</version>
<version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>elasticsearch-mapper-size</artifactId>

4
plugins/pom.xml
View File

@ -7,7 +7,7 @@
<groupId>org.elasticsearch.plugin</groupId>
<artifactId>elasticsearch-plugin</artifactId>
<version>2.0.0-beta1-SNAPSHOT</version>
<version>2.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Elasticsearch Plugin POM</name>
<inceptionYear>2009</inceptionYear>
@ -16,7 +16,7 @@
<parent>
<groupId>org.elasticsearch</groupId>
<artifactId>elasticsearch-parent</artifactId>
<version>2.0.0-beta1-SNAPSHOT</version>
<version>2.0.0-SNAPSHOT</version>
</parent>
<properties>

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

@ -7,7 +7,7 @@
<parent>
<groupId>org.elasticsearch.plugin</groupId>
<artifactId>elasticsearch-plugin</artifactId>
<version>2.0.0-beta1-SNAPSHOT</version>
<version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>elasticsearch-site-example</artifactId>

2
pom.xml
View File

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

4
qa/pom.xml
View File

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

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

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

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

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

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

@ -7,7 +7,7 @@
<parent>
<groupId>org.elasticsearch.qa</groupId>
<artifactId>elasticsearch-qa</artifactId>
<version>2.0.0-beta1-SNAPSHOT</version>
<version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>smoke-test-shaded</artifactId>
@ -23,7 +23,7 @@
<dependency>
<groupId>org.elasticsearch.distribution.shaded</groupId>
<artifactId>elasticsearch</artifactId>
<version>2.0.0-beta1-SNAPSHOT</version>
<version>2.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>

2
qa/vagrant/pom.xml
View File

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

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

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