fixed mapping issues by updating plugins needed to use types, also fixed tests to assert on the correct field

Author: Supplementing

x-pack/plugin/fleet/build.gradle

@@ -24,7 +24,10 @@ dependencies {
   javaRestTestImplementation(project(path: xpackModule('core')))
   javaRestTestImplementation(testArtifact(project(xpackModule('core'))))
   compileOnly project(path: xpackModule('ilm'))
+  testImplementation project(path: xpackModule('mapper-version'))
 
   clusterModules project(xpackModule('ilm'))
+  clusterModules project(xpackModule('mapper-version'))
+  clusterModules project(xpackModule('inference'))
   clusterModules project(':modules:data-streams')
 }

x-pack/plugin/fleet/src/javaRestTest/java/org/elasticsearch/xpack/fleet/AbstractFleetIT.java

@@ -17,6 +17,8 @@ public abstract class AbstractFleetIT extends ESRestTestCase {
     public static ElasticsearchCluster cluster = ElasticsearchCluster.local()
         .module("x-pack-fleet")
         .module("x-pack-ilm")
+        .module("mapper-version")
+        .module("x-pack-inference")
         .module("data-streams")
         .setting("xpack.security.enabled", "true")
         .setting("xpack.security.autoconfiguration.enabled", "false")

x-pack/plugin/fleet/src/javaRestTest/java/org/elasticsearch/xpack/fleet/FleetSystemIndicesIT.java

@@ -9,7 +9,9 @@
 
 import org.apache.http.util.EntityUtils;
 import org.elasticsearch.client.Request;
+import org.elasticsearch.client.RequestOptions;
 import org.elasticsearch.client.Response;
+import org.elasticsearch.client.WarningsHandler;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.util.concurrent.ThreadContext;
 import org.elasticsearch.common.xcontent.XContentHelper;
@@ -300,13 +302,15 @@ public void testCreationOfIntegrationKnowledge() throws Exception {
         assertEquals(200, response.getStatusLine().getStatusCode());
 
         request = new Request("GET", ".integration_knowledge/_mapping");
+        request.setOptions(RequestOptions.DEFAULT.toBuilder().setWarningsHandler(WarningsHandler.PERMISSIVE));
         response = client().performRequest(request);
         String responseBody = EntityUtils.toString(response.getEntity());
-        assertThat(responseBody, containsString("knowledge_content"));
+        assertThat(responseBody, containsString("content"));
 
         request = new Request("GET", ".integration_knowledge-7/_mapping");
+        request.setOptions(RequestOptions.DEFAULT.toBuilder().setWarningsHandler(WarningsHandler.PERMISSIVE));
         response = client().performRequest(request);
         responseBody = EntityUtils.toString(response.getEntity());
-        assertThat(responseBody, containsString("knowledge_content"));
+        assertThat(responseBody, containsString("content"));
     }
 }

x-pack/plugin/fleet/src/yamlRestTest/java/org/elasticsearch/xpack/fleet/FleetRestIT.java

@@ -28,6 +28,8 @@ public FleetRestIT(final ClientYamlTestCandidate testCandidate) {
     public static ElasticsearchCluster cluster = ElasticsearchCluster.local()
         .module("x-pack-fleet")
         .module("x-pack-ilm")
+        .module("mapper-version")
+        .module("x-pack-inference")
         .module("data-streams")
         .setting("xpack.license.self_generated.type", "basic")
         .setting("xpack.security.enabled", "true")