update es/upstream to 1.3.5

crate · Nov 6, 2014 · f8793db · f8793db
1 parent b9f371a
commit f8793db
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 22 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -5,6 +5,8 @@ Changes for Crate Data
 Unreleased
 ==========
 
+ - Updated Elasticsearch to 1.3.5
+
  - Fix: Ensure that adding new columns inside nested objects using
    ``ALTER TABLE`` works as expected.
 

diff --git a/core/src/main/java/io/crate/Version.java b/core/src/main/java/io/crate/Version.java
@@ -35,7 +35,7 @@ public class Version {
 
 
     public static final boolean SNAPSHOT = true;
-    public static final Version CURRENT = new Version(460099, SNAPSHOT, org.elasticsearch.Version.V_1_3_4);
+    public static final Version CURRENT = new Version(460099, SNAPSHOT, org.elasticsearch.Version.V_1_3_5);
 
     static {
         // safe-guard that we don't release a version with DEBUG_MODE set to true

diff --git a/es/build.gradle b/es/build.gradle
@@ -43,20 +43,20 @@ dependencies {
     compile 'net.java.dev.jna:jna:4.1.0'
     // also updated dependencies in client dependencies
     // when updating lucene version!
-    compile 'org.apache.lucene:lucene-analyzers-common:4.9.0'
-    compile 'org.apache.lucene:lucene-codecs:4.9.0'
-    compile 'org.apache.lucene:lucene-core:4.9.0'
-    compile 'org.apache.lucene:lucene-expressions:4.9.0'
-    compile 'org.apache.lucene:lucene-grouping:4.9.0'
-    compile 'org.apache.lucene:lucene-highlighter:4.9.0'
-    compile 'org.apache.lucene:lucene-join:4.9.0'
-    compile 'org.apache.lucene:lucene-memory:4.9.0'
-    compile 'org.apache.lucene:lucene-misc:4.9.0'
-    compile 'org.apache.lucene:lucene-queries:4.9.0'
-    compile 'org.apache.lucene:lucene-queryparser:4.9.0'
-    compile 'org.apache.lucene:lucene-sandbox:4.9.0'
-    compile 'org.apache.lucene:lucene-spatial:4.9.0'
-    compile 'org.apache.lucene:lucene-suggest:4.9.0'
+    compile 'org.apache.lucene:lucene-analyzers-common:4.9.1'
+    compile 'org.apache.lucene:lucene-codecs:4.9.1'
+    compile 'org.apache.lucene:lucene-core:4.9.1'
+    compile 'org.apache.lucene:lucene-expressions:4.9.1'
+    compile 'org.apache.lucene:lucene-grouping:4.9.1'
+    compile 'org.apache.lucene:lucene-highlighter:4.9.1'
+    compile 'org.apache.lucene:lucene-join:4.9.1'
+    compile 'org.apache.lucene:lucene-memory:4.9.1'
+    compile 'org.apache.lucene:lucene-misc:4.9.1'
+    compile 'org.apache.lucene:lucene-queries:4.9.1'
+    compile 'org.apache.lucene:lucene-queryparser:4.9.1'
+    compile 'org.apache.lucene:lucene-sandbox:4.9.1'
+    compile 'org.apache.lucene:lucene-spatial:4.9.1'
+    compile 'org.apache.lucene:lucene-suggest:4.9.1'
     // keep sigar out, see below
     // compile 'org.fusesource:sigar:1.6.4'
     compile 'org.joda:joda-convert:1.2'

diff --git a/es/upstream b/es/upstream
diff --git a/sql/src/test/java/io/crate/integrationtests/DDLIntegrationTest.java b/sql/src/test/java/io/crate/integrationtests/DDLIntegrationTest.java
@@ -71,7 +71,7 @@ public void testCreateTable() throws Exception {
                 "\"settings\":{" +
                 "\"index.number_of_replicas\":\"1\"," +
                 "\"index.number_of_shards\":\"5\"," +
-                "\"index.version.created\":\"1030499\"" +
+                "\"index.version.created\":\"1030599\"" +
                 "}}}";
 
         assertEquals(expectedMapping, getIndexMapping("test"));
@@ -98,7 +98,7 @@ public void testCreateTableWithRefreshIntervalDisableRefresh() throws Exception
                 "\"index.number_of_replicas\":\"1\"," +
                 "\"index.number_of_shards\":\"5\"," +
                 "\"index.refresh_interval\":\"0\"," +
-                "\"index.version.created\":\"1030499\"" +
+                "\"index.version.created\":\"1030599\"" +
                 "}}}";
         JSONAssert.assertEquals(expectedSettings, getIndexSettings("test"), false);
 
@@ -108,7 +108,7 @@ public void testCreateTableWithRefreshIntervalDisableRefresh() throws Exception
                 "\"index.number_of_replicas\":\"1\"," +
                 "\"index.number_of_shards\":\"5\"," +
                 "\"index.refresh_interval\":\"5000\"," +
-                "\"index.version.created\":\"1030499\"" +
+                "\"index.version.created\":\"1030599\"" +
                 "}}}";
         JSONAssert.assertEquals(expectedSetSettings, getIndexSettings("test"), false);
 
@@ -118,7 +118,7 @@ public void testCreateTableWithRefreshIntervalDisableRefresh() throws Exception
                 "\"index.number_of_replicas\":\"1\"," +
                 "\"index.number_of_shards\":\"5\"," +
                 "\"index.refresh_interval\":\"1000\"," +
-                "\"index.version.created\":\"1030499\"" +
+                "\"index.version.created\":\"1030599\"" +
                 "}}}";
         JSONAssert.assertEquals(expectedResetSettings, getIndexSettings("test"), false);
     }
@@ -157,7 +157,7 @@ public void testCreateTableWithReplicasAndShards() throws Exception {
                 "\"settings\":{" +
                 "\"index.number_of_replicas\":\"2\"," +
                 "\"index.number_of_shards\":\"10\"," +
-                "\"index.version.created\":\"1030499\"" +
+                "\"index.version.created\":\"1030599\"" +
                 "}}}";
 
         assertEquals(expectedMapping, getIndexMapping("test"));
@@ -185,7 +185,7 @@ public void testCreateTableWithStrictColumnPolicy() throws Exception {
                 "\"settings\":{" +
                 "\"index.number_of_replicas\":\"1\"," +
                 "\"index.number_of_shards\":\"5\"," +
-                "\"index.version.created\":\"1030499\"" +
+                "\"index.version.created\":\"1030599\"" +
                 "}}}";
 
         assertEquals(expectedMapping, getIndexMapping("test"));