Upgrade to jackson core 2.4.1.1

Note, we had to disable the symbol overflow, since the many mapping case was tripping it closes #6789
elastic · Jul 9, 2014 · 0535dbe · 0535dbe
1 parent 1f2474d
commit 0535dbe
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 1 deletion.
diff --git a/pom.xml b/pom.xml
@@ -218,7 +218,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
-            <version>2.4.1</version>
+            <version>2.4.1.1</version>
             <scope>compile</scope>
         </dependency>
 

diff --git a/src/main/java/org/elasticsearch/common/xcontent/cbor/CborXContent.java b/src/main/java/org/elasticsearch/common/xcontent/cbor/CborXContent.java
@@ -42,6 +42,7 @@ public static XContentBuilder contentBuilder() throws IOException {
 
     static {
         cborFactory = new CBORFactory();
+        cborFactory.configure(CBORFactory.Feature.FAIL_ON_SYMBOL_HASH_OVERFLOW, false); // this trips on many mappings now...
         cborXContent = new CborXContent();
     }
 

diff --git a/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContent.java b/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContent.java
@@ -46,6 +46,7 @@ public static XContentBuilder contentBuilder() throws IOException {
         jsonFactory.configure(JsonParser.Feature.ALLOW_UNQUOTED_FIELD_NAMES, true);
         jsonFactory.configure(JsonGenerator.Feature.QUOTE_FIELD_NAMES, true);
         jsonFactory.configure(JsonParser.Feature.ALLOW_COMMENTS, true);
+        jsonFactory.configure(JsonFactory.Feature.FAIL_ON_SYMBOL_HASH_OVERFLOW, false); // this trips on many mappings now...
         jsonXContent = new JsonXContent();
     }
 

diff --git a/src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContent.java b/src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContent.java
@@ -20,6 +20,7 @@
 package org.elasticsearch.common.xcontent.smile;
 
 import com.fasterxml.jackson.core.JsonEncoding;
+import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.dataformat.smile.SmileFactory;
 import com.fasterxml.jackson.dataformat.smile.SmileGenerator;
 import org.elasticsearch.common.bytes.BytesReference;
@@ -44,6 +45,7 @@ public static XContentBuilder contentBuilder() throws IOException {
     static {
         smileFactory = new SmileFactory();
         smileFactory.configure(SmileGenerator.Feature.ENCODE_BINARY_AS_7BIT, false); // for now, this is an overhead, might make sense for web sockets
+        smileFactory.configure(SmileFactory.Feature.FAIL_ON_SYMBOL_HASH_OVERFLOW, false); // this trips on many mappings now...
         smileXContent = new SmileXContent();
     }