diff --git a/changelog/unreleased/PR#4300-update-org-apache-zookeeper-to-v3-9-5-branch-9x.yml b/changelog/unreleased/PR#4300-update-org-apache-zookeeper-to-v3-9-5-branch-9x.yml new file mode 100644 index 000000000000..e987f764d70e --- /dev/null +++ b/changelog/unreleased/PR#4300-update-org-apache-zookeeper-to-v3-9-5-branch-9x.yml @@ -0,0 +1,7 @@ +title: Update org.apache.zookeeper:* to v3.9.5 (branch_9x) +type: dependency_update +authors: +- name: solrbot +links: +- name: PR#4300 + url: https://github.com/apache/solr/pull/4300 diff --git a/solr/licenses/netty-tcnative-boringssl-static-2.0.73.Final.jar.sha1 b/solr/licenses/netty-tcnative-boringssl-static-2.0.73.Final.jar.sha1 deleted file mode 100644 index 0bea976dc344..000000000000 --- a/solr/licenses/netty-tcnative-boringssl-static-2.0.73.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -de7380a74a7611e9937dd2106abfde5b405dbd15 diff --git a/solr/licenses/netty-tcnative-boringssl-static-2.0.74.Final.jar.sha1 b/solr/licenses/netty-tcnative-boringssl-static-2.0.74.Final.jar.sha1 new file mode 100644 index 000000000000..c19d8959abd3 --- /dev/null +++ b/solr/licenses/netty-tcnative-boringssl-static-2.0.74.Final.jar.sha1 @@ -0,0 +1 @@ +536b68a3bdabab178c042402150309db00e8f54d diff --git a/solr/licenses/netty-tcnative-classes-2.0.73.Final.jar.sha1 b/solr/licenses/netty-tcnative-classes-2.0.73.Final.jar.sha1 deleted file mode 100644 index 048e8b91eba6..000000000000 --- a/solr/licenses/netty-tcnative-classes-2.0.73.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -f50d875a46e4a7768f35dbc26fb796fd791b8b09 diff --git a/solr/licenses/netty-tcnative-classes-2.0.74.Final.jar.sha1 b/solr/licenses/netty-tcnative-classes-2.0.74.Final.jar.sha1 new file mode 100644 index 000000000000..6b8889366709 --- /dev/null +++ b/solr/licenses/netty-tcnative-classes-2.0.74.Final.jar.sha1 @@ -0,0 +1 @@ +c3b2e6ac13230849355f7ecaaeb12668a22e9c0a diff --git a/solr/licenses/zookeeper-3.9.4-tests.jar.sha1 b/solr/licenses/zookeeper-3.9.4-tests.jar.sha1 deleted file mode 100644 index 6356f7db3e5b..000000000000 --- a/solr/licenses/zookeeper-3.9.4-tests.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c4afb93bf1bf14be5f46fdc6197c3a87253e12de diff --git a/solr/licenses/zookeeper-3.9.4.jar.sha1 b/solr/licenses/zookeeper-3.9.4.jar.sha1 deleted file mode 100644 index 5618c166ffe9..000000000000 --- a/solr/licenses/zookeeper-3.9.4.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -5ab49d76fcac9a33c255b0585bc1fc92e24166db diff --git a/solr/licenses/zookeeper-3.9.5-tests.jar.sha1 b/solr/licenses/zookeeper-3.9.5-tests.jar.sha1 new file mode 100644 index 000000000000..5207d70421ab --- /dev/null +++ b/solr/licenses/zookeeper-3.9.5-tests.jar.sha1 @@ -0,0 +1 @@ +95b919c8cdd6f580b5c2de6743ac55b299e26b98 diff --git a/solr/licenses/zookeeper-3.9.5.jar.sha1 b/solr/licenses/zookeeper-3.9.5.jar.sha1 new file mode 100644 index 000000000000..09c7438cb45e --- /dev/null +++ b/solr/licenses/zookeeper-3.9.5.jar.sha1 @@ -0,0 +1 @@ +4f091e2a604d7c6a818ac2a7169e3bad5a5441dc diff --git a/solr/licenses/zookeeper-jute-3.9.4.jar.sha1 b/solr/licenses/zookeeper-jute-3.9.4.jar.sha1 deleted file mode 100644 index 09804f247943..000000000000 --- a/solr/licenses/zookeeper-jute-3.9.4.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -db554b1c2b284a95274626126d9e1acb0e21ae4a diff --git a/solr/licenses/zookeeper-jute-3.9.5.jar.sha1 b/solr/licenses/zookeeper-jute-3.9.5.jar.sha1 new file mode 100644 index 000000000000..ea7258d056fb --- /dev/null +++ b/solr/licenses/zookeeper-jute-3.9.5.jar.sha1 @@ -0,0 +1 @@ +20135d3521579fd7382fed744f6b74241ecb5b73 diff --git a/versions.lock b/versions.lock index b99b5dd0c59d..985ca7efada9 100644 --- a/versions.lock +++ b/versions.lock @@ -122,14 +122,14 @@ io.netty:netty-codec-http:4.2.6.Final (4 constraints: 7e2ec1d0) io.netty:netty-codec-http2:4.2.6.Final (2 constraints: dd158907) io.netty:netty-codec-socks:4.2.6.Final (2 constraints: ac196ff4) io.netty:netty-common:4.2.6.Final (14 constraints: 9fcdf69f) -io.netty:netty-handler:4.2.6.Final (5 constraints: db4410c9) +io.netty:netty-handler:4.2.6.Final (5 constraints: d444e1c8) io.netty:netty-handler-proxy:4.2.6.Final (2 constraints: dd158907) io.netty:netty-resolver:4.2.6.Final (3 constraints: ba2429ff) -io.netty:netty-tcnative-boringssl-static:2.0.73.Final (2 constraints: cf1ad957) -io.netty:netty-tcnative-classes:2.0.73.Final (2 constraints: d21e0195) +io.netty:netty-tcnative-boringssl-static:2.0.74.Final (2 constraints: d31af557) +io.netty:netty-tcnative-classes:2.0.74.Final (2 constraints: d31e0895) io.netty:netty-transport:4.2.6.Final (11 constraints: 16a7be79) io.netty:netty-transport-classes-epoll:4.2.6.Final (2 constraints: 491d6c04) -io.netty:netty-transport-native-epoll:4.2.6.Final (2 constraints: d61a4e5f) +io.netty:netty-transport-native-epoll:4.2.6.Final (2 constraints: cf1a1f5f) io.netty:netty-transport-native-unix-common:4.2.6.Final (5 constraints: a647dc44) io.opencensus:opencensus-api:0.31.1 (5 constraints: 924d4692) io.opencensus:opencensus-contrib-http-util:0.31.1 (3 constraints: 7232a9fc) @@ -259,8 +259,8 @@ org.apache.tika:tika-core:3.2.3 (1 constraints: 0a050336) org.apache.tika:tika-langdetect-tika:3.2.3 (1 constraints: 0a050336) org.apache.tomcat:annotations-api:6.0.53 (1 constraints: 40054e3b) org.apache.xmlbeans:xmlbeans:5.3.0 (2 constraints: 72173c75) -org.apache.zookeeper:zookeeper:3.9.4 (3 constraints: a91e460b) -org.apache.zookeeper:zookeeper-jute:3.9.4 (2 constraints: a1120324) +org.apache.zookeeper:zookeeper:3.9.5 (3 constraints: aa1e950b) +org.apache.zookeeper:zookeeper-jute:3.9.5 (2 constraints: a3122c24) org.apiguardian:apiguardian-api:1.1.2 (2 constraints: 601bd5a8) org.bitbucket.b_c:jose4j:0.9.6 (2 constraints: 14106bd4) org.carrot2:carrot2-core:4.5.1 (1 constraints: 0c050f36) diff --git a/versions.props b/versions.props index b95645350ce2..15c8fde23674 100644 --- a/versions.props +++ b/versions.props @@ -61,7 +61,7 @@ org.apache.lucene:*=9.12.3 org.apache.poi:*=5.5.1 org.apache.tika:*=3.2.3 org.apache.tomcat:annotations-api=6.0.53 -org.apache.zookeeper:*=3.9.4 +org.apache.zookeeper:*=3.9.5 org.bitbucket.b_c:jose4j=0.9.6 org.bouncycastle:bcpkix-jdk18on=1.82 org.carrot2:carrot2-core=4.5.1