diff --git a/solr/contrib/jaegertracer-configurator/build.gradle b/solr/contrib/jaegertracer-configurator/build.gradle index 6d3630c7a19..bcbb3f6c06b 100644 --- a/solr/contrib/jaegertracer-configurator/build.gradle +++ b/solr/contrib/jaegertracer-configurator/build.gradle @@ -23,6 +23,7 @@ dependencies { implementation ("io.jaegertracing:jaeger-thrift", { exclude group: "com.squareup.okhttp3", module: "okhttp" exclude group: "com.google.code.gson", module: "gson" + exclude group: "javax.annotation", module: "javax.annotation-api" }) testImplementation project(':solr:test-framework') diff --git a/versions.lock b/versions.lock index cd7a73ecd4a..2e19effd3c9 100644 --- a/versions.lock +++ b/versions.lock @@ -58,8 +58,8 @@ io.dropwizard.metrics:metrics-graphite:4.1.2 (1 constraints: 09050436) io.dropwizard.metrics:metrics-jetty9:4.1.2 (1 constraints: 09050436) io.dropwizard.metrics:metrics-jmx:4.1.2 (1 constraints: 09050436) io.dropwizard.metrics:metrics-jvm:4.1.2 (1 constraints: 09050436) -io.jaegertracing:jaeger-core:0.35.5 (1 constraints: 970d1034) -io.jaegertracing:jaeger-thrift:0.35.5 (1 constraints: 3f053f3b) +io.jaegertracing:jaeger-core:1.1.0 (1 constraints: 5c0d6c26) +io.jaegertracing:jaeger-thrift:1.1.0 (1 constraints: 0405f335) io.netty:netty-buffer:4.1.29.Final (4 constraints: 5b3421e8) io.netty:netty-codec:4.1.29.Final (2 constraints: fc135782) io.netty:netty-common:4.1.29.Final (5 constraints: 88482df2) @@ -68,10 +68,10 @@ io.netty:netty-resolver:4.1.29.Final (2 constraints: 0b15d4b5) io.netty:netty-transport:4.1.29.Final (5 constraints: 7847682a) io.netty:netty-transport-native-epoll:4.1.29.Final (1 constraints: 5a076061) io.netty:netty-transport-native-unix-common:4.1.29.Final (2 constraints: 081ace05) -io.opentracing:opentracing-api:0.33.0 (5 constraints: 4c3c8052) +io.opentracing:opentracing-api:0.33.0 (5 constraints: 4d3cfe52) io.opentracing:opentracing-mock:0.33.0 (1 constraints: 3805343b) io.opentracing:opentracing-noop:0.33.0 (3 constraints: 7c2142bd) -io.opentracing:opentracing-util:0.33.0 (3 constraints: f61f583b) +io.opentracing:opentracing-util:0.33.0 (3 constraints: f71f843b) io.prometheus:simpleclient:0.2.0 (3 constraints: fe242db8) io.prometheus:simpleclient_common:0.2.0 (2 constraints: e8159ecb) io.prometheus:simpleclient_httpserver:0.2.0 (1 constraints: 0405f135) @@ -129,7 +129,7 @@ org.apache.poi:poi:4.1.1 (1 constraints: 08050336) org.apache.poi:poi-ooxml:4.1.1 (1 constraints: 08050336) org.apache.poi:poi-ooxml-schemas:4.1.1 (1 constraints: 08050336) org.apache.poi:poi-scratchpad:4.1.1 (1 constraints: 08050336) -org.apache.thrift:libthrift:0.12.0 (1 constraints: 8d0dfa33) +org.apache.thrift:libthrift:0.13.0 (1 constraints: 8e0dfd33) org.apache.tika:tika-core:1.23 (1 constraints: da04f630) org.apache.tika:tika-java7:1.23 (1 constraints: da04f630) org.apache.tika:tika-parsers:1.23 (1 constraints: da04f630) @@ -203,7 +203,7 @@ org.restlet.jee:org.restlet:2.4.0 (2 constraints: e515d4e6) org.restlet.jee:org.restlet.ext.servlet:2.4.0 (1 constraints: 08050136) org.rrd4j:rrd4j:3.5 (1 constraints: ac04252c) org.slf4j:jcl-over-slf4j:1.7.24 (1 constraints: 4005473b) -org.slf4j:slf4j-api:1.7.24 (18 constraints: 6ef487eb) +org.slf4j:slf4j-api:1.7.24 (18 constraints: 74f4c3f7) org.slf4j:slf4j-simple:1.7.24 (1 constraints: 4005473b) org.tallison:jmatio:1.5 (1 constraints: aa041f2c) org.tukaani:xz:1.8 (1 constraints: ad04222c) diff --git a/versions.props b/versions.props index 544f93dd1f2..2a0ede43401 100644 --- a/versions.props +++ b/versions.props @@ -33,7 +33,7 @@ commons-io:commons-io=2.6 commons-logging:commons-logging=1.1.3 de.l3s.boilerpipe:boilerpipe=1.1.0 io.dropwizard.metrics:*=4.1.2 -io.jaegertracing:*=0.35.5 +io.jaegertracing:*=1.1.0 io.netty:*=4.1.29.Final io.opentracing:*=0.33.0 io.prometheus:*=0.2.0