Skip to content

Commit 19c12d7

Browse files
clintongormleyclintongormley
committed
Bumped version to 2.2.1-SNAPSHOT and added bwc indices for 2.2.0 and 2.1.2
1 parent b255755 commit 19c12d7

File tree

48 files changed

+57
-49
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+57
-49
lines changed

‎core/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>org.elasticsearch</groupId>
88
<artifactId>parent</artifactId>
9-
<version>2.2.0-SNAPSHOT</version>
9+
<version>2.2.1-SNAPSHOT</version>
1010
</parent>
1111

1212
<groupId>org.elasticsearch</groupId>

‎core/src/main/java/org/elasticsearch/Version.java

+11-3
Original file line numberDiff line numberDiff line change
@@ -280,11 +280,15 @@ public class Version {
280280
public static final int V_2_1_1_ID = 2010199;
281281
public static final Version V_2_1_1 = new Version(V_2_1_1_ID, false, org.apache.lucene.util.Version.LUCENE_5_3_1);
282282
public static final int V_2_1_2_ID = 2010299;
283-
public static final Version V_2_1_2 = new Version(V_2_1_2_ID, true, org.apache.lucene.util.Version.LUCENE_5_3_1);
283+
public static final Version V_2_1_2 = new Version(V_2_1_2_ID, false, org.apache.lucene.util.Version.LUCENE_5_3_1);
284+
public static final int V_2_1_3_ID = 2010399;
285+
public static final Version V_2_1_3 = new Version(V_2_1_3_ID, true, org.apache.lucene.util.Version.LUCENE_5_3_1);
284286
public static final int V_2_2_0_ID = 2020099;
285-
public static final Version V_2_2_0 = new Version(V_2_2_0_ID, true, org.apache.lucene.util.Version.LUCENE_5_4_1);
287+
public static final Version V_2_2_0 = new Version(V_2_2_0_ID, false, org.apache.lucene.util.Version.LUCENE_5_4_1);
288+
public static final int V_2_2_1_ID = 2020199;
289+
public static final Version V_2_2_1 = new Version(V_2_2_1_ID, true, org.apache.lucene.util.Version.LUCENE_5_4_1);
286290

287-
public static final Version CURRENT = V_2_2_0;
291+
public static final Version CURRENT = V_2_2_1;
288292

289293
static {
290294
assert CURRENT.luceneVersion.equals(Lucene.VERSION) : "Version must be upgraded to [" + Lucene.VERSION + "] is still set to [" + CURRENT.luceneVersion + "]";
@@ -296,8 +300,12 @@ public static Version readVersion(StreamInput in) throws IOException {
296300

297301
public static Version fromId(int id) {
298302
switch (id) {
303+
case V_2_2_1_ID:
304+
return V_2_2_1;
299305
case V_2_2_0_ID:
300306
return V_2_2_0;
307+
case V_2_1_3_ID:
308+
return V_2_1_3;
301309
case V_2_1_2_ID:
302310
return V_2_1_2;
303311
case V_2_1_1_ID:

‎core/src/test/resources/indices/bwc/index-2.1.2.zip

78.6 KB
Binary file not shown.

‎core/src/test/resources/indices/bwc/index-2.2.0.zip

93 KB
Binary file not shown.

‎core/src/test/resources/indices/bwc/repo-2.1.2.zip

76.8 KB
Binary file not shown.

‎core/src/test/resources/indices/bwc/repo-2.2.0.zip

91 KB
Binary file not shown.

‎dev-tools/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<modelVersion>4.0.0</modelVersion>
33
<groupId>org.elasticsearch</groupId>
44
<artifactId>dev-tools</artifactId>
5-
<version>2.2.0-SNAPSHOT</version>
5+
<version>2.2.1-SNAPSHOT</version>
66
<name>Build Tools and Resources</name>
77
<description>Tools to assist in building and developing in the Elasticsearch project</description>
88
<parent>

‎distribution/deb/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>org.elasticsearch.distribution</groupId>
88
<artifactId>distributions</artifactId>
9-
<version>2.2.0-SNAPSHOT</version>
9+
<version>2.2.1-SNAPSHOT</version>
1010
</parent>
1111

1212
<groupId>org.elasticsearch.distribution.deb</groupId>

‎distribution/integ-test-zip/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>org.elasticsearch.distribution</groupId>
88
<artifactId>distributions</artifactId>
9-
<version>2.2.0-SNAPSHOT</version>
9+
<version>2.2.1-SNAPSHOT</version>
1010
</parent>
1111

1212
<groupId>org.elasticsearch.distribution.test</groupId>

‎distribution/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>org.elasticsearch</groupId>
88
<artifactId>parent</artifactId>
9-
<version>2.2.0-SNAPSHOT</version>
9+
<version>2.2.1-SNAPSHOT</version>
1010
</parent>
1111

1212
<groupId>org.elasticsearch.distribution</groupId>

‎distribution/rpm/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>org.elasticsearch.distribution</groupId>
88
<artifactId>distributions</artifactId>
9-
<version>2.2.0-SNAPSHOT</version>
9+
<version>2.2.1-SNAPSHOT</version>
1010
</parent>
1111

1212
<groupId>org.elasticsearch.distribution.rpm</groupId>

‎distribution/tar/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>org.elasticsearch.distribution</groupId>
88
<artifactId>distributions</artifactId>
9-
<version>2.2.0-SNAPSHOT</version>
9+
<version>2.2.1-SNAPSHOT</version>
1010
</parent>
1111

1212
<groupId>org.elasticsearch.distribution.tar</groupId>

‎distribution/zip/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>org.elasticsearch.distribution</groupId>
88
<artifactId>distributions</artifactId>
9-
<version>2.2.0-SNAPSHOT</version>
9+
<version>2.2.1-SNAPSHOT</version>
1010
</parent>
1111

1212
<groupId>org.elasticsearch.distribution.zip</groupId>

‎modules/lang-expression/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.elasticsearch.module</groupId>
99
<artifactId>modules</artifactId>
10-
<version>2.2.0-SNAPSHOT</version>
10+
<version>2.2.1-SNAPSHOT</version>
1111
</parent>
1212

1313
<artifactId>lang-expression</artifactId>

‎modules/lang-groovy/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.elasticsearch.module</groupId>
99
<artifactId>modules</artifactId>
10-
<version>2.2.0-SNAPSHOT</version>
10+
<version>2.2.1-SNAPSHOT</version>
1111
</parent>
1212

1313
<artifactId>lang-groovy</artifactId>

‎modules/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
<groupId>org.elasticsearch.module</groupId>
99
<artifactId>modules</artifactId>
10-
<version>2.2.0-SNAPSHOT</version>
10+
<version>2.2.1-SNAPSHOT</version>
1111
<packaging>pom</packaging>
1212
<name>Module: Parent POM</name>
1313
<inceptionYear>2009</inceptionYear>
@@ -16,7 +16,7 @@
1616
<parent>
1717
<groupId>org.elasticsearch</groupId>
1818
<artifactId>parent</artifactId>
19-
<version>2.2.0-SNAPSHOT</version>
19+
<version>2.2.1-SNAPSHOT</version>
2020
</parent>
2121

2222
<properties>

‎plugins/analysis-icu/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.elasticsearch.plugin</groupId>
99
<artifactId>plugins</artifactId>
10-
<version>2.2.0-SNAPSHOT</version>
10+
<version>2.2.1-SNAPSHOT</version>
1111
</parent>
1212

1313
<artifactId>analysis-icu</artifactId>

‎plugins/analysis-kuromoji/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.elasticsearch.plugin</groupId>
99
<artifactId>plugins</artifactId>
10-
<version>2.2.0-SNAPSHOT</version>
10+
<version>2.2.1-SNAPSHOT</version>
1111
</parent>
1212

1313
<artifactId>analysis-kuromoji</artifactId>

‎plugins/analysis-phonetic/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.elasticsearch.plugin</groupId>
99
<artifactId>plugins</artifactId>
10-
<version>2.2.0-SNAPSHOT</version>
10+
<version>2.2.1-SNAPSHOT</version>
1111
</parent>
1212

1313
<artifactId>analysis-phonetic</artifactId>

‎plugins/analysis-smartcn/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.elasticsearch.plugin</groupId>
99
<artifactId>plugins</artifactId>
10-
<version>2.2.0-SNAPSHOT</version>
10+
<version>2.2.1-SNAPSHOT</version>
1111
</parent>
1212

1313
<artifactId>analysis-smartcn</artifactId>

‎plugins/analysis-stempel/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.elasticsearch.plugin</groupId>
99
<artifactId>plugins</artifactId>
10-
<version>2.2.0-SNAPSHOT</version>
10+
<version>2.2.1-SNAPSHOT</version>
1111
</parent>
1212

1313
<artifactId>analysis-stempel</artifactId>

‎plugins/cloud-aws/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.elasticsearch.plugin</groupId>
99
<artifactId>plugins</artifactId>
10-
<version>2.2.0-SNAPSHOT</version>
10+
<version>2.2.1-SNAPSHOT</version>
1111
</parent>
1212

1313
<artifactId>cloud-aws</artifactId>

‎plugins/cloud-azure/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ governing permissions and limitations under the License. -->
1818
<parent>
1919
<groupId>org.elasticsearch.plugin</groupId>
2020
<artifactId>plugins</artifactId>
21-
<version>2.2.0-SNAPSHOT</version>
21+
<version>2.2.1-SNAPSHOT</version>
2222
</parent>
2323

2424
<artifactId>cloud-azure</artifactId>

‎plugins/cloud-gce/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ governing permissions and limitations under the License. -->
1818
<parent>
1919
<groupId>org.elasticsearch.plugin</groupId>
2020
<artifactId>plugins</artifactId>
21-
<version>2.2.0-SNAPSHOT</version>
21+
<version>2.2.1-SNAPSHOT</version>
2222
</parent>
2323

2424
<artifactId>cloud-gce</artifactId>

‎plugins/delete-by-query/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ governing permissions and limitations under the License. -->
1818
<parent>
1919
<groupId>org.elasticsearch.plugin</groupId>
2020
<artifactId>plugins</artifactId>
21-
<version>2.2.0-SNAPSHOT</version>
21+
<version>2.2.1-SNAPSHOT</version>
2222
</parent>
2323

2424
<artifactId>delete-by-query</artifactId>

‎plugins/discovery-multicast/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.elasticsearch.plugin</groupId>
99
<artifactId>plugins</artifactId>
10-
<version>2.2.0-SNAPSHOT</version>
10+
<version>2.2.1-SNAPSHOT</version>
1111
</parent>
1212

1313
<artifactId>discovery-multicast</artifactId>

‎plugins/jvm-example/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.elasticsearch.plugin</groupId>
99
<artifactId>plugins</artifactId>
10-
<version>2.2.0-SNAPSHOT</version>
10+
<version>2.2.1-SNAPSHOT</version>
1111
</parent>
1212

1313
<artifactId>jvm-example</artifactId>

‎plugins/lang-javascript/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.elasticsearch.plugin</groupId>
99
<artifactId>plugins</artifactId>
10-
<version>2.2.0-SNAPSHOT</version>
10+
<version>2.2.1-SNAPSHOT</version>
1111
</parent>
1212

1313
<artifactId>lang-javascript</artifactId>

‎plugins/lang-python/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.elasticsearch.plugin</groupId>
99
<artifactId>plugins</artifactId>
10-
<version>2.2.0-SNAPSHOT</version>
10+
<version>2.2.1-SNAPSHOT</version>
1111
</parent>
1212

1313
<artifactId>lang-python</artifactId>

‎plugins/mapper-attachments/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.elasticsearch.plugin</groupId>
99
<artifactId>plugins</artifactId>
10-
<version>2.2.0-SNAPSHOT</version>
10+
<version>2.2.1-SNAPSHOT</version>
1111
</parent>
1212

1313
<artifactId>mapper-attachments</artifactId>

‎plugins/mapper-murmur3/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ governing permissions and limitations under the License. -->
1818
<parent>
1919
<groupId>org.elasticsearch.plugin</groupId>
2020
<artifactId>plugins</artifactId>
21-
<version>2.2.0-SNAPSHOT</version>
21+
<version>2.2.1-SNAPSHOT</version>
2222
</parent>
2323

2424
<artifactId>mapper-murmur3</artifactId>

‎plugins/mapper-size/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ governing permissions and limitations under the License. -->
1818
<parent>
1919
<groupId>org.elasticsearch.plugin</groupId>
2020
<artifactId>plugins</artifactId>
21-
<version>2.2.0-SNAPSHOT</version>
21+
<version>2.2.1-SNAPSHOT</version>
2222
</parent>
2323

2424
<artifactId>mapper-size</artifactId>

‎plugins/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
<groupId>org.elasticsearch.plugin</groupId>
99
<artifactId>plugins</artifactId>
10-
<version>2.2.0-SNAPSHOT</version>
10+
<version>2.2.1-SNAPSHOT</version>
1111
<packaging>pom</packaging>
1212
<name>Plugin: Parent POM</name>
1313
<inceptionYear>2009</inceptionYear>
@@ -16,7 +16,7 @@
1616
<parent>
1717
<groupId>org.elasticsearch.module</groupId>
1818
<artifactId>modules</artifactId>
19-
<version>2.2.0-SNAPSHOT</version>
19+
<version>2.2.1-SNAPSHOT</version>
2020
<relativePath>../modules/pom.xml</relativePath>
2121
</parent>
2222

‎plugins/site-example/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.elasticsearch.plugin</groupId>
99
<artifactId>plugins</artifactId>
10-
<version>2.2.0-SNAPSHOT</version>
10+
<version>2.2.1-SNAPSHOT</version>
1111
</parent>
1212

1313
<artifactId>site-example</artifactId>

‎pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>org.elasticsearch</groupId>
88
<artifactId>parent</artifactId>
9-
<version>2.2.0-SNAPSHOT</version>
9+
<version>2.2.1-SNAPSHOT</version>
1010
<packaging>pom</packaging>
1111
<name>Elasticsearch: Parent POM</name>
1212
<description>Parent POM</description>

‎qa/backwards/2.0/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.elasticsearch.qa.backwards</groupId>
77
<artifactId>two-versions-parent</artifactId>
8-
<version>2.2.0-SNAPSHOT</version>
8+
<version>2.2.1-SNAPSHOT</version>
99
<relativePath>../two-versions-parent</relativePath>
1010
</parent>
1111
<modelVersion>4.0.0</modelVersion>

‎qa/backwards/2.1/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.elasticsearch.qa.backwards</groupId>
77
<artifactId>two-versions-parent</artifactId>
8-
<version>2.2.0-SNAPSHOT</version>
8+
<version>2.2.1-SNAPSHOT</version>
99
<relativePath>../two-versions-parent</relativePath>
1010
</parent>
1111
<modelVersion>4.0.0</modelVersion>

‎qa/backwards/current/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.elasticsearch.qa.backwards</groupId>
77
<artifactId>two-versions-parent</artifactId>
8-
<version>2.2.0-SNAPSHOT</version>
8+
<version>2.2.1-SNAPSHOT</version>
99
<relativePath>../two-versions-parent</relativePath>
1010
</parent>
1111
<modelVersion>4.0.0</modelVersion>

‎qa/backwards/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.elasticsearch</groupId>
77
<artifactId>parent</artifactId>
8-
<version>2.2.0-SNAPSHOT</version>
8+
<version>2.2.1-SNAPSHOT</version>
99
<relativePath>../..</relativePath>
1010
<!-- Depend on the normal parent here because the QA parent has a bunch
1111
of stuff for smoke tests which doesn't and breaks things. -->

‎qa/backwards/shared/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.elasticsearch.qa.backwards</groupId>
77
<artifactId>parent</artifactId>
8-
<version>2.2.0-SNAPSHOT</version>
8+
<version>2.2.1-SNAPSHOT</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎qa/backwards/two-versions-parent/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.elasticsearch.qa.backwards</groupId>
77
<artifactId>parent</artifactId>
8-
<version>2.2.0-SNAPSHOT</version>
8+
<version>2.2.1-SNAPSHOT</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎qa/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77

88
<groupId>org.elasticsearch.qa</groupId>
99
<artifactId>elasticsearch-qa</artifactId>
10-
<version>2.2.0-SNAPSHOT</version>
10+
<version>2.2.1-SNAPSHOT</version>
1111
<packaging>pom</packaging>
1212
<name>QA: Parent POM</name>
1313
<inceptionYear>2015</inceptionYear>
1414

1515
<parent>
1616
<groupId>org.elasticsearch</groupId>
1717
<artifactId>parent</artifactId>
18-
<version>2.2.0-SNAPSHOT</version>
18+
<version>2.2.1-SNAPSHOT</version>
1919
</parent>
2020

2121
<properties>

0 commit comments

Comments
 (0)