Skip to content

SOLR-15324 Upgrade Jaeger dependency from 1.1.0 to 1.6.0 #268

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 25, 2021
Merged

SOLR-15324 Upgrade Jaeger dependency from 1.1.0 to 1.6.0 #268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a274549
SOLR-15324: Upgrade Jaeger dependency from 1.1.0 to 1.6.0 and thus al…
janhoy Aug 19, 2021
52a791e
Update SHA files
janhoy Aug 19, 2021
5ca0300
Exclude the two tomact deps (tests still pass)
janhoy Aug 19, 2021
42c613f
Update versions.lock
janhoy Aug 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions solr/CHANGES.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 2 additions & 0 deletions solr/contrib/jaegertracer-configurator/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
1 change: 0 additions & 1 deletion solr/licenses/jaeger-core-1.1.0.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/jaeger-core-1.6.0.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
001c572eb0ab754577b5856c63a3771f85def25c
1 change: 0 additions & 1 deletion solr/licenses/jaeger-thrift-1.1.0.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/jaeger-thrift-1.6.0.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2db813970bcc462fbf7c7fbd87a8adff0af54fe7
1 change: 0 additions & 1 deletion solr/licenses/libthrift-0.13.0.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/libthrift-0.14.1.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
85348a0c44c298bbec5ae747e67ae12e60b3aef6
8 changes: 4 additions & 4 deletions versions.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down