Apache Solr open-source search software
SOLR-16528: Jaegertracer module must include okhttp3 dependency (#1166)
Jan Høydahlc8ba7b3f7b19
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex fcdc1c9260c..865394e5d0f 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -94,6 +94,8 @@ Bug Fixes* SOLR-16274: HEAD request for managed resource returns 500 Server Error (Kevin Risden)+* SOLR-16528: Jaegertracer module must include okhttp3 dependency (janhoy)+Build---------------------* Upgrade forbiddenapis to 3.4 (Uwe Schindler)diff --git a/solr/modules/jaegertracer-configurator/build.gradle b/solr/modules/jaegertracer-configurator/build.gradleindex fabf02fc004..86e0d479ab3 100644--- a/solr/modules/jaegertracer-configurator/build.gradle+++ b/solr/modules/jaegertracer-configurator/build.gradle@@ -25,7 +25,6 @@ dependencies {implementation 'io.opentracing:opentracing-api'implementation 'io.jaegertracing:jaeger-core'runtimeOnly ("io.jaegertracing:jaeger-thrift", {- exclude group: "com.squareup.okhttp3", module: "okhttp"exclude group: "com.google.code.gson", module: "gson" // for "RemoteControlledSampler", optionalexclude group: "javax.annotation", module: "javax.annotation-api"exclude group: "org.apache.tomcat", module: "tomcat-annotations-api"diff --git a/versions.lock b/versions.lockindex f168572b939..d4bbcfb09d0 100644--- a/versions.lock+++ b/versions.lock@@ -61,6 +61,8 @@ com.mchange:mchange-commons-java:0.2.19 (1 constraints: 84075b75)com.pff:java-libpst:0.9.3 (1 constraints: 630cfa01)com.rometools:rome:1.18.0 (1 constraints: 910c870e)com.rometools:rome-utils:1.18.0 (1 constraints: 10095d96)+com.squareup.okhttp3:okhttp:4.9.3 (2 constraints: a51c74e6)+com.squareup.okio:okio:2.8.0 (1 constraints: 540c39fd)com.sun.activation:jakarta.activation:1.2.2 (1 constraints: ba0dac35)com.sun.istack:istack-commons-runtime:3.0.12 (1 constraints: eb0d9a43)com.tdunning:t-digest:3.1 (1 constraints: a804212c)@@ -277,6 +279,9 @@ org.itadaki:bzip2:0.9.1 (2 constraints: bd0c4b2c)org.javassist:javassist:3.25.0-GA (1 constraints: 2a110ef1)org.jctools:jctools-core:3.3.0 (1 constraints: 08050336)org.jdom:jdom2:2.0.6.1 (1 constraints: be0c371b)+org.jetbrains:annotations:13.0 (1 constraints: df0e795c)+org.jetbrains.kotlin:kotlin-stdlib:1.6.10 (6 constraints: b456d578)+org.jetbrains.kotlin:kotlin-stdlib-common:1.6.10 (3 constraints: 852a7097)org.junit:junit-bom:5.9.0 (1 constraints: c7116dde)org.locationtech.jts:jts-core:1.19.0 (2 constraints: a31de760)org.locationtech.jts.io:jts-io-common:1.19.0 (1 constraints: 930d513a)@@ -348,8 +353,6 @@ com.nimbusds:lang-tag:1.5 (1 constraints: da0b68eb)com.nimbusds:nimbus-jose-jwt:9.16.1 (1 constraints: 730c5410)com.nimbusds:oauth2-oidc-sdk:9.22.2 (1 constraints: f50ebb71)com.squareup.okhttp3:mockwebserver:4.9.3 (1 constraints: c60ebf62)-com.squareup.okhttp3:okhttp:4.9.3 (1 constraints: 3f0f516d)-com.squareup.okio:okio:2.8.0 (1 constraints: 540c39fd)io.github.microutils:kotlin-logging:2.1.21 (1 constraints: ec0e8871)io.github.microutils:kotlin-logging-jvm:2.1.21 (1 constraints: af0f358c)io.micrometer:micrometer-core:1.7.12 (1 constraints: fc162119)@@ -386,10 +389,7 @@ org.glassfish.jersey.test-framework:jersey-test-framework-core:2.35 (2 constrainorg.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-grizzly2:2.35 (1 constraints: de04fe30)org.hdrhistogram:HdrHistogram:2.1.12 (1 constraints: 520d2029)org.hsqldb:hsqldb:2.4.0 (1 constraints: 08050136)-org.jetbrains:annotations:13.0 (1 constraints: df0e795c)org.jetbrains.kotlin:kotlin-reflect:1.6.10 (2 constraints: 602486e2)-org.jetbrains.kotlin:kotlin-stdlib:1.6.10 (6 constraints: b456d578)-org.jetbrains.kotlin:kotlin-stdlib-common:1.6.10 (3 constraints: 852a7097)org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.0 (1 constraints: ae1013c2)org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.0 (2 constraints: 5e203d24)org.latencyutils:LatencyUtils:2.0.3 (1 constraints: 210dcd1b)