Fix merge conflicts

Author: breskeby

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/dependencies/rules/ComponentMetadataRulesPlugin.java

@@ -283,9 +283,6 @@ public void apply(Settings settings) {
         // org.apache.directory.api:api-ldap-client-api brings in org.apache.mina:mina-core:2.0.16. We use 2.2.4
         components.withModule("org.apache.directory.server:apacheds-interceptors-authn", ExcludeAllTransitivesRule.class);
 
-        // org.apache.tika:tika-core brings in org.slf4j:slf4j-api:1.17.36. We use 2.0.6
-        components.withModule("org.apache.ftpserver:ftpserver-core", ExcludeByGroup.class, rule -> rule.params(List.of("org.slf4j")));
-
         // Hadoop dependencies
         components.withModule("org.apache.hadoop:hadoop-client-api", ExcludeAllTransitivesRule.class);
         components.withModule("org.apache.hadoop:hadoop-client-runtime", ExcludeAllTransitivesRule.class);
@@ -333,6 +330,9 @@ public void apply(Settings settings) {
         // lucene-analysis-morfologik brings in ua.net.nlp:morfologik-ukrainian-search:4.9.1 we use 3.7.5.
         components.withModule("org.apache.lucene:lucene-analysis-morfologik", ExcludeOtherGroupsTransitiveRule.class);
 
+        // lucene-analysis-icu brings in com.ibm.icu:icu4j:74.2 we use 68.2.
+        components.withModule("org.apache.lucene:lucene-analysis-icu", ExcludeOtherGroupsTransitiveRule.class);
+
         // lucene-analysis-phonetic brings in commons-codec:1.17. We use 1.15
         components.withModule("org.apache.lucene:lucene-analysis-phonetic", ExcludeOtherGroupsTransitiveRule.class);
 
@@ -462,6 +462,10 @@ public void apply(Settings settings) {
         components.withModule("org.testcontainers:testcontainers", ExcludeAllTransitivesRule.class);
 
         // AWS SDK dependencies
+        components.withModule("com.amazonaws:aws-java-sdk-core", ExcludeAllTransitivesRule.class);
+        components.withModule("com.amazonaws:aws-java-sdk-s3", ExcludeAllTransitivesRule.class);
+        components.withModule("software.amazon.awssdk:bedrockruntime", ExcludeAllTransitivesRule.class);
+
         components.withModule("software.amazon.awssdk:apache-client", ExcludeAllTransitivesRule.class);
         components.withModule("software.amazon.awssdk:arns", ExcludeAllTransitivesRule.class);
         components.withModule("software.amazon.awssdk:auth", ExcludeAllTransitivesRule.class);

test/fixtures/url-fixture/build.gradle

@@ -12,6 +12,4 @@ description = 'Fixture for URL external service'
 dependencies {
   implementation project(':server')
   implementation project(':test:framework')
-  implementation "org.apache.ftpserver:ftpserver-core:1.2.1"
-  runtimeOnly("org.slf4j:slf4j-api:${versions.slf4j}")
 }