Upgrade to Elasticsearch 2.4.0 (#2765)

* Upgrade to Elasticsearch 2.4.0 * Upgrade to Jackson 2.8.2
Graylog2 · Sep 13, 2016 · f398837 · f398837
1 parent 4346865
commit f398837
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/graylog2-server/src/test/java/org/graylog2/indexer/indices/IndicesTest.java b/graylog2-server/src/test/java/org/graylog2/indexer/indices/IndicesTest.java
@@ -215,7 +215,7 @@ public void testCreateOverwritesIndexTemplate() throws Exception {
             "_source", ImmutableMap.of("enabled", false),
             "properties", ImmutableMap.of("message",
                 ImmutableMap.of(
-                    "type", "binary",
+                    "type", "string",
                     "index", "not_analyzed")));
         assertThat(client.preparePutTemplate(templateName)
                 .setTemplate(indices.allIndicesAlias())

diff --git a/pom.xml b/pom.xml
@@ -89,7 +89,7 @@
         <build.timestamp>${maven.build.timestamp}</build.timestamp>
 
         <metrics.version>3.1.2</metrics.version>
-        <jackson.version>2.7.5</jackson.version>
+        <jackson.version>2.8.2</jackson.version>
         <jersey.version>2.22.1</jersey.version>
         <!-- The HK2 version should match the version being used by Jersey -->
         <glassfish-hk2.version>2.4.0-b31</glassfish-hk2.version>
@@ -104,7 +104,7 @@
         <swagger.version>1.5.9</swagger.version>
         <sigar.version>1.6.4</sigar.version>
         <restassured.version>2.9.0</restassured.version>
-        <elasticsearch.version>2.3.5</elasticsearch.version>
+        <elasticsearch.version>2.4.0</elasticsearch.version>
         <jna.version>4.1.0</jna.version> <!-- for ES, make sure to use the version that ES uses -->
         <retrofit.version>2.1.0</retrofit.version>
         <forbiddenapis.version>2.2</forbiddenapis.version>