You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ja...@apache.org on 2021/12/13 08:25:52 UTC
[lucene-solr] branch branch_8_11 updated: SOLR-15324 Upgrade jaegertracing to 1.6.0 and libthrift to 0.14.1 (#2630)
This is an automated email from the ASF dual-hosted git repository.
janhoy pushed a commit to branch branch_8_11
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/branch_8_11 by this push:
new ff30eb1 SOLR-15324 Upgrade jaegertracing to 1.6.0 and libthrift to 0.14.1 (#2630)
ff30eb1 is described below
commit ff30eb1336f33f6684af2df4672e7cab0ea27ae4
Author: Jan Høydahl <ja...@users.noreply.github.com>
AuthorDate: Mon Dec 13 09:25:37 2021 +0100
SOLR-15324 Upgrade jaegertracing to 1.6.0 and libthrift to 0.14.1 (#2630)
---
lucene/ivy-versions.properties | 4 ++--
solr/CHANGES.txt | 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 +
8 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/lucene/ivy-versions.properties b/lucene/ivy-versions.properties
index 626f50e..ff8bdf1 100644
--- a/lucene/ivy-versions.properties
+++ b/lucene/ivy-versions.properties
@@ -108,7 +108,7 @@ io.dropwizard.metrics.version = 4.1.5
/io.grpc/grpc-context = 1.19.0
-io.jaegertracing.version = 1.1.0
+io.jaegertracing.version = 1.6.0
/io.jaegertracing/jaeger-core = ${io.jaegertracing.version}
/io.jaegertracing/jaeger-thrift = ${io.jaegertracing.version}
@@ -256,7 +256,7 @@ org.apache.poi.version = 4.1.2
/org.apache.poi/poi-ooxml-schemas = ${org.apache.poi.version}
/org.apache.poi/poi-scratchpad = ${org.apache.poi.version}
-org.apache.thrift.version = 0.13.0
+org.apache.thrift.version = 0.14.1
/org.apache.thrift/libthrift = ${org.apache.thrift.version}
org.apache.tika.version = 1.27
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 054c7d3..9a97cd7 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -47,6 +47,8 @@ Bug Fixes
* SOLR-15843: Update Log4J to 2.15 (Mike Drob)
+* SOLR-15324: Upgrade jaegertracing to 1.6.0 and libthrift to 0.14.1 (wcmrnd1, janhoy)
+
================== 8.11.0 ==================
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.
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