Update to Jackson 2.6.2

core/src/test/java/org/elasticsearch/indices/analyze/AnalyzeActionIT.java

@@ -22,6 +22,7 @@
 import org.elasticsearch.action.admin.indices.analyze.AnalyzeRequest;
 import org.elasticsearch.action.admin.indices.analyze.AnalyzeRequestBuilder;
 import org.elasticsearch.action.admin.indices.analyze.AnalyzeResponse;
+import org.elasticsearch.common.bytes.BytesArray;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.xcontent.*;
 import org.elasticsearch.rest.action.admin.indices.analyze.RestAnalyzeAction;
@@ -217,10 +218,9 @@ public void testParseXContentForAnalyzeReuqest() throws Exception {
     @Test
     public void testParseXContentForAnalyzeRequestWithInvalidJsonThrowsException() throws Exception {
         AnalyzeRequest analyzeRequest = new AnalyzeRequest("for test");
-        BytesReference invalidContent =  XContentFactory.jsonBuilder().startObject().value("invalid_json").endObject().bytes();
 
         try {
-            RestAnalyzeAction.buildFromContent(invalidContent, analyzeRequest);
+            RestAnalyzeAction.buildFromContent(new BytesArray("{invalid_json}"), analyzeRequest);
             fail("shouldn't get here");
         } catch (Exception e) {
             assertThat(e, instanceOf(IllegalArgumentException.class));

core/src/test/java/org/elasticsearch/search/scroll/SearchScrollIT.java

@@ -22,6 +22,7 @@
 import org.elasticsearch.action.search.*;
 import org.elasticsearch.cluster.metadata.IndexMetaData;
 import org.elasticsearch.common.Priority;
+import org.elasticsearch.common.bytes.BytesArray;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.unit.TimeValue;
@@ -42,9 +43,7 @@
 import java.util.Map;
 
 import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
-import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery;
-import static org.elasticsearch.index.query.QueryBuilders.queryStringQuery;
-import static org.elasticsearch.index.query.QueryBuilders.termQuery;
+import static org.elasticsearch.index.query.QueryBuilders.*;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.*;
 import static org.hamcrest.Matchers.*;
 
@@ -501,11 +500,8 @@ public void testParseSearchScrollRequest() throws Exception {
     @Test
     public void testParseSearchScrollRequestWithInvalidJsonThrowsException() throws Exception {
         SearchScrollRequest searchScrollRequest = new SearchScrollRequest();
-        BytesReference invalidContent = XContentFactory.jsonBuilder().startObject()
-            .value("invalid_json").endObject().bytes();
-
         try {
-            RestSearchScrollAction.buildFromContent(invalidContent, searchScrollRequest);
+            RestSearchScrollAction.buildFromContent(new BytesArray("{invalid_json}"), searchScrollRequest);
             fail("expected parseContent failure");
         } catch (Exception e) {
             assertThat(e, instanceOf(IllegalArgumentException.class));
@@ -542,12 +538,10 @@ public void testParseClearScrollRequest() throws Exception {
 
     @Test
     public void testParseClearScrollRequestWithInvalidJsonThrowsException() throws Exception {
-        BytesReference invalidContent = XContentFactory.jsonBuilder().startObject()
-            .value("invalid_json").endObject().bytes();
         ClearScrollRequest clearScrollRequest = new ClearScrollRequest();
 
         try {
-            RestClearScrollAction.buildFromContent(invalidContent, clearScrollRequest);
+            RestClearScrollAction.buildFromContent(new BytesArray("{invalid_json}"), clearScrollRequest);
             fail("expected parseContent failure");
         } catch (Exception e) {
             assertThat(e, instanceOf(IllegalArgumentException.class));

distribution/licenses/jackson-core-2.6.2.jar.sha1

@@ -0,0 +1 @@
+123f29333b2c6b3516b14252b6e93226bfcd6e37

distribution/licenses/jackson-dataformat-cbor-2.6.2.jar.sha1

@@ -0,0 +1 @@
+1e13c575f914c83761bb8e2aca7dfd9e4c647579

distribution/licenses/jackson-dataformat-smile-2.6.2.jar.sha1

@@ -0,0 +1 @@
+395d18c1a1dd730b8026ee59c4067e5d2b45ba6e

distribution/licenses/jackson-dataformat-yaml-2.6.2.jar.sha1

@@ -0,0 +1 @@
+4ae23088dd3fae47c66843f2e4251d7255ee140e

distribution/licenses/snakeyaml-1.15.jar.sha1

@@ -0,0 +1 @@
+3b132bea69e8ee099f416044970997bde80f4ea6

pom.xml

@@ -49,7 +49,7 @@
         <lucene.snapshot.revision>1702855</lucene.snapshot.revision>
         <lucene.maven.version>5.4.0-snapshot-${lucene.snapshot.revision}</lucene.maven.version>
         <testframework.version>2.1.17</testframework.version>
-        <jackson.version>2.5.3</jackson.version>
+        <jackson.version>2.6.2</jackson.version>
         <slf4j.version>1.6.2</slf4j.version>
         <log4j.version>1.2.17</log4j.version>
         <jacoco.version>0.7.5.201505241946</jacoco.version>