Apache Solr open-source search software
SOLR-17458: fix analyzeDependencies (#3771)
David Smileyc8e0470cf88d
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.tomlindex 5d97e58292f..87ea8f0c9e8 100644--- a/gradle/libs.versions.toml+++ b/gradle/libs.versions.toml@@ -486,9 +486,10 @@ opentelemetry-exporter-prometheus = { module = "io.opentelemetry:opentelemetry-eopentelemetry-exporter-sender-okhttp = { module = "io.opentelemetry:opentelemetry-exporter-sender-okhttp", version.ref = "opentelemetry" }opentelemetry-runtime-telemetry = { module = "io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java17", version.ref = "opentelemetry-runtime-telemetry" }opentelemetry-sdk = { module = "io.opentelemetry:opentelemetry-sdk", version.ref = "opentelemetry" }-opentelemetry-sdkextension-autoconfigure = { module = "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure", version.ref = "opentelemetry" }-opentelemetry-sdktesting = { module = "io.opentelemetry:opentelemetry-sdk-testing", version.ref = "opentelemetry" }-opentelemetry-sdktrace = { module = "io.opentelemetry:opentelemetry-sdk-trace", version.ref = "opentelemetry" }+opentelemetry-sdk-extension-autoconfigure = { module = "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure", version.ref = "opentelemetry" }+opentelemetry-sdk-testing = { module = "io.opentelemetry:opentelemetry-sdk-testing", version.ref = "opentelemetry" }+opentelemetry-sdk-trace = { module = "io.opentelemetry:opentelemetry-sdk-trace", version.ref = "opentelemetry" }+opentelemetry-sdk-metrics = { module = "io.opentelemetry:opentelemetry-sdk-metrics", version.ref = "opentelemetry" }osgi-annotation = { module = "org.osgi:osgi.annotation", version.ref = "osgi-annotation" }oshai-logging = { module = "io.github.oshai:kotlin-logging", version.ref = "oshai-logging" }# @keep transitive dependency for version alignmentdiff --git a/solr/core/build.gradle b/solr/core/build.gradleindex 53821126ba4..bbe9b292141 100644--- a/solr/core/build.gradle+++ b/solr/core/build.gradle@@ -148,18 +148,16 @@ dependencies {// StatsComponents percentilesimplementation libs.tdunning.tdigest- // Distributed Tracing+ // OpenTelemetryapi libs.opentelemetry.apiimplementation libs.opentelemetry.context-implementation(libs.opentelemetry.exporter.prometheus) {transitive = false}-- implementation(libs.opentelemetry.sdk, {+ implementation(libs.opentelemetry.sdk) {exclude group: "io.opentelemetry", module: "opentelemetry-sdk-logs"- })-+ }+ implementation libs.opentelemetry.sdk.metrics// JVM Runtime Telemetry metricsimplementation libs.opentelemetry.runtime.telemetry@@ -217,6 +215,6 @@ dependencies {testImplementation libs.apache.httpcomponents.httpclienttestImplementation libs.apache.httpcomponents.httpcore- testImplementation libs.opentelemetry.sdktesting+ testImplementation libs.opentelemetry.sdk.testingtestImplementation libs.dropwizard.metrics.core}diff --git a/solr/modules/cross-dc/build.gradle b/solr/modules/cross-dc/build.gradleindex 4e9ab5ab923..bfcb128ce59 100644--- a/solr/modules/cross-dc/build.gradle+++ b/solr/modules/cross-dc/build.gradle@@ -36,7 +36,7 @@ dependencies {implementation libs.slf4j.apiimplementation libs.apache.kafka.clientsimplementation libs.google.guava- implementation libs.dropwizard.metrics.core+ implementation libs.opentelemetry.apiimplementation libs.apache.zookeeper.zookeeperimplementation libs.apache.zookeeper.jutediff --git a/solr/modules/cross-dc/gradle.lockfile b/solr/modules/cross-dc/gradle.lockfileindex e5307fbe55a..55ed1b6b2fd 100644--- a/solr/modules/cross-dc/gradle.lockfile+++ b/solr/modules/cross-dc/gradle.lockfile@@ -35,7 +35,7 @@ commons-cli:commons-cli:1.10.0=apiHelper,jarValidation,runtimeClasspath,runtimeLcommons-codec:commons-codec:1.19.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathcommons-io:commons-io:2.20.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathio.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,testRuntimeClasspath-io.dropwizard.metrics:metrics-core:4.2.26=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+io.dropwizard.metrics:metrics-core:4.2.26=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathio.dropwizard.metrics:metrics-jetty12-ee10:4.2.26=jarValidation,testRuntimeClasspathio.dropwizard.metrics:metrics-jetty12:4.2.26=jarValidation,testRuntimeClasspathio.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessordiff --git a/solr/modules/jwt-auth/build.gradle b/solr/modules/jwt-auth/build.gradleindex 47e86a1ec64..8cb1d237bc0 100644--- a/solr/modules/jwt-auth/build.gradle+++ b/solr/modules/jwt-auth/build.gradle@@ -45,10 +45,7 @@ dependencies {testImplementation project(':solr:test-framework')testImplementation libs.apache.lucene.testframeworktestImplementation libs.junit.junit- testImplementation libs.prometheus.metrics.model- testImplementation(libs.opentelemetry.exporter.prometheus) {- transitive = false- }+testImplementation(libs.mockito.core, {exclude group: "net.bytebuddy", module: "byte-buddy-agent"})diff --git a/solr/modules/jwt-auth/gradle.lockfile b/solr/modules/jwt-auth/gradle.lockfileindex f205f4a73bb..67a2db3d9be 100644--- a/solr/modules/jwt-auth/gradle.lockfile+++ b/solr/modules/jwt-auth/gradle.lockfile@@ -73,13 +73,13 @@ io.opentelemetry:opentelemetry-api-incubator:1.45.0-alpha=jarValidation,runtimeCio.opentelemetry:opentelemetry-api:1.53.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathio.opentelemetry:opentelemetry-common:1.53.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathio.opentelemetry:opentelemetry-context:1.53.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-io.opentelemetry:opentelemetry-exporter-prometheus:1.50.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+io.opentelemetry:opentelemetry-exporter-prometheus:1.50.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathio.opentelemetry:opentelemetry-sdk-common:1.53.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathio.opentelemetry:opentelemetry-sdk-metrics:1.53.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathio.opentelemetry:opentelemetry-sdk-trace:1.53.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathio.opentelemetry:opentelemetry-sdk:1.53.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathio.prometheus:prometheus-metrics-exposition-formats:1.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-io.prometheus:prometheus-metrics-model:1.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+io.prometheus:prometheus-metrics-model:1.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathio.sgr:s2-geometry-library-java:1.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathio.swagger.core.v3:swagger-annotations-jakarta:2.2.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathjakarta.annotation:jakarta.annotation-api:2.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathdiff --git a/solr/modules/opentelemetry/build.gradle b/solr/modules/opentelemetry/build.gradleindex 00a693d3fd6..2d9990f3465 100644--- a/solr/modules/opentelemetry/build.gradle+++ b/solr/modules/opentelemetry/build.gradle@@ -30,7 +30,9 @@ dependencies {implementation libs.slf4j.apiimplementation libs.opentelemetry.api- implementation libs.opentelemetry.sdkextension.autoconfigure+ implementation libs.opentelemetry.sdk+ implementation libs.opentelemetry.sdk.metrics+ implementation libs.opentelemetry.sdk.extension.autoconfigureimplementation libs.opentelemetry.exporter.otlp// End users must recompile with jaeger exporter and/or zipkin exporter if they need these@@ -46,7 +48,6 @@ dependencies {testImplementation project(':solr:test-framework')testImplementation libs.junit.junit- testImplementation libs.opentelemetry.sdk- testImplementation libs.opentelemetry.sdktrace- testImplementation libs.opentelemetry.sdktesting+ testImplementation libs.opentelemetry.sdk.trace+ testImplementation libs.opentelemetry.sdk.testing}diff --git a/solr/test-framework/build.gradle b/solr/test-framework/build.gradleindex 1cdff5ec53b..86f83e33c39 100644--- a/solr/test-framework/build.gradle+++ b/solr/test-framework/build.gradle@@ -79,6 +79,7 @@ dependencies {implementation(libs.opentelemetry.sdk) {exclude group: "io.opentelemetry", module: "opentelemetry-sdk-logs"}+ permitUnusedDeclared libs.opentelemetry.sdkimplementation libs.jakarta.servlet.apiimplementation libs.eclipse.jetty.serverdiff --git a/solr/test-framework/gradle.lockfile b/solr/test-framework/gradle.lockfileindex 038a3a23c1c..54dd4c556a5 100644--- a/solr/test-framework/gradle.lockfile+++ b/solr/test-framework/gradle.lockfile@@ -57,14 +57,15 @@ io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java17:2.11.0-aio.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java8:2.11.0-alpha=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspathio.opentelemetry.semconv:opentelemetry-semconv:1.29.0-alpha=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspathio.opentelemetry:opentelemetry-api-incubator:1.45.0-alpha=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath-io.opentelemetry:opentelemetry-api:1.53.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath-io.opentelemetry:opentelemetry-common:1.53.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath-io.opentelemetry:opentelemetry-context:1.53.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath+io.opentelemetry:opentelemetry-api:1.53.0=apiHelper,compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath+io.opentelemetry:opentelemetry-common:1.53.0=apiHelper,compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath+io.opentelemetry:opentelemetry-context:1.53.0=apiHelper,compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspathio.opentelemetry:opentelemetry-exporter-prometheus:1.50.0-alpha=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath-io.opentelemetry:opentelemetry-sdk-common:1.53.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath-io.opentelemetry:opentelemetry-sdk-metrics:1.53.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath-io.opentelemetry:opentelemetry-sdk-trace:1.53.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath-io.opentelemetry:opentelemetry-sdk:1.53.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath+io.opentelemetry:opentelemetry-sdk-common:1.53.0=apiHelper,compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath+io.opentelemetry:opentelemetry-sdk-logs:1.53.0=permitUnusedDeclared+io.opentelemetry:opentelemetry-sdk-metrics:1.53.0=apiHelper,compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath+io.opentelemetry:opentelemetry-sdk-trace:1.53.0=apiHelper,compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath+io.opentelemetry:opentelemetry-sdk:1.53.0=apiHelper,compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspathio.prometheus:prometheus-metrics-exposition-formats:1.1.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspathio.prometheus:prometheus-metrics-model:1.1.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspathio.sgr:s2-geometry-library-java:1.0.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath