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
This commit is contained in:
Shay Banon 2014-07-09 17:49:03 +02:00
parent 95a5eedd3c
commit 386a14370a
4 changed files with 5 additions and 1 deletions

View File

@ -211,7 +211,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>

View File

@ -42,6 +42,7 @@ public class CborXContent implements XContent {
static {
cborFactory = new CBORFactory();
cborFactory.configure(CBORFactory.Feature.FAIL_ON_SYMBOL_HASH_OVERFLOW, false); // this trips on many mappings now...
cborXContent = new CborXContent();
}

View File

@ -46,6 +46,7 @@ public class JsonXContent implements XContent {
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();
}

View File

@ -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 class SmileXContent implements XContent {
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();
}