diff --git a/changelog/unreleased/PR#3274-update-apache-kafka.yml b/changelog/unreleased/PR#3274-update-apache-kafka.yml new file mode 100644 index 000000000000..93bfc16d1f96 --- /dev/null +++ b/changelog/unreleased/PR#3274-update-apache-kafka.yml @@ -0,0 +1,7 @@ +title: Update apache.kafka to v4 +type: dependency_update +authors: +- name: solrbot +links: +- name: PR#3274 + url: https://github.com/apache/solr/pull/3274 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index aa37bf60e843..6d0e34435708 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -37,7 +37,7 @@ apache-curator = "5.9.0" apache-httpcomponents-httpclient = "4.5.14" apache-httpcomponents-httpcore = "4.4.16" apache-httpcomponents-httpmime = "4.5.14" -apache-kafka = "3.9.2" +apache-kafka = "4.3.0" apache-log4j = "2.25.3" apache-lucene = "10.4.0" apache-opennlp = "2.5.8" diff --git a/solr/cross-dc-manager/gradle.lockfile b/solr/cross-dc-manager/gradle.lockfile index 1a4c1b3845e1..2a4dfe29e6f9 100644 --- a/solr/cross-dc-manager/gradle.lockfile +++ b/solr/cross-dc-manager/gradle.lockfile @@ -1,23 +1,24 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. -at.yawk.lz4:lz4-java:1.10.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +at.yawk.lz4:lz4-java:1.10.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.8.4=jarValidation,testCompileClasspath,testRuntimeClasspath com.carrotsearch:hppc:0.10.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +com.dynatrace.hash4j:hash4j:0.22.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.21=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-core:2.21.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.fasterxml.jackson.core:jackson-databind:2.21.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.21.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.fasterxml.jackson.dataformat:jackson-dataformat-csv:2.21.2=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.21.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.21.2=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.21.2=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.21.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -com.fasterxml.jackson.module:jackson-module-scala_2.13:2.21.2=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath com.fasterxml.jackson:jackson-bom:2.21.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath com.fasterxml.woodstox:woodstox-core:7.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testRuntimeClasspath com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor -com.github.luben:zstd-jni:1.5.6-4=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +com.github.luben:zstd-jni:1.5.6-10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.google.android:annotations:4.1.1.4=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath com.google.api.grpc:proto-google-common-protos:2.63.2=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor @@ -36,6 +37,7 @@ com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=anno com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.protobuf:protobuf-java-util:3.25.8=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testRuntimeClasspath +com.google.re2j:re2j:1.8=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath com.j256.simplemagic:simplemagic:1.17=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.jayway.jsonpath:json-path:2.9.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.lmax:disruptor:4.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath @@ -44,8 +46,7 @@ com.squareup.okhttp3:okhttp:5.3.0=jarValidation,runtimeClasspath,runtimeLibs,tes com.squareup.okio:okio-jvm:3.16.2=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath com.squareup.okio:okio:3.16.2=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath com.tdunning:t-digest:3.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -com.thoughtworks.paranamer:paranamer:2.8.3=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath -com.typesafe.scala-logging:scala-logging_2.13:3.9.5=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath +com.typesafe.scala-logging:scala-logging_2.13:3.9.6=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath com.yammer.metrics:metrics-core:2.2.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath commons-beanutils:commons-beanutils:1.11.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath commons-cli:commons-cli:1.11.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath @@ -54,7 +55,7 @@ commons-collections:commons-collections:3.2.2=jarValidation,runtimeClasspath,run commons-digester:commons-digester:2.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath commons-io:commons-io:2.21.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath commons-validator:commons-validator:1.10.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath -io.dropwizard.metrics:metrics-core:4.1.12.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath +io.dropwizard.metrics:metrics-core:4.1.12.1=jarValidation,testRuntimeClasspath io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor io.grpc:grpc-api:1.80.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath @@ -132,22 +133,24 @@ org.apache.curator:curator-test:5.9.0=jarValidation,testRuntimeClasspath org.apache.httpcomponents:httpclient:4.5.14=jarValidation,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.16=jarValidation,testRuntimeClasspath org.apache.httpcomponents:httpmime:4.5.14=jarValidation,testRuntimeClasspath -org.apache.kafka:kafka-clients:3.9.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.apache.kafka:kafka-group-coordinator-api:3.9.2=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath -org.apache.kafka:kafka-group-coordinator:3.9.2=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath -org.apache.kafka:kafka-metadata:3.9.2=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath -org.apache.kafka:kafka-raft:3.9.2=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath -org.apache.kafka:kafka-server-common:3.9.2=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath -org.apache.kafka:kafka-server:3.9.2=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath -org.apache.kafka:kafka-storage-api:3.9.2=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath -org.apache.kafka:kafka-storage:3.9.2=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath -org.apache.kafka:kafka-streams:3.9.2=jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.apache.kafka:kafka-tools-api:3.9.2=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath -org.apache.kafka:kafka-transaction-coordinator:3.9.2=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath -org.apache.kafka:kafka_2.13:3.9.2=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath +org.apache.kafka:kafka-clients:4.3.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.apache.kafka:kafka-coordinator-common:4.3.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath +org.apache.kafka:kafka-group-coordinator-api:4.3.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath +org.apache.kafka:kafka-group-coordinator:4.3.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath +org.apache.kafka:kafka-metadata:4.3.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath +org.apache.kafka:kafka-raft:4.3.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath +org.apache.kafka:kafka-server-common:4.3.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath +org.apache.kafka:kafka-server:4.3.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath +org.apache.kafka:kafka-share-coordinator:4.3.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath +org.apache.kafka:kafka-storage-api:4.3.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath +org.apache.kafka:kafka-storage:4.3.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath +org.apache.kafka:kafka-streams:4.3.0=jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.kafka:kafka-tools-api:4.3.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath +org.apache.kafka:kafka-transaction-coordinator:4.3.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath +org.apache.kafka:kafka_2.13:4.3.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath org.apache.logging.log4j:log4j-1.2-api:2.25.3=solrPlatformLibs -org.apache.logging.log4j:log4j-api:2.25.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-core:2.25.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-api:2.25.4=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-core:2.25.4=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.logging.log4j:log4j-layout-template-json:2.25.3=solrPlatformLibs org.apache.logging.log4j:log4j-slf4j2-impl:2.25.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.logging.log4j:log4j-web:2.25.3=solrPlatformLibs @@ -216,6 +219,7 @@ org.glassfish.jersey.inject:jersey-hk2:4.0.2=jarValidation,runtimeClasspath,runt org.glassfish.jersey.media:jersey-media-json-jackson:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.jersey:jersey-bom:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath +org.hdrhistogram:HdrHistogram:2.2.2=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath org.javassist:javassist:3.30.2-GA=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib:2.2.21=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath org.jetbrains:annotations:26.0.2=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath @@ -230,15 +234,15 @@ org.opentest4j:opentest4j:1.2.0=jarValidation,testRuntimeClasspath org.ow2.asm:asm-commons:9.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.ow2.asm:asm-tree:9.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.ow2.asm:asm:9.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.pcollections:pcollections:4.0.1=annotationProcessor,errorprone,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testRuntimeClasspath -org.rocksdb:rocksdbjni:7.9.2=jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.scala-lang.modules:scala-collection-compat_2.13:2.10.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath -org.scala-lang.modules:scala-java8-compat_2.13:1.0.2=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath +org.pcollections:pcollections:4.0.1=annotationProcessor,errorprone,testAnnotationProcessor +org.pcollections:pcollections:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath +org.rocksdb:rocksdbjni:10.1.3=jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.scala-lang:scala-library:2.13.18=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath -org.scala-lang:scala-reflect:2.13.15=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath +org.scala-lang:scala-reflect:2.13.18=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath org.semver4j:semver4j:6.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.slf4j:jcl-over-slf4j:2.0.17=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.slf4j:jul-to-slf4j:2.0.17=solrPlatformLibs org.slf4j:slf4j-api:2.0.17=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.xerial.snappy:snappy-java:1.1.10.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.yaml:snakeyaml:2.5=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath empty=apiHelper,apiHelperTest,compileOnlyHelper,compileOnlyHelperTest,missingdoclet,packaging,permitAggregatorUse,permitTestAggregatorUse,permitTestUnusedDeclared,permitTestUsedUndeclared,permitUnusedDeclared,permitUsedUndeclared,signatures diff --git a/solr/licenses/hash4j-0.22.0.jar.sha1 b/solr/licenses/hash4j-0.22.0.jar.sha1 new file mode 100644 index 000000000000..80998cd1e482 --- /dev/null +++ b/solr/licenses/hash4j-0.22.0.jar.sha1 @@ -0,0 +1 @@ +2d61bfb5b38469cb76141b06dc68d36a9007e9ad diff --git a/solr/licenses/jackson-dataformat-yaml-2.21.2.jar.sha1 b/solr/licenses/jackson-dataformat-yaml-2.21.2.jar.sha1 new file mode 100644 index 000000000000..247c555f0734 --- /dev/null +++ b/solr/licenses/jackson-dataformat-yaml-2.21.2.jar.sha1 @@ -0,0 +1 @@ +61694c28cd9661c97cf160c9858ec9658360ae71 diff --git a/solr/licenses/jackson-module-scala_2.13-2.21.2.jar.sha1 b/solr/licenses/jackson-module-scala_2.13-2.21.2.jar.sha1 deleted file mode 100644 index a2f1f981af8e..000000000000 --- a/solr/licenses/jackson-module-scala_2.13-2.21.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -8b52be04f2e3d106a6f6cacd267cc5febed927cb diff --git a/solr/licenses/kafka-clients-3.9.2-test.jar.sha1 b/solr/licenses/kafka-clients-3.9.2-test.jar.sha1 deleted file mode 100644 index d63004758a17..000000000000 --- a/solr/licenses/kafka-clients-3.9.2-test.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -06e3f668d8d989f608dc3891d3e2d6a95508f074 diff --git a/solr/licenses/kafka-clients-3.9.2.jar.sha1 b/solr/licenses/kafka-clients-3.9.2.jar.sha1 deleted file mode 100644 index 5825a6db3923..000000000000 --- a/solr/licenses/kafka-clients-3.9.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -a06edbaa01458ed2e8cf1be69a18c2f231fda6e0 diff --git a/solr/licenses/kafka-clients-4.3.0-test.jar.sha1 b/solr/licenses/kafka-clients-4.3.0-test.jar.sha1 new file mode 100644 index 000000000000..4fa400f23519 --- /dev/null +++ b/solr/licenses/kafka-clients-4.3.0-test.jar.sha1 @@ -0,0 +1 @@ +3001a3aae2cfc7cafc96c5235ebb0123efbd3ff6 diff --git a/solr/licenses/kafka-clients-4.3.0.jar.sha1 b/solr/licenses/kafka-clients-4.3.0.jar.sha1 new file mode 100644 index 000000000000..2bdf4d647035 --- /dev/null +++ b/solr/licenses/kafka-clients-4.3.0.jar.sha1 @@ -0,0 +1 @@ +2bedc61c3e75cf3342b869a5b4b470458fa94b07 diff --git a/solr/licenses/kafka-coordinator-common-4.3.0.jar.sha1 b/solr/licenses/kafka-coordinator-common-4.3.0.jar.sha1 new file mode 100644 index 000000000000..13185f2936e2 --- /dev/null +++ b/solr/licenses/kafka-coordinator-common-4.3.0.jar.sha1 @@ -0,0 +1 @@ +45ce0ff0c8076f361a5f6c3ba30727647b93088a diff --git a/solr/licenses/kafka-group-coordinator-3.9.2.jar.sha1 b/solr/licenses/kafka-group-coordinator-3.9.2.jar.sha1 deleted file mode 100644 index 1141ce9a3c18..000000000000 --- a/solr/licenses/kafka-group-coordinator-3.9.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -416c1dbcdd1e141707dd89dfe04328a9ce870264 diff --git a/solr/licenses/kafka-group-coordinator-4.3.0.jar.sha1 b/solr/licenses/kafka-group-coordinator-4.3.0.jar.sha1 new file mode 100644 index 000000000000..51f9414ab71f --- /dev/null +++ b/solr/licenses/kafka-group-coordinator-4.3.0.jar.sha1 @@ -0,0 +1 @@ +3134902f505b987dfc91d0d01a6dc60e29f74c78 diff --git a/solr/licenses/kafka-group-coordinator-api-3.9.2.jar.sha1 b/solr/licenses/kafka-group-coordinator-api-3.9.2.jar.sha1 deleted file mode 100644 index 13b0b7f78db0..000000000000 --- a/solr/licenses/kafka-group-coordinator-api-3.9.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -7a69f2be4047f3f55554c403fe78680d54a26480 diff --git a/solr/licenses/kafka-group-coordinator-api-4.3.0.jar.sha1 b/solr/licenses/kafka-group-coordinator-api-4.3.0.jar.sha1 new file mode 100644 index 000000000000..4ded9ba01475 --- /dev/null +++ b/solr/licenses/kafka-group-coordinator-api-4.3.0.jar.sha1 @@ -0,0 +1 @@ +481dbcc9e6406bb260838fab8ae5dc1237a611ed diff --git a/solr/licenses/kafka-metadata-3.9.2.jar.sha1 b/solr/licenses/kafka-metadata-3.9.2.jar.sha1 deleted file mode 100644 index fe49498df2fb..000000000000 --- a/solr/licenses/kafka-metadata-3.9.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -01a266d85e89f1216e1325955942c3037da21d3b diff --git a/solr/licenses/kafka-metadata-4.3.0.jar.sha1 b/solr/licenses/kafka-metadata-4.3.0.jar.sha1 new file mode 100644 index 000000000000..2874314a7bbb --- /dev/null +++ b/solr/licenses/kafka-metadata-4.3.0.jar.sha1 @@ -0,0 +1 @@ +4d6d899807d80c05b9d1f90defafc97d55ffbcaa diff --git a/solr/licenses/kafka-raft-3.9.2.jar.sha1 b/solr/licenses/kafka-raft-3.9.2.jar.sha1 deleted file mode 100644 index c30402567805..000000000000 --- a/solr/licenses/kafka-raft-3.9.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -5b72980224762aef91766a8fb047a03640905700 diff --git a/solr/licenses/kafka-raft-4.3.0.jar.sha1 b/solr/licenses/kafka-raft-4.3.0.jar.sha1 new file mode 100644 index 000000000000..d7b219cfbe15 --- /dev/null +++ b/solr/licenses/kafka-raft-4.3.0.jar.sha1 @@ -0,0 +1 @@ +03d6514ba6e5f3aec813589a372ae87e18595233 diff --git a/solr/licenses/kafka-server-3.9.2.jar.sha1 b/solr/licenses/kafka-server-3.9.2.jar.sha1 deleted file mode 100644 index 4fe94c9114b6..000000000000 --- a/solr/licenses/kafka-server-3.9.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e3d11d66ce497bfc3572d9e095280b4a893d16fa diff --git a/solr/licenses/kafka-server-4.3.0.jar.sha1 b/solr/licenses/kafka-server-4.3.0.jar.sha1 new file mode 100644 index 000000000000..9b59c92ca40b --- /dev/null +++ b/solr/licenses/kafka-server-4.3.0.jar.sha1 @@ -0,0 +1 @@ +53bf37ff5eacb3d17cd6a4eee411eac9626c7651 diff --git a/solr/licenses/kafka-server-common-3.9.2-test.jar.sha1 b/solr/licenses/kafka-server-common-3.9.2-test.jar.sha1 deleted file mode 100644 index c142a96f2992..000000000000 --- a/solr/licenses/kafka-server-common-3.9.2-test.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -dfe59e02dde550d01ca98dca66ceb885af6d84b1 diff --git a/solr/licenses/kafka-server-common-3.9.2.jar.sha1 b/solr/licenses/kafka-server-common-3.9.2.jar.sha1 deleted file mode 100644 index 8e9b718fffc3..000000000000 --- a/solr/licenses/kafka-server-common-3.9.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e6fe2cdafd5b2a0b07db07cf692863e0b9335625 diff --git a/solr/licenses/kafka-server-common-4.3.0-test.jar.sha1 b/solr/licenses/kafka-server-common-4.3.0-test.jar.sha1 new file mode 100644 index 000000000000..a8727744e169 --- /dev/null +++ b/solr/licenses/kafka-server-common-4.3.0-test.jar.sha1 @@ -0,0 +1 @@ +c3781723912fcba4cefa9c6d9d85b856ecca667b diff --git a/solr/licenses/kafka-server-common-4.3.0.jar.sha1 b/solr/licenses/kafka-server-common-4.3.0.jar.sha1 new file mode 100644 index 000000000000..cdc8faa9cc11 --- /dev/null +++ b/solr/licenses/kafka-server-common-4.3.0.jar.sha1 @@ -0,0 +1 @@ +d06105d08f3ef61b6d920345e284934a53e3cef9 diff --git a/solr/licenses/kafka-share-coordinator-4.3.0.jar.sha1 b/solr/licenses/kafka-share-coordinator-4.3.0.jar.sha1 new file mode 100644 index 000000000000..4c6ee12c790d --- /dev/null +++ b/solr/licenses/kafka-share-coordinator-4.3.0.jar.sha1 @@ -0,0 +1 @@ +78174a24876b0411e6e0bbf1be2f348b139f3c6d diff --git a/solr/licenses/kafka-storage-3.9.2.jar.sha1 b/solr/licenses/kafka-storage-3.9.2.jar.sha1 deleted file mode 100644 index 2d38f15baaaa..000000000000 --- a/solr/licenses/kafka-storage-3.9.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -a8a997893c4cb8cc3093c71720b3c33f1e03cade diff --git a/solr/licenses/kafka-storage-4.3.0.jar.sha1 b/solr/licenses/kafka-storage-4.3.0.jar.sha1 new file mode 100644 index 000000000000..2b0035fc0507 --- /dev/null +++ b/solr/licenses/kafka-storage-4.3.0.jar.sha1 @@ -0,0 +1 @@ +f80ca811dd60eeb711b11d01af56f26b0c528d0e diff --git a/solr/licenses/kafka-storage-api-3.9.2.jar.sha1 b/solr/licenses/kafka-storage-api-3.9.2.jar.sha1 deleted file mode 100644 index 39ea1716578c..000000000000 --- a/solr/licenses/kafka-storage-api-3.9.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -8fa32fee158c900bd2d3d87d09d5838bd5a8813f diff --git a/solr/licenses/kafka-storage-api-4.3.0.jar.sha1 b/solr/licenses/kafka-storage-api-4.3.0.jar.sha1 new file mode 100644 index 000000000000..654cb8bb0a24 --- /dev/null +++ b/solr/licenses/kafka-storage-api-4.3.0.jar.sha1 @@ -0,0 +1 @@ +1d3ac04a39fa27a2b23906c8aaf7516e0f4a2333 diff --git a/solr/licenses/kafka-streams-3.9.2-test.jar.sha1 b/solr/licenses/kafka-streams-3.9.2-test.jar.sha1 deleted file mode 100644 index d0dd0217f906..000000000000 --- a/solr/licenses/kafka-streams-3.9.2-test.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -a73440d85accc36697234500238635f617dd704e diff --git a/solr/licenses/kafka-streams-3.9.2.jar.sha1 b/solr/licenses/kafka-streams-3.9.2.jar.sha1 deleted file mode 100644 index 2beffe31980d..000000000000 --- a/solr/licenses/kafka-streams-3.9.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -3253bfc2c12441a54be3c2c77ce5b1d2dec7be72 diff --git a/solr/licenses/kafka-streams-4.3.0-test.jar.sha1 b/solr/licenses/kafka-streams-4.3.0-test.jar.sha1 new file mode 100644 index 000000000000..c05082e46e64 --- /dev/null +++ b/solr/licenses/kafka-streams-4.3.0-test.jar.sha1 @@ -0,0 +1 @@ +bc2179b541aef2e2e9a967b7a50cc13d3373f5a6 diff --git a/solr/licenses/kafka-streams-4.3.0.jar.sha1 b/solr/licenses/kafka-streams-4.3.0.jar.sha1 new file mode 100644 index 000000000000..2e9f877fc987 --- /dev/null +++ b/solr/licenses/kafka-streams-4.3.0.jar.sha1 @@ -0,0 +1 @@ +229339a141be4223f0d8c997a9afd7bfaee617ec diff --git a/solr/licenses/kafka-tools-api-3.9.2.jar.sha1 b/solr/licenses/kafka-tools-api-3.9.2.jar.sha1 deleted file mode 100644 index 8aa9ceabe944..000000000000 --- a/solr/licenses/kafka-tools-api-3.9.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -d1b40695ba813f5647fe5bcd5960628cd1ef9a77 diff --git a/solr/licenses/kafka-tools-api-4.3.0.jar.sha1 b/solr/licenses/kafka-tools-api-4.3.0.jar.sha1 new file mode 100644 index 000000000000..ae2272f6aa78 --- /dev/null +++ b/solr/licenses/kafka-tools-api-4.3.0.jar.sha1 @@ -0,0 +1 @@ +1f203d8828e989c44e701d21133ea9bf4a52f4da diff --git a/solr/licenses/kafka-transaction-coordinator-3.9.2.jar.sha1 b/solr/licenses/kafka-transaction-coordinator-3.9.2.jar.sha1 deleted file mode 100644 index 02b3cf0fc79d..000000000000 --- a/solr/licenses/kafka-transaction-coordinator-3.9.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b001c1f9e45521be560d9a2a9e6d337a1b3a82c9 diff --git a/solr/licenses/kafka-transaction-coordinator-4.3.0.jar.sha1 b/solr/licenses/kafka-transaction-coordinator-4.3.0.jar.sha1 new file mode 100644 index 000000000000..5d6c784d673a --- /dev/null +++ b/solr/licenses/kafka-transaction-coordinator-4.3.0.jar.sha1 @@ -0,0 +1 @@ +ffed21d44334b6dd43d85c397cd092623a6990ff diff --git a/solr/licenses/kafka_2.13-3.9.2-test.jar.sha1 b/solr/licenses/kafka_2.13-3.9.2-test.jar.sha1 deleted file mode 100644 index 61558f444d80..000000000000 --- a/solr/licenses/kafka_2.13-3.9.2-test.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ac5d850006fa65cdba75012d6f2c17ed1759c1ce diff --git a/solr/licenses/kafka_2.13-3.9.2.jar.sha1 b/solr/licenses/kafka_2.13-3.9.2.jar.sha1 deleted file mode 100644 index 4386ee2ced19..000000000000 --- a/solr/licenses/kafka_2.13-3.9.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -a671d4c2c65740d4a564687d9313ca50be6c10e5 diff --git a/solr/licenses/kafka_2.13-4.3.0-test.jar.sha1 b/solr/licenses/kafka_2.13-4.3.0-test.jar.sha1 new file mode 100644 index 000000000000..c0496a6421ba --- /dev/null +++ b/solr/licenses/kafka_2.13-4.3.0-test.jar.sha1 @@ -0,0 +1 @@ +888882deb5b86b0ef69a33db496c9297f0b3ab3d diff --git a/solr/licenses/kafka_2.13-4.3.0.jar.sha1 b/solr/licenses/kafka_2.13-4.3.0.jar.sha1 new file mode 100644 index 000000000000..77a21fe1c83e --- /dev/null +++ b/solr/licenses/kafka_2.13-4.3.0.jar.sha1 @@ -0,0 +1 @@ +c08fa32321c58d07c4a840bc8805a44e509330c7 diff --git a/solr/licenses/log4j-api-2.25.4.jar.sha1 b/solr/licenses/log4j-api-2.25.4.jar.sha1 new file mode 100644 index 000000000000..48ac0997c714 --- /dev/null +++ b/solr/licenses/log4j-api-2.25.4.jar.sha1 @@ -0,0 +1 @@ +89ff2217b193fb187b134aa6ebcbfa8a28b018a9 diff --git a/solr/licenses/log4j-core-2.25.4.jar.sha1 b/solr/licenses/log4j-core-2.25.4.jar.sha1 new file mode 100644 index 000000000000..86d6d0a4223c --- /dev/null +++ b/solr/licenses/log4j-core-2.25.4.jar.sha1 @@ -0,0 +1 @@ +b963c3d6bfdf05c61ad47a74e9f9295131607df2 diff --git a/solr/licenses/lz4-java-1.10.1.jar.sha1 b/solr/licenses/lz4-java-1.10.1.jar.sha1 deleted file mode 100644 index d15f142e6e54..000000000000 --- a/solr/licenses/lz4-java-1.10.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -f541d7f910fe3d76f38f799c507c48cc81b12ecb diff --git a/solr/licenses/lz4-java-1.10.2.jar.sha1 b/solr/licenses/lz4-java-1.10.2.jar.sha1 new file mode 100644 index 000000000000..949284e72d33 --- /dev/null +++ b/solr/licenses/lz4-java-1.10.2.jar.sha1 @@ -0,0 +1 @@ +1df182cf1b030e347c81ca8768c24dab414a04d8 diff --git a/solr/licenses/metrics-core-4.1.12.1.jar.sha1 b/solr/licenses/metrics-core-4.1.12.1.jar.sha1 deleted file mode 100644 index bc15d23cf0c8..000000000000 --- a/solr/licenses/metrics-core-4.1.12.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -cb2f351bf4463751201f43bb99865235d5ba07ca diff --git a/solr/licenses/paranamer-2.8.3.jar.sha1 b/solr/licenses/paranamer-2.8.3.jar.sha1 deleted file mode 100644 index a004717c78a1..000000000000 --- a/solr/licenses/paranamer-2.8.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -75ae4eb129574b7fc0df5fa8808d7ed625be815d diff --git a/solr/licenses/pcollections-4.0.1.jar.sha1 b/solr/licenses/pcollections-4.0.1.jar.sha1 deleted file mode 100644 index c7ecd798eff5..000000000000 --- a/solr/licenses/pcollections-4.0.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -059f3bf5fb28c5f5386804dcf129267416b75d7c diff --git a/solr/licenses/pcollections-4.0.2.jar.sha1 b/solr/licenses/pcollections-4.0.2.jar.sha1 new file mode 100644 index 000000000000..70291d3cd6b4 --- /dev/null +++ b/solr/licenses/pcollections-4.0.2.jar.sha1 @@ -0,0 +1 @@ +c8398b4443deae11e6eaffbc04a371b4eb8f6b8e diff --git a/solr/licenses/rocksdbjni-10.1.3.jar.sha1 b/solr/licenses/rocksdbjni-10.1.3.jar.sha1 new file mode 100644 index 000000000000..ec3540efa944 --- /dev/null +++ b/solr/licenses/rocksdbjni-10.1.3.jar.sha1 @@ -0,0 +1 @@ +46a1e0a0f175508717976971fc6a9e189f5dc0b1 diff --git a/solr/licenses/rocksdbjni-7.9.2.jar.sha1 b/solr/licenses/rocksdbjni-7.9.2.jar.sha1 deleted file mode 100644 index 2d84500a7cba..000000000000 --- a/solr/licenses/rocksdbjni-7.9.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -6409b667493149191b09fe1fce94bada6096a3e9 diff --git a/solr/licenses/scala-collection-compat_2.13-2.10.0.jar.sha1 b/solr/licenses/scala-collection-compat_2.13-2.10.0.jar.sha1 deleted file mode 100644 index 59631aef4a3e..000000000000 --- a/solr/licenses/scala-collection-compat_2.13-2.10.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -2464528d14329ff2b44bceff918d6c00300adcf4 diff --git a/solr/licenses/scala-java8-compat_2.13-1.0.2.jar.sha1 b/solr/licenses/scala-java8-compat_2.13-1.0.2.jar.sha1 deleted file mode 100644 index d8d441889cf5..000000000000 --- a/solr/licenses/scala-java8-compat_2.13-1.0.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -5b54f60ccf03e41e24c466462a72475ee918c304 diff --git a/solr/licenses/scala-logging_2.13-3.9.5.jar.sha1 b/solr/licenses/scala-logging_2.13-3.9.5.jar.sha1 deleted file mode 100644 index a1fb8640c96e..000000000000 --- a/solr/licenses/scala-logging_2.13-3.9.5.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -d5a0f61168371d8cff1c510f55407aa46bea8366 diff --git a/solr/licenses/scala-logging_2.13-3.9.6.jar.sha1 b/solr/licenses/scala-logging_2.13-3.9.6.jar.sha1 new file mode 100644 index 000000000000..8a8115ffdc9a --- /dev/null +++ b/solr/licenses/scala-logging_2.13-3.9.6.jar.sha1 @@ -0,0 +1 @@ +f887ff84d87e3e9c89e28f8a4064bf74d1eacbb4 diff --git a/solr/licenses/scala-reflect-2.13.15.jar.sha1 b/solr/licenses/scala-reflect-2.13.15.jar.sha1 deleted file mode 100644 index 5f8edfcb1066..000000000000 --- a/solr/licenses/scala-reflect-2.13.15.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -355927b10366563a8f1b56c1f34ff376f2f7c8c5 diff --git a/solr/licenses/scala-reflect-2.13.18.jar.sha1 b/solr/licenses/scala-reflect-2.13.18.jar.sha1 new file mode 100644 index 000000000000..36a77a1bfe0a --- /dev/null +++ b/solr/licenses/scala-reflect-2.13.18.jar.sha1 @@ -0,0 +1 @@ +674f3bd39f5c528d575da69c42a5dff772b9b75c diff --git a/solr/licenses/snakeyaml-2.5.jar.sha1 b/solr/licenses/snakeyaml-2.5.jar.sha1 new file mode 100644 index 000000000000..606eb00f8c3a --- /dev/null +++ b/solr/licenses/snakeyaml-2.5.jar.sha1 @@ -0,0 +1 @@ +2d53ddec134280cb384c1e35d094e5f71c1f2316 diff --git a/solr/licenses/zstd-jni-1.5.6-10.jar.sha1 b/solr/licenses/zstd-jni-1.5.6-10.jar.sha1 new file mode 100644 index 000000000000..20413e1a983f --- /dev/null +++ b/solr/licenses/zstd-jni-1.5.6-10.jar.sha1 @@ -0,0 +1 @@ +7e146ecb598af55d1f64d1c118af27569a848558 diff --git a/solr/licenses/zstd-jni-1.5.6-4.jar.sha1 b/solr/licenses/zstd-jni-1.5.6-4.jar.sha1 deleted file mode 100644 index 5e1398a1efa8..000000000000 --- a/solr/licenses/zstd-jni-1.5.6-4.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ba9e303e0b5e94cdd0017390d7d8c06f47fd61f7 diff --git a/solr/modules/cross-dc/gradle.lockfile b/solr/modules/cross-dc/gradle.lockfile index 52fe93a58be2..7e558e4a0ae4 100644 --- a/solr/modules/cross-dc/gradle.lockfile +++ b/solr/modules/cross-dc/gradle.lockfile @@ -1,7 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. -at.yawk.lz4:lz4-java:1.10.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath +at.yawk.lz4:lz4-java:1.10.2=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.8.4=jarValidation,testCompileClasspath,testRuntimeClasspath com.carrotsearch:hppc:0.10.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.21=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath @@ -14,7 +14,7 @@ com.fasterxml.jackson:jackson-bom:2.21.2=apiHelper,compileClasspath,jarValidatio com.fasterxml.woodstox:woodstox-core:7.0.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,apiHelper,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testRuntimeClasspath com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor -com.github.luben:zstd-jni:1.5.6-4=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath +com.github.luben:zstd-jni:1.5.6-10=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor @@ -89,7 +89,7 @@ org.apache.curator:curator-test:5.9.0=jarValidation,testRuntimeClasspath org.apache.httpcomponents:httpclient:4.5.14=jarValidation,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.16=jarValidation,testRuntimeClasspath org.apache.httpcomponents:httpmime:4.5.14=jarValidation,testRuntimeClasspath -org.apache.kafka:kafka-clients:3.9.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.kafka:kafka-clients:4.3.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.apache.logging.log4j:log4j-1.2-api:2.25.3=solrPlatformLibs org.apache.logging.log4j:log4j-api:2.25.3=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.logging.log4j:log4j-core:2.25.3=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath