Update x-content jackson version to 2.21.0 (elastic#141777)

Closes elastic#141442

Author: jdconrad

docs/reference/query-languages/esql/kibana/definition/functions/reverse.json

@@ -337,6 +337,11 @@
             <sha256 value="721a189241dab0525d9e858e5cb604d3ecc0ede081e2de77d6f34fa5779a5b46" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.fasterxml.jackson.core" name="jackson-core" version="2.21.0">
+         <artifact name="jackson-core-2.21.0.jar">
+            <sha256 value="e22604bcd9b24e462d5df102007cb06e1ed811e86f1ce6081ca62f385f2db87b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.fasterxml.jackson.core" name="jackson-databind" version="2.10.5.1">
          <artifact name="jackson-databind-2.10.5.1.jar">
             <sha256 value="f93db83891a53e8d268e2cc8fcd88ead2981edc2163e35c2a52c88d9ab57b4a0" origin="Generated by Gradle"/>
@@ -377,6 +382,11 @@
             <sha256 value="1d7dc634ba3d7981d7017f4f44d43cf371e922c80028b4eb3e5374ce6546d5f6" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.fasterxml.jackson.dataformat" name="jackson-dataformat-cbor" version="2.21.0">
+         <artifact name="jackson-dataformat-cbor-2.21.0.jar">
+            <sha256 value="79a579275cb0dd5847406930a58ce8a49d06db7815bba38a0d4a6ae1db3fb043" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.fasterxml.jackson.dataformat" name="jackson-dataformat-smile" version="2.14.2">
          <artifact name="jackson-dataformat-smile-2.14.2.jar">
             <sha256 value="9c279bb29770de09289c14cf8862dd195112687cd7fde815919f54a9157ce213" origin="Generated by Gradle"/>
@@ -397,6 +407,11 @@
             <sha256 value="120b07ad7b7b9097d9a174ab6176e07b6409fb7af3f63fcf3d7147c053be0d29" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.fasterxml.jackson.dataformat" name="jackson-dataformat-smile" version="2.21.0">
+         <artifact name="jackson-dataformat-smile-2.21.0.jar">
+            <sha256 value="f82f7f014a371e08b62c33586e5e4f0781894e5e47066c8e073684720a770d24" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.fasterxml.jackson.dataformat" name="jackson-dataformat-xml" version="2.15.0">
          <artifact name="jackson-dataformat-xml-2.15.0.jar">
             <sha256 value="e3137c89b08d0c3d9f7dfeae11d5b941b310f5f7bfdea90063f29c0b3b1f6807" origin="Generated by Gradle"/>
@@ -422,6 +437,11 @@
             <sha256 value="941bcd8b1381bb3b0d726fab41624fa8ece0ee7b6cf2860ad95e8157ce673376" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.fasterxml.jackson.dataformat" name="jackson-dataformat-yaml" version="2.21.0">
+         <artifact name="jackson-dataformat-yaml-2.21.0.jar">
+            <sha256 value="5d184579144780c38962a5f475ed2485e8a29f36cc59ca237135b19e9b642420" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.fasterxml.jackson.datatype" name="jackson-datatype-jsr310" version="2.15.0">
          <artifact name="jackson-datatype-jsr310-2.15.0.jar">
             <sha256 value="d5deb92d59668a8de0ac8da818d5d9c0fdfb4db6b2f1d66a779fe357f310d648" origin="Generated by Gradle"/>

gradle/verification-metadata.xml

@@ -13,7 +13,7 @@ base {
   archivesName = "x-content-impl"
 }
 
-String jacksonVersion = "2.17.2"
+String jacksonVersion = "2.21.0"
 
 dependencies {
   compileOnly project(':libs:core')

libs/x-content/impl/build.gradle

@@ -13,6 +13,7 @@
 import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.json.JsonWriteFeature;
 
 import org.elasticsearch.xcontent.XContent;
 import org.elasticsearch.xcontent.XContentBuilder;
@@ -48,7 +49,7 @@ public static final XContent jsonXContent() {
     }
 
     static {
-        jsonFactory = XContentImplUtils.configure(new ESJsonFactoryBuilder());
+        jsonFactory = XContentImplUtils.configure(new ESJsonFactoryBuilder().enable(JsonWriteFeature.COMBINE_UNICODE_SURROGATES_IN_UTF8));
         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...

libs/x-content/impl/src/main/java/org/elasticsearch/xcontent/provider/json/JsonXContentImpl.java

@@ -272,7 +272,9 @@ public static void readMultiLineFormat(
                     )
                 ) {
                     Map<String, Object> source = parser.map();
-                    if (parser.nextToken() != null) {
+                    // In Jackson 2.21+, parser.map() may leave the parser past END_OBJECT
+                    // Only check for extra tokens if we're still positioned in the stream
+                    if (parser.currentToken() != null && parser.nextToken() != null) {
                         throw new XContentParseException(parser.getTokenLocation(), "Unexpected token after end of object");
                     }
                     Object expandWildcards = null;
@@ -360,7 +362,9 @@ public static void readMultiLineFormat(
                 )
             ) {
                 consumer.accept(searchRequest, parser);
-                if (parser.nextToken() != null) {
+                // In Jackson 2.21+, after parsing, the parser may be past END_OBJECT
+                // Only check for extra tokens if we're still positioned in the stream
+                if (parser.currentToken() != null && parser.nextToken() != null) {
                     throw new XContentParseException(parser.getTokenLocation(), "Unexpected token after end of object");
                 }
             }

server/src/main/java/org/elasticsearch/action/search/MultiSearchRequest.java

@@ -546,11 +546,12 @@ public void testFailOnExtraCharacters() throws IOException {
                 """);
             fail("should have caught second line; extra closing brackets");
         } catch (XContentParseException e) {
+            // Jackson 2.21.0 changed the error message format
             assertThat(
                 e.getMessage(),
                 containsString(
-                    "Unexpected close marker '}': expected ']' (for root starting at "
-                        + "[Source: (byte[])\"{ \"query\": {\"match_all\": {}}}}}}different error message\""
+                    "Unexpected close marker '}': no open Object to close\n"
+                        + " at [Source: (byte[])\"{ \"query\": {\"match_all\": {}}}}}}different error message\""
                 )
             );
         }

server/src/test/java/org/elasticsearch/action/search/MultiSearchRequestTests.java

@@ -74,10 +74,26 @@ public String generateFieldName() {
                 if (fieldName.startsWith(RESERVED_FIELD_NAME_PREFIX)) {
                     continue;
                 }
+                // Filter out Unicode surrogates to avoid encoding differences with
+                // JsonWriteFeature.COMBINE_UNICODE_SURROGATES_IN_UTF8 in Jackson 2.21.0+
+                if (containsSurrogates(fieldName)) {
+                    continue;
+                }
 
                 return fieldName;
             }
         }
+
+        private boolean containsSurrogates(String str) {
+            for (int i = 0; i < str.length(); i++) {
+                char c = str.charAt(i);
+                // Check for high surrogates (U+D800 to U+DBFF) or low surrogates (U+DC00 to U+DFFF)
+                if (Character.isSurrogate(c)) {
+                    return true;
+                }
+            }
+            return false;
+        }
     }
 
     @Override