Merge remote-tracking branch 'upstream/main' into feat/xml-processor

Author: marc-gr

muted-tests.yml

@@ -563,36 +563,9 @@ tests:
 - class: org.elasticsearch.xpack.esql.action.EsqlActionBreakerIT
   method: testTopNPushedToLucene
   issue: https://github.com/elastic/elasticsearch/issues/130505
-- class: org.elasticsearch.common.ssl.DefaultJdkTrustConfigTests
-  method: testGetSystemTrustStoreWithNoSystemProperties
-  issue: https://github.com/elastic/elasticsearch/issues/130517
-- class: org.elasticsearch.common.ssl.DefaultJdkTrustConfigTests
-  method: testGetNonPKCS11TrustStoreWithPasswordSet
-  issue: https://github.com/elastic/elasticsearch/issues/130519
 - class: org.elasticsearch.multiproject.test.CoreWithMultipleProjectsClientYamlTestSuiteIT
   method: test {yaml=indices.resolve_index/10_basic_resolve_index/Resolve index with hidden and closed indices}
   issue: https://github.com/elastic/elasticsearch/issues/130568
-- class: org.elasticsearch.reindex.ReindexRestClientSslTests
-  method: testClientPassesClientCertificate
-  issue: https://github.com/elastic/elasticsearch/issues/130584
-- class: org.elasticsearch.reindex.ReindexRestClientSslTests
-  method: testClientFailsWithUntrustedCertificate
-  issue: https://github.com/elastic/elasticsearch/issues/130585
-- class: org.elasticsearch.reindex.ReindexRestClientSslTests
-  method: testClientSucceedsWithCertificateAuthorities
-  issue: https://github.com/elastic/elasticsearch/issues/130586
-- class: org.elasticsearch.reindex.ReindexFromRemoteBuildRestClientTests
-  method: testHeaders
-  issue: https://github.com/elastic/elasticsearch/issues/130587
-- class: org.elasticsearch.reindex.ReindexFromRemoteBuildRestClientTests
-  method: testBuildRestClient
-  issue: https://github.com/elastic/elasticsearch/issues/130588
-- class: org.elasticsearch.http.netty4.Netty4HttpServerTransportTests
-  method: testRespondAfterServiceCloseWithClientCancel
-  issue: https://github.com/elastic/elasticsearch/issues/130590
-- class: org.elasticsearch.http.netty4.Netty4HttpServerTransportTests
-  method: testRespondAfterServiceCloseWithServerCancel
-  issue: https://github.com/elastic/elasticsearch/issues/130591
 - class: org.elasticsearch.xpack.esql.qa.multi_node.GenerativeIT
   method: test
   issue: https://github.com/elastic/elasticsearch/issues/130067
@@ -611,6 +584,15 @@ tests:
 - class: org.elasticsearch.backwards.MixedClusterClientYamlTestSuiteIT
   method: test {p0=search.vectors/40_knn_search/Dimensions are dynamically set}
   issue: https://github.com/elastic/elasticsearch/issues/130626
+- class: org.elasticsearch.xpack.esql.qa.multi_node.EsqlSpecIT
+  method: test {match-operator.MatchWithMoreComplexDisjunctionAndConjunction SYNC}
+  issue: https://github.com/elastic/elasticsearch/issues/130640
+- class: org.elasticsearch.gradle.LoggedExecFuncTest
+  method: failed tasks output logged to console when spooling true
+  issue: https://github.com/elastic/elasticsearch/issues/119509
+- class: org.elasticsearch.xpack.esql.qa.single_node.EsqlSpecIT
+  method: test {lookup-join.MvJoinKeyFromRow ASYNC}
+  issue: https://github.com/elastic/elasticsearch/issues/130642
 
 # Examples:
 #

test/framework/src/main/java/org/elasticsearch/entitlement/runtime/policy/TestPolicyManager.java

@@ -159,6 +159,8 @@ private boolean isTestCode(Class<?> requestingClass) {
         "org.junit",
         "org.mockito",
         "net.bytebuddy", // Mockito uses this
+
+        "org.bouncycastle.jsse.provider" // Used in test code if FIPS is enabled, support more fine-grained config in ES-12128
     };
 
     @Override