SOLR-14312: SOLR-14296: Upgrade Zookeeper to 3.5.7, Update netty to 4.1.47

This commit is contained in:
erick 2020-03-15 14:37:14 -04:00
parent 73b618a55c
commit 6c1d992fad
24 changed files with 28 additions and 24 deletions

View File

@ -71,7 +71,7 @@ io.jaegertracing.version = 1.1.0
/io.jaegertracing/jaeger-core = ${io.jaegertracing.version}
/io.jaegertracing/jaeger-thrift = ${io.jaegertracing.version}
io.netty.netty.version = 4.1.29.Final
io.netty.netty.version = 4.1.47.Final
/io.netty/netty-buffer = ${io.netty.netty.version}
/io.netty/netty-codec = ${io.netty.netty.version}
/io.netty/netty-common = ${io.netty.netty.version}
@ -218,7 +218,7 @@ org.apache.velocity.tools.version = 3.0
/org.apache.xmlbeans/xmlbeans = 3.1.0
org.apache.zookeeper.version = 3.5.5
org.apache.zookeeper.version = 3.5.7
/org.apache.zookeeper/zookeeper = ${org.apache.zookeeper.version}
/org.apache.zookeeper/zookeeper-jute = ${org.apache.zookeeper.version}

View File

@ -69,6 +69,10 @@ Other Changes
* SOLR-14197: SolrResourceLoader: marked many methods as deprecated, and in some cases rerouted exiting logic to avoid
them. (David Smiley)
* SOLR-14312: Upgrade Zookeeper to 3.5.7 (Erick Erickson)
* SOLR-14296: Update netty to 4.1.46 (Andras Solaman via Erick Erickson)
================== 8.5.0 ==================
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.

View File

@ -1 +0,0 @@
c3809f72e4b535b343b7dfa3c0c8210dad2fa5ea

View File

@ -0,0 +1 @@
4aa485d17af675649f8f43aee3b0d1719b00e4ec

View File

@ -1 +0,0 @@
1651bc2e279216773c234cafe402d68d2a5adc90

View File

@ -0,0 +1 @@
405cee25864c723a0c0245cce0b8c7c13fd985cf

View File

@ -1 +0,0 @@
a5d6a735ed07d8f197daa48db7f097cfc971ee5e

View File

@ -0,0 +1 @@
dfb32c59232f5709381474ff1dd028b7eb17270a

View File

@ -1 +0,0 @@
1acf1d94799296a2517533ec75ce7e155e9c4ea7

View File

@ -0,0 +1 @@
21db930f1964dabb103b2553fe4cfb79a56a36d8

View File

@ -1 +0,0 @@
bbec1dc913732e4773893c14d795b15d6c1e878e

View File

@ -0,0 +1 @@
b625d412d1dcd19972475db2690ab4c1f4aebcc5

View File

@ -1 +0,0 @@
c190b90f70e2ae8a48c068afad709e8728fcaa39

View File

@ -0,0 +1 @@
8c2a50ad0b025bd735b865e678b8c4b12121d941

View File

@ -1 +0,0 @@
baca9c954b45c495c7caf328abfac49679d90ce8

View File

@ -0,0 +1 @@
e6962548e57ca315bc66749bb4964571ee1d605c

View File

@ -1 +0,0 @@
9c9f88ca57873b3c00489ae74fb80bb0cd02d986

View File

@ -0,0 +1 @@
711ba6202031d2296907bb82b15b42d5034ed029

View File

@ -1 +0,0 @@
dd9c924e9d4be7c79e46261691e96d030736a8ac

View File

@ -0,0 +1 @@
12bdf55ba8be7fc891996319d37f35eaad7e63ea

View File

@ -1 +0,0 @@
3785011a665bd5c7dedd025110543d967f17f8e3

View File

@ -0,0 +1 @@
1270f80b08904499a6839a2ee1800da687ad96b4

View File

@ -60,14 +60,14 @@ 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: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)
io.netty:netty-handler:4.1.29.Final (1 constraints: 5a076061)
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.netty:netty-buffer:4.1.47.Final (6 constraints: 29558e4c)
io.netty:netty-codec:4.1.47.Final (2 constraints: fc135b82)
io.netty:netty-common:4.1.47.Final (8 constraints: 9d6ed3cf)
io.netty:netty-handler:4.1.47.Final (2 constraints: 2f176f42)
io.netty:netty-resolver:4.1.47.Final (3 constraints: ad213fd0)
io.netty:netty-transport:4.1.47.Final (5 constraints: 7847722a)
io.netty:netty-transport-native-epoll:4.1.47.Final (2 constraints: 2f176f42)
io.netty:netty-transport-native-unix-common:4.1.47.Final (2 constraints: 081ad205)
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)
@ -139,8 +139,8 @@ org.apache.velocity.tools:velocity-tools-generic:3.0 (1 constraints: 00136415)
org.apache.velocity.tools:velocity-tools-view:3.0 (1 constraints: 7a14126a)
org.apache.velocity.tools:velocity-tools-view-jsp:3.0 (1 constraints: a704202c)
org.apache.xmlbeans:xmlbeans:3.1.0 (1 constraints: 0605fd35)
org.apache.zookeeper:zookeeper:3.5.5 (1 constraints: 0f050e36)
org.apache.zookeeper:zookeeper-jute:3.5.5 (1 constraints: 8d0d3928)
org.apache.zookeeper:zookeeper:3.5.7 (1 constraints: 11051036)
org.apache.zookeeper:zookeeper-jute:3.5.7 (1 constraints: 8f0d3b28)
org.asciidoctor:asciidoctorj:1.6.2 (1 constraints: 0b050436)
org.asciidoctor:asciidoctorj-api:1.6.2 (1 constraints: e30cfb0d)
org.aspectj:aspectjrt:1.8.0 (1 constraints: 0b050836)

View File

@ -34,7 +34,7 @@ commons-logging:commons-logging=1.1.3
de.l3s.boilerpipe:boilerpipe=1.1.0
io.dropwizard.metrics:*=4.1.2
io.jaegertracing:*=1.1.0
io.netty:*=4.1.29.Final
io.netty:*=4.1.47.Final
io.opentracing:*=0.33.0
io.prometheus:*=0.2.0
io.sgr:s2-geometry-library-java=1.0.0
@ -75,7 +75,7 @@ org.apache.poi:*=4.1.1
org.apache.tika:*=1.23
org.apache.velocity.tools:*=3.0
org.apache.xmlbeans:xmlbeans=3.1.0
org.apache.zookeeper:*=3.5.5
org.apache.zookeeper:*=3.5.7
org.asciidoctor:asciidoctorj=1.6.2
org.aspectj:aspectjrt=1.8.0
org.bitbucket.b_c:jose4j=0.6.5