Merge remote-tracking branch 'origin/trunk' into internal_topics_creation

# Conflicts:
#	docs/getting-started/upgrade.md

Author: anton-liauchuk

LICENSE-binary

@@ -226,16 +226,16 @@ License Version 2.0:
 - jakarta.inject-api-2.0.1
 - jakarta.validation-api-3.0.2
 - javassist-3.30.2-GA
-- jetty-alpn-client-12.0.34
-- jetty-client-12.0.34
-- jetty-ee10-servlet-12.0.34
-- jetty-ee10-servlets-12.0.34
-- jetty-http-12.0.34
-- jetty-io-12.0.34
-- jetty-security-12.0.34
-- jetty-server-12.0.34
-- jetty-session-12.0.34
-- jetty-util-12.0.34
+- jetty-alpn-client-12.0.37
+- jetty-client-12.0.37
+- jetty-ee10-servlet-12.0.37
+- jetty-ee10-servlets-12.0.37
+- jetty-http-12.0.37
+- jetty-io-12.0.37
+- jetty-security-12.0.37
+- jetty-server-12.0.37
+- jetty-session-12.0.37
+- jetty-util-12.0.37
 - jose4j-0.9.6
 - jspecify-1.0.0
 - log4j-api-2.25.5

build.gradle

@@ -1038,6 +1038,15 @@ project(':server') {
   }
 
   apply plugin: 'java-test-fixtures'
+  configurations {
+    // To prevent a UniqueResourceException due the same resource existing in both
+    // org.apache.directory.api/api-all and org.apache.directory.api/api-ldap-schema-data
+    testImplementation.exclude module: 'api-ldap-schema-data'
+    testFixturesImplementation.exclude module: 'api-ldap-schema-data'
+    testFixturesImplementation.exclude group: 'org.bouncycastle', module: 'bcprov-jdk15on'
+    testCompileClasspath.exclude group: 'org.bouncycastle', module: 'bcprov-jdk15on'
+    testRuntimeClasspath.exclude group: 'org.bouncycastle', module: 'bcprov-jdk15on'
+  }
 
   dependencies {
     implementation libs.commonsValidator
@@ -1058,7 +1067,6 @@ project(':server') {
     implementation log4j2Libs
 
     testImplementation testFixtures(project(':clients'))
-
     testImplementation libs.mockitoCore
     testImplementation libs.junitJupiter
     testImplementation testLog4j2Libs
@@ -1074,6 +1082,20 @@ project(':server') {
     testFixturesImplementation project(':server-common')
     testFixturesImplementation testFixtures(project(':server-common'))
     testFixturesImplementation libs.junitJupiter
+    testFixturesImplementation(libs.apacheda) {
+      exclude group: 'xml-apis', module: 'xml-apis'
+      // `mina-core` is a transitive dependency for `apacheds` and `apacheda`.
+      // It is safer to use from `apacheds` since that is the implementation.
+      exclude module: 'mina-core'
+    }
+    testFixturesImplementation libs.apachedsCoreApi
+    testFixturesImplementation libs.apachedsInterceptorKerberos
+    testFixturesImplementation libs.apachedsProtocolShared
+    testFixturesImplementation libs.apachedsProtocolKerberos
+    testFixturesImplementation libs.apachedsProtocolLdap
+    testFixturesImplementation libs.apachedsLdifPartition
+    testFixturesImplementation libs.apachedsMavibotPartition
+    testFixturesImplementation libs.apachedsJdbmPartition
 
     testRuntimeOnly runtimeTestLibs
   }
@@ -1142,9 +1164,6 @@ project(':core') {
     implementation.exclude module: 'jmxri'
     implementation.exclude module: 'jmxtools'
     implementation.exclude module: 'mail'
-    // To prevent a UniqueResourceException due the same resource existing in both
-    // org.apache.directory.api/api-all and org.apache.directory.api/api-ldap-schema-data
-    testImplementation.exclude module: 'api-ldap-schema-data'
     releaseOnly
   }
 
@@ -1200,6 +1219,7 @@ project(':core') {
     testImplementation project(':test-common:test-common-runtime')
     testImplementation project(':test-common:test-common-internal-api')
     testImplementation project(':test-common:test-common-util')
+    testImplementation libs.apachedsCoreApi
     testImplementation libs.bcpkix
     testImplementation libs.mockitoCore
     testImplementation(libs.apacheda) {
@@ -1220,6 +1240,22 @@ project(':core') {
     testImplementation testLog4j2Libs
     testImplementation libs.mockOAuth2Server
 
+    configurations {
+      // To prevent a UniqueResourceException due the same resource existing in both
+      // org.apache.directory.api/api-all and org.apache.directory.api/api-ldap-schema-data
+      testRuntimeOnly.exclude module: 'api-ldap-schema-data'
+    }
+
+    testRuntimeOnly(libs.apacheda) {
+      exclude group: 'xml-apis', module: 'xml-apis'
+      // `mina-core` is a transitive dependency for `apacheds` and `apacheda`.
+      // It is safer to use from `apacheds` since that is the implementation.
+      exclude module: 'mina-core'
+    }
+    testRuntimeOnly libs.apachedsInterceptorKerberos
+    testRuntimeOnly libs.apachedsProtocolKerberos
+    testRuntimeOnly libs.apachedsProtocolLdap
+    testRuntimeOnly libs.apachedsLdifPartition
     testRuntimeOnly runtimeTestLibs
   }
 
@@ -2175,7 +2211,6 @@ project(':clients:clients-integration-tests') {
     testImplementation project(':server')
     testImplementation project(':storage')
     testImplementation testFixtures(project(':storage'))
-    testImplementation project(':core').sourceSets.test.output
     testImplementation testFixtures(project(':clients'))
     implementation project(':server-common')
     testImplementation testFixtures(project(':server-common'))
@@ -2474,6 +2509,7 @@ project(':storage') {
     testImplementation project(':test-common:test-common-runtime')
     testImplementation project(':test-common:test-common-util')
     testImplementation project(':server')
+    testImplementation testFixtures(project(':server'))
     testImplementation project(':server-common')
     testImplementation testFixtures(project(':server-common'))
     testImplementation testFixtures(project(':metadata'))
@@ -2665,7 +2701,6 @@ project(':tools') {
     testImplementation project(':connect:api')
     testImplementation project(':connect:runtime')
     testImplementation testFixtures(project(':connect:runtime'))
-    testImplementation project(':storage:storage-api').sourceSets.main.output
     testImplementation testFixtures(project(':storage'))
     testImplementation project(':streams')
     testImplementation project(':streams').sourceSets.test.output
@@ -4135,6 +4170,7 @@ gradle.projectsEvaluated {
     'metadata': ':metadata',
     'raft': ':raft',
     'connect/runtime': ':connect:runtime',
+    'core': ':core',
   ]
   allprojects { proj ->
     proj.configurations.all { config ->

checkstyle/import-control-core.xml

@@ -67,9 +67,6 @@
   </subpackage>
 
   <subpackage name="security">
-    <allow pkg="org.apache.commons" />
-    <allow pkg="org.apache.directory" />
-    <allow pkg="org.apache.mina.core.service" />
     <allow pkg="org.apache.kafka.test" />
   </subpackage>
 

checkstyle/import-control-server.xml

@@ -109,11 +109,14 @@
   </subpackage>
 
   <subpackage name="security">
+    <allow pkg="org.apache.commons" />
+    <allow pkg="org.apache.directory" />
     <allow pkg="org.apache.kafka.common.resource" />
     <allow pkg="org.apache.kafka.network" />
     <allow pkg="org.apache.kafka.server" />
     <allow pkg="org.apache.kafka.server.authorizer" />
     <allow class="org.apache.kafka.controller.MockAclMutator" />
+    <allow pkg="org.apache.mina.core.service" />
   </subpackage>
 
   <subpackage name="network">

checkstyle/suppressions.xml

@@ -89,7 +89,7 @@
               files="(Sender|Fetcher|FetchRequestManager|OffsetFetcher|KafkaConsumer|Metrics|RequestResponse|TransactionManager|KafkaAdminClient|Message|KafkaProducer)Test.java"/>
 
     <suppress checks="ClassFanOutComplexity"
-              files="(ConsumerCoordinator|KafkaConsumer|RequestResponse|Fetcher|FetchRequestManager|KafkaAdminClient|Message|KafkaProducer|NetworkClient)Test.java"/>
+              files="(ConsumerCoordinator|KafkaConsumer|RequestResponse|Fetcher|FetchRequestManager|KafkaAdminClient|Message|KafkaProducer|NetworkClient|StreamsGroupHeartbeatRequestManager)Test.java"/>
 
     <suppress checks="ClassFanOutComplexity"
               files="MockAdminClient.java"/>
@@ -244,6 +244,8 @@
               files="(ProduceBenchSpec|ConsumeBenchSpec|SustainedConnectionSpec).java"/>
     <suppress id="dontUseSystemExit"
               files="(VerifiableConsumer|VerifiableProducer|VerifiableShareConsumer).java"/>
+    <suppress checks="MethodLength"
+              files="ProducerPerformance\.java"/>
 
     <!-- Shell -->
     <suppress checks="CyclomaticComplexity"

clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/ClientsTestUtils.java

@@ -75,14 +75,23 @@ public static <K, V> List<ConsumerRecord<K, V>> consumeRecords(
         Consumer<K, V> consumer,
         int numRecords,
         int maxPollRecords
+    ) throws InterruptedException {
+        return consumeRecords(consumer, numRecords, maxPollRecords, 60000);
+    }
+
+    public static <K, V> List<ConsumerRecord<K, V>> consumeRecords(
+        Consumer<K, V> consumer,
+        int numRecords,
+        int maxPollRecords,
+        long maxWaitMs
     ) throws InterruptedException {
         List<ConsumerRecord<K, V>> consumedRecords = new ArrayList<>();
         TestUtils.waitForCondition(() -> {
             var records = consumer.poll(Duration.ofMillis(100));
             records.forEach(consumedRecords::add);
             assertTrue(records.count() <= maxPollRecords);
             return consumedRecords.size() >= numRecords;
-        }, 60000, "Timed out before consuming expected " + numRecords + " records.");
+        }, maxWaitMs, "Timed out before consuming expected " + numRecords + " records.");
 
         return consumedRecords;
     }