This is an automated email from the ASF dual-hosted git repository.
janhoy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/main by this push:
new 0a81be3 SOLR-15324 Upgrade Jaeger dependency from 1.1.0 to 1.6.0
(#268)
0a81be3 is described below
commit 0a81be3439eb7eae5d8570f2abc1fe39d13e0e1b
Author: Jan Høydahl <[email protected]>
AuthorDate: Wed Aug 25 10:31:18 2021 +0200
SOLR-15324 Upgrade Jaeger dependency from 1.1.0 to 1.6.0 (#268)
---
solr/CHANGES.txt | 2 ++
solr/contrib/jaegertracer-configurator/build.gradle | 2 ++
solr/licenses/jaeger-core-1.1.0.jar.sha1 | 1 -
solr/licenses/jaeger-core-1.6.0.jar.sha1 | 1 +
solr/licenses/jaeger-thrift-1.1.0.jar.sha1 | 1 -
solr/licenses/jaeger-thrift-1.6.0.jar.sha1 | 1 +
solr/licenses/libthrift-0.13.0.jar.sha1 | 1 -
solr/licenses/libthrift-0.14.1.jar.sha1 | 1 +
versions.lock | 8 ++++----
versions.props | 2 +-
10 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index b0e4ef5..c7c9137 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -435,6 +435,8 @@ Other Changes
* SOLR-15486: During node shutdown pausing of updates and waiting for
in-flight update requests to finish
before closing cores is no longer SolrCloud specific. (Christine Poerschke,
David Smiley)
+* SOLR-15324: Upgrade Jaeger dependency from 1.1.0 to 1.6.0 and thus also
libthrift to 0.14.1 (janhoy)
+
================== 8.9.0 ==================
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this
release.
diff --git a/solr/contrib/jaegertracer-configurator/build.gradle
b/solr/contrib/jaegertracer-configurator/build.gradle
index 8d14539..5b11804 100644
--- a/solr/contrib/jaegertracer-configurator/build.gradle
+++ b/solr/contrib/jaegertracer-configurator/build.gradle
@@ -26,6 +26,8 @@ dependencies {
exclude group: "com.squareup.okhttp3", module: "okhttp"
exclude group: "com.google.code.gson", module: "gson" // for
"RemoteControlledSampler", optional
exclude group: "javax.annotation", module: "javax.annotation-api"
+ exclude group: "org.apache.tomcat", module: "tomcat-annotations-api"
+ exclude group: "org.apache.tomcat.embed", module: "tomcat-embed-core"
})
testImplementation project(':solr:test-framework')
diff --git a/solr/licenses/jaeger-core-1.1.0.jar.sha1
b/solr/licenses/jaeger-core-1.1.0.jar.sha1
deleted file mode 100644
index 14a65fe..0000000
--- a/solr/licenses/jaeger-core-1.1.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b10186234b35da9c658d40eef9be160f19d89105
diff --git a/solr/licenses/jaeger-core-1.6.0.jar.sha1
b/solr/licenses/jaeger-core-1.6.0.jar.sha1
new file mode 100644
index 0000000..d2549c9
--- /dev/null
+++ b/solr/licenses/jaeger-core-1.6.0.jar.sha1
@@ -0,0 +1 @@
+001c572eb0ab754577b5856c63a3771f85def25c
diff --git a/solr/licenses/jaeger-thrift-1.1.0.jar.sha1
b/solr/licenses/jaeger-thrift-1.1.0.jar.sha1
deleted file mode 100644
index c24338d..0000000
--- a/solr/licenses/jaeger-thrift-1.1.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8ca3a1dfd69f9900d3541532fdc767ad24d6c88b
diff --git a/solr/licenses/jaeger-thrift-1.6.0.jar.sha1
b/solr/licenses/jaeger-thrift-1.6.0.jar.sha1
new file mode 100644
index 0000000..3893ec2
--- /dev/null
+++ b/solr/licenses/jaeger-thrift-1.6.0.jar.sha1
@@ -0,0 +1 @@
+2db813970bcc462fbf7c7fbd87a8adff0af54fe7
diff --git a/solr/licenses/libthrift-0.13.0.jar.sha1
b/solr/licenses/libthrift-0.13.0.jar.sha1
deleted file mode 100644
index a36d91b..0000000
--- a/solr/licenses/libthrift-0.13.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0e5af3b6dc164eb2c699b70bf67a0babef507faf
diff --git a/solr/licenses/libthrift-0.14.1.jar.sha1
b/solr/licenses/libthrift-0.14.1.jar.sha1
new file mode 100644
index 0000000..2797804
--- /dev/null
+++ b/solr/licenses/libthrift-0.14.1.jar.sha1
@@ -0,0 +1 @@
+85348a0c44c298bbec5ae747e67ae12e60b3aef6
diff --git a/versions.lock b/versions.lock
index 4f97749..3eaf5a4 100644
--- a/versions.lock
+++ b/versions.lock
@@ -73,8 +73,8 @@ io.dropwizard.metrics:metrics-jetty9:4.1.5 (1 constraints:
0c050736)
io.dropwizard.metrics:metrics-jmx:4.1.5 (1 constraints: 0c050736)
io.dropwizard.metrics:metrics-jvm:4.1.5 (1 constraints: 0c050736)
io.grpc:grpc-context:1.36.0 (3 constraints: 5a22231e)
-io.jaegertracing:jaeger-core:1.1.0 (1 constraints: 5c0d6c26)
-io.jaegertracing:jaeger-thrift:1.1.0 (1 constraints: 0405f335)
+io.jaegertracing:jaeger-core:1.6.0 (1 constraints: 610d7b26)
+io.jaegertracing:jaeger-thrift:1.6.0 (1 constraints: 09050236)
io.netty:netty-buffer:4.1.59.Final (6 constraints: 32558a4d)
io.netty:netty-codec:4.1.59.Final (2 constraints: f9136481)
io.netty:netty-common:4.1.59.Final (8 constraints: ac6e00d5)
@@ -174,7 +174,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.13.0 (1 constraints: 8e0dfd33)
+org.apache.thrift:libthrift:0.14.1 (1 constraints: 900d0134)
org.apache.tika:tika-core:1.24 (1 constraints: db04f730)
org.apache.tika:tika-java7:1.24 (1 constraints: db04f730)
org.apache.tika:tika-parsers:1.24 (1 constraints: db04f730)
@@ -235,7 +235,7 @@ org.openjdk.jmh:jmh-core:1.32 (1 constraints: da04f730)
org.ow2.asm:asm:7.2 (3 constraints: a325a35c)
org.ow2.asm:asm-commons:7.2 (1 constraints: 6b0f7267)
org.slf4j:jcl-over-slf4j:1.7.24 (1 constraints: 4005473b)
-org.slf4j:slf4j-api:1.7.24 (20 constraints: dc0114d2)
+org.slf4j:slf4j-api:1.7.24 (20 constraints: df018ed6)
org.tallison:jmatio:1.5 (1 constraints: aa041f2c)
org.threeten:threetenbp:1.5.0 (4 constraints: f82b9e86)
org.tukaani:xz:1.8 (1 constraints: ad04222c)
diff --git a/versions.props b/versions.props
index de85189..9a0688c 100644
--- a/versions.props
+++ b/versions.props
@@ -55,7 +55,7 @@ commons-logging:commons-logging=1.1.3
de.l3s.boilerpipe:boilerpipe=1.1.0
io.dropwizard.metrics:*=4.1.5
io.grpc:grpc-context=1.19.0
-io.jaegertracing:*=1.1.0
+io.jaegertracing:*=1.6.0
io.netty:*=4.1.50.Final
io.opencensus:opencensus-api=0.21.0
io.opencensus:opencensus-contrib-http-util=0.21.0
