You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by ja...@apache.org on 2022/11/08 18:12:58 UTC

[solr] branch branch_9x updated: SOLR-16529 Upgrade jaeger-client to 1.8.1 (#1167)

This is an automated email from the ASF dual-hosted git repository.

janhoy pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git


The following commit(s) were added to refs/heads/branch_9x by this push:
     new cfea293f4c9 SOLR-16529 Upgrade jaeger-client to 1.8.1 (#1167)
cfea293f4c9 is described below

commit cfea293f4c9dd71eeedf79bd6720d07bd5b32862
Author: Jan Høydahl <ja...@users.noreply.github.com>
AuthorDate: Tue Nov 8 18:11:37 2022 +0100

    SOLR-16529 Upgrade jaeger-client to 1.8.1 (#1167)
---
 solr/CHANGES.txt                           | 2 ++
 solr/licenses/jaeger-core-1.6.0.jar.sha1   | 1 -
 solr/licenses/jaeger-core-1.8.1.jar.sha1   | 1 +
 solr/licenses/jaeger-thrift-1.6.0.jar.sha1 | 1 -
 solr/licenses/jaeger-thrift-1.8.1.jar.sha1 | 1 +
 solr/licenses/libthrift-0.14.1.jar.sha1    | 1 -
 solr/licenses/libthrift-0.15.0.jar.sha1    | 1 +
 versions.lock                              | 8 ++++----
 versions.props                             | 2 +-
 9 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 24f00702c7e..b78ac471f57 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -87,6 +87,8 @@ Other Changes
 
 * SOLR-15718: Remove backcompat feature solr.useUnsafeOverseerResponse (janhoy)
 
+* SOLR-16529: Upgrade jaeger-client to 1.8.1 (janhoy)
+
 ==================  9.1.0 ==================
 
 New Features
diff --git a/solr/licenses/jaeger-core-1.6.0.jar.sha1 b/solr/licenses/jaeger-core-1.6.0.jar.sha1
deleted file mode 100644
index d2549c9e5cb..00000000000
--- a/solr/licenses/jaeger-core-1.6.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-001c572eb0ab754577b5856c63a3771f85def25c
diff --git a/solr/licenses/jaeger-core-1.8.1.jar.sha1 b/solr/licenses/jaeger-core-1.8.1.jar.sha1
new file mode 100644
index 00000000000..fafc780c242
--- /dev/null
+++ b/solr/licenses/jaeger-core-1.8.1.jar.sha1
@@ -0,0 +1 @@
+66a39fb4b4905b489b76b4a5910f466995a6707c
diff --git a/solr/licenses/jaeger-thrift-1.6.0.jar.sha1 b/solr/licenses/jaeger-thrift-1.6.0.jar.sha1
deleted file mode 100644
index 3893ec289c7..00000000000
--- a/solr/licenses/jaeger-thrift-1.6.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2db813970bcc462fbf7c7fbd87a8adff0af54fe7
diff --git a/solr/licenses/jaeger-thrift-1.8.1.jar.sha1 b/solr/licenses/jaeger-thrift-1.8.1.jar.sha1
new file mode 100644
index 00000000000..0f4ddbdc600
--- /dev/null
+++ b/solr/licenses/jaeger-thrift-1.8.1.jar.sha1
@@ -0,0 +1 @@
+e173aec5576da317aa61e9e3be795d6bd1758fca
diff --git a/solr/licenses/libthrift-0.14.1.jar.sha1 b/solr/licenses/libthrift-0.14.1.jar.sha1
deleted file mode 100644
index 2797804d16b..00000000000
--- a/solr/licenses/libthrift-0.14.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-85348a0c44c298bbec5ae747e67ae12e60b3aef6
diff --git a/solr/licenses/libthrift-0.15.0.jar.sha1 b/solr/licenses/libthrift-0.15.0.jar.sha1
new file mode 100644
index 00000000000..52ee86c18d5
--- /dev/null
+++ b/solr/licenses/libthrift-0.15.0.jar.sha1
@@ -0,0 +1 @@
+33f61a6ad11e6df132c387be18559514197fcd4e
diff --git a/versions.lock b/versions.lock
index e534959d332..d1eefe96b85 100644
--- a/versions.lock
+++ b/versions.lock
@@ -33,7 +33,7 @@ com.google.cloud:google-cloud-bom:0.178.0 (1 constraints: 7205bc40)
 com.google.cloud:google-cloud-core:2.8.6 (3 constraints: cc2e39e1)
 com.google.cloud:google-cloud-core-http:2.8.6 (1 constraints: f40ff795)
 com.google.cloud:google-cloud-storage:2.11.3 (2 constraints: cf1cb826)
-com.google.code.gson:gson:2.9.1 (6 constraints: de586bc0)
+com.google.code.gson:gson:2.9.1 (6 constraints: d958afbf)
 com.google.errorprone:error_prone_annotations:2.15.0 (4 constraints: 8a38f11d)
 com.google.guava:failureaccess:1.0.1 (2 constraints: f9199e37)
 com.google.guava:guava:31.1-jre (19 constraints: 5d28985f)
@@ -82,8 +82,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.48.0 (2 constraints: 211d5126)
-io.jaegertracing:jaeger-core:1.6.0 (2 constraints: 6912c420)
-io.jaegertracing:jaeger-thrift:1.6.0 (1 constraints: 09050236)
+io.jaegertracing:jaeger-core:1.8.1 (2 constraints: 6f124721)
+io.jaegertracing:jaeger-thrift:1.8.1 (1 constraints: 0c050936)
 io.netty:netty-buffer:4.1.82.Final (7 constraints: 8d6e8724)
 io.netty:netty-codec:4.1.82.Final (2 constraints: 501a8147)
 io.netty:netty-common:4.1.82.Final (9 constraints: ff8727e1)
@@ -208,7 +208,7 @@ org.apache.sis.core:sis-referencing:1.2 (3 constraints: 4829fae1)
 org.apache.sis.core:sis-utility:1.2 (4 constraints: 0b35ce5b)
 org.apache.sis.storage:sis-netcdf:1.2 (1 constraints: fc0b54e9)
 org.apache.sis.storage:sis-storage:1.2 (1 constraints: df0de432)
-org.apache.thrift:libthrift:0.14.1 (1 constraints: 900d0134)
+org.apache.thrift:libthrift:0.15.0 (1 constraints: 900d0334)
 org.apache.tika:tika-core:1.28.4 (2 constraints: d6116711)
 org.apache.tika:tika-parsers:1.28.4 (1 constraints: 4105493b)
 org.apache.xmlbeans:xmlbeans:5.0.3 (2 constraints: 72173075)
diff --git a/versions.props b/versions.props
index 2a84dc35fb0..924e4ee0023 100644
--- a/versions.props
+++ b/versions.props
@@ -19,7 +19,7 @@ commons-codec:commons-codec=1.15
 commons-collections:commons-collections=3.2.2
 commons-io:commons-io=2.11.0
 io.dropwizard.metrics:*=4.1.5
-io.jaegertracing:*=1.6.0
+io.jaegertracing:*=1.8.1
 io.netty:*=4.1.82.Final
 io.opentracing:*=0.33.0
 io.prometheus:*=0.2.0