You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by kr...@apache.org on 2022/09/21 11:50:56 UTC
[solr] 02/02: SOLR-16422: Upgrade Apache Zookeeper to 3.8.0 (#1031)
This is an automated email from the ASF dual-hosted git repository.
krisden pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
commit 856bbfe7c354eb4a57d0150d6b219861fcb4e528
Author: Kevin Risden <ri...@users.noreply.github.com>
AuthorDate: Wed Sep 21 07:46:34 2022 -0400
SOLR-16422: Upgrade Apache Zookeeper to 3.8.0 (#1031)
---
gradle/hacks/global-exclude-dependencies.gradle | 1 +
solr/CHANGES.txt | 2 +
solr/core/build.gradle | 5 +-
solr/licenses/netty-tcnative-2.0.48.Final.jar.sha1 | 1 +
solr/licenses/netty-tcnative-LICENSE-ASL.txt | 201 +++++++++++++++++++++
solr/licenses/netty-tcnative-NOTICE.txt | 51 ++++++
.../netty-tcnative-classes-2.0.48.Final.jar.sha1 | 1 +
solr/licenses/zookeeper-3.7.0-tests.jar.sha1 | 1 -
solr/licenses/zookeeper-3.7.0.jar.sha1 | 1 -
solr/licenses/zookeeper-3.8.0-tests.jar.sha1 | 1 +
solr/licenses/zookeeper-3.8.0.jar.sha1 | 1 +
solr/licenses/zookeeper-jute-3.7.0.jar.sha1 | 1 -
solr/licenses/zookeeper-jute-3.8.0.jar.sha1 | 1 +
solr/modules/hadoop-auth/build.gradle | 6 +-
solr/modules/hdfs/build.gradle | 4 +-
solr/modules/jwt-auth/build.gradle | 2 -
solr/prometheus-exporter/build.gradle | 5 +-
solr/solrj-zookeeper/build.gradle | 4 +-
solr/solrj/build.gradle | 6 +-
solr/test-framework/build.gradle | 2 -
versions.lock | 12 +-
versions.props | 2 +-
22 files changed, 285 insertions(+), 26 deletions(-)
diff --git a/gradle/hacks/global-exclude-dependencies.gradle b/gradle/hacks/global-exclude-dependencies.gradle
index 9a437b8e586..dbe11a68831 100644
--- a/gradle/hacks/global-exclude-dependencies.gradle
+++ b/gradle/hacks/global-exclude-dependencies.gradle
@@ -40,6 +40,7 @@ allprojects { prj ->
]
configurations.matching { it.name in configNames }.all {
exclude group: 'log4j', module: 'log4j' // use SLF4j
+ exclude group: "ch.qos.logback" // use SLF4j
exclude group: 'commons-logging', module: 'commons-logging' // use SLF4j
exclude group: 'com.google.code.findbugs', module: 'jsr305' // Uses GPL license
exclude group: 'com.google.code.findbugs', module: 'annotations' // Use Spotbugs Annotations as replacement
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 77850a30c50..29fed70bbf8 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -188,6 +188,8 @@ Other Changes
* SOLR-16421: Upgrade Apache Calcite to 1.32.0 and Avatica to 1.22.0 (Kevin Risden)
+* SOLR-16422: Upgrade Apache Zookeeper to 3.8.0 (Kevin Risden)
+
Build
---------------------
* SOLR-16204: Change Lucene dependency to Lucene 9.1.0 (Elia Porciani via Alessandro Benedetti)
diff --git a/solr/core/build.gradle b/solr/core/build.gradle
index b485ba69195..df7fd21903d 100644
--- a/solr/core/build.gradle
+++ b/solr/core/build.gradle
@@ -131,13 +131,12 @@ dependencies {
// ZooKeeper
implementation('org.apache.zookeeper:zookeeper', {
exclude group: "org.apache.yetus", module: "audience-annotations"
- exclude group: "log4j", module: "log4j"
- exclude group: "org.slf4j", module: "slf4j-log4j12"
})
- implementation ('org.apache.zookeeper:zookeeper-jute') {
+ implementation('org.apache.zookeeper:zookeeper-jute') {
exclude group: 'org.apache.yetus', module: 'audience-annotations'
}
testImplementation 'org.apache.zookeeper:zookeeper::tests'
+
// required for instantiating a Zookeeper server (for embedding ZK or running tests)
runtimeOnly ('org.xerial.snappy:snappy-java')
diff --git a/solr/licenses/netty-tcnative-2.0.48.Final.jar.sha1 b/solr/licenses/netty-tcnative-2.0.48.Final.jar.sha1
new file mode 100644
index 00000000000..0144fc9d3b1
--- /dev/null
+++ b/solr/licenses/netty-tcnative-2.0.48.Final.jar.sha1
@@ -0,0 +1 @@
+83fb2aa2c4e1e5998aa67084581772ccc2f0156e
diff --git a/solr/licenses/netty-tcnative-LICENSE-ASL.txt b/solr/licenses/netty-tcnative-LICENSE-ASL.txt
new file mode 100644
index 00000000000..261eeb9e9f8
--- /dev/null
+++ b/solr/licenses/netty-tcnative-LICENSE-ASL.txt
@@ -0,0 +1,201 @@
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
diff --git a/solr/licenses/netty-tcnative-NOTICE.txt b/solr/licenses/netty-tcnative-NOTICE.txt
new file mode 100644
index 00000000000..23dcbe30164
--- /dev/null
+++ b/solr/licenses/netty-tcnative-NOTICE.txt
@@ -0,0 +1,51 @@
+ The Netty Project
+ =================
+
+Please visit the Netty web site for more information:
+
+ * http://netty.io/
+
+Copyright 2016 The Netty Project
+
+The Netty Project licenses this file to you under the Apache License,
+version 2.0 (the "License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at:
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+License for the specific language governing permissions and limitations
+under the License.
+
+-------------------------------------------------------------------------------
+This product contains a forked and modified version of Tomcat Native
+
+ * LICENSE:
+ * license/LICENSE.tomcat-native.txt (Apache License 2.0)
+ * HOMEPAGE:
+ * http://tomcat.apache.org/native-doc/
+ * https://svn.apache.org/repos/asf/tomcat/native/
+
+This product contains the Maven wrapper scripts from 'Maven Wrapper', that provides an easy way to ensure a user has everything necessary to run the Maven build.
+
+ * LICENSE:
+ * license/LICENSE.mvn-wrapper.txt (Apache License 2.0)
+ * HOMEPAGE:
+ * https://github.com/takari/maven-wrapper
+
+This product contains small piece of code to support AIX, taken from netbsd.
+
+ * LICENSE:
+ * license/LICENSE.aix-netbsd.txt (OpenSSL License)
+ * HOMEPAGE:
+ * https://ftp.netbsd.org/pub/NetBSD/NetBSD-current/src/crypto/external/bsd/openssl/dist
+
+
+This product contains code from boringssl.
+
+ * LICENSE (Combination ISC and OpenSSL license)
+ * license/LICENSE.boringssl.txt (Combination ISC and OpenSSL license)
+ * HOMEPAGE:
+ * https://boringssl.googlesource.com/boringssl/
diff --git a/solr/licenses/netty-tcnative-classes-2.0.48.Final.jar.sha1 b/solr/licenses/netty-tcnative-classes-2.0.48.Final.jar.sha1
new file mode 100644
index 00000000000..a489458e8b3
--- /dev/null
+++ b/solr/licenses/netty-tcnative-classes-2.0.48.Final.jar.sha1
@@ -0,0 +1 @@
+9f62346df2f103045cad6f9416e2925a32ee8709
diff --git a/solr/licenses/zookeeper-3.7.0-tests.jar.sha1 b/solr/licenses/zookeeper-3.7.0-tests.jar.sha1
deleted file mode 100644
index ec7eff71132..00000000000
--- a/solr/licenses/zookeeper-3.7.0-tests.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-093f2c34c33ee16f9ff3f9352c79eafd3cd9040a
diff --git a/solr/licenses/zookeeper-3.7.0.jar.sha1 b/solr/licenses/zookeeper-3.7.0.jar.sha1
deleted file mode 100644
index eaac8f2b7f8..00000000000
--- a/solr/licenses/zookeeper-3.7.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1360048c7ca057df627b7267ff7360870e987ab0
diff --git a/solr/licenses/zookeeper-3.8.0-tests.jar.sha1 b/solr/licenses/zookeeper-3.8.0-tests.jar.sha1
new file mode 100644
index 00000000000..4e39b40f3b9
--- /dev/null
+++ b/solr/licenses/zookeeper-3.8.0-tests.jar.sha1
@@ -0,0 +1 @@
+9b78a289a3aa34eb47fac8c432f664fc140387df
diff --git a/solr/licenses/zookeeper-3.8.0.jar.sha1 b/solr/licenses/zookeeper-3.8.0.jar.sha1
new file mode 100644
index 00000000000..543d84714c7
--- /dev/null
+++ b/solr/licenses/zookeeper-3.8.0.jar.sha1
@@ -0,0 +1 @@
+e395c1d8a71557b7569cc6a83487b2e30e2e58fe
diff --git a/solr/licenses/zookeeper-jute-3.7.0.jar.sha1 b/solr/licenses/zookeeper-jute-3.7.0.jar.sha1
deleted file mode 100644
index 3a713693c67..00000000000
--- a/solr/licenses/zookeeper-jute-3.7.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-502176b97601e187a77936378ec52f554d386d0f
diff --git a/solr/licenses/zookeeper-jute-3.8.0.jar.sha1 b/solr/licenses/zookeeper-jute-3.8.0.jar.sha1
new file mode 100644
index 00000000000..9b2e89a2aa1
--- /dev/null
+++ b/solr/licenses/zookeeper-jute-3.8.0.jar.sha1
@@ -0,0 +1 @@
+6560f966bcf1aa78d27bcfa75fb6c4463a72c6c5
diff --git a/solr/modules/hadoop-auth/build.gradle b/solr/modules/hadoop-auth/build.gradle
index c025857c4f0..3f614e8bc8b 100644
--- a/solr/modules/hadoop-auth/build.gradle
+++ b/solr/modules/hadoop-auth/build.gradle
@@ -49,8 +49,6 @@ dependencies {
// ZooKeeper & Curator
implementation('org.apache.zookeeper:zookeeper', {
exclude group: "org.apache.yetus", module: "audience-annotations"
- exclude group: "log4j", module: "log4j"
- exclude group: "org.slf4j", module: "slf4j-log4j12"
})
implementation ('org.apache.zookeeper:zookeeper-jute') {
exclude group: 'org.apache.yetus', module: 'audience-annotations'
@@ -100,7 +98,9 @@ dependencies {
})
// Zookeeper dependency - some tests like HdfsCloudBackupRestore need this
- testImplementation 'org.apache.zookeeper:zookeeper'
+ testImplementation('org.apache.zookeeper:zookeeper', {
+ exclude group: "org.apache.yetus", module: "audience-annotations"
+ })
// required for instantiating a Zookeeper server in tests or embedded
runtimeOnly ('org.xerial.snappy:snappy-java')
}
diff --git a/solr/modules/hdfs/build.gradle b/solr/modules/hdfs/build.gradle
index 29467b7d27b..8431c81b07e 100644
--- a/solr/modules/hdfs/build.gradle
+++ b/solr/modules/hdfs/build.gradle
@@ -65,7 +65,9 @@ dependencies {
// Zookeeper dependency - some tests like HdfsCloudBackupRestore need this
permitTestUnusedDeclared 'org.apache.zookeeper:zookeeper'
- testImplementation 'org.apache.zookeeper:zookeeper'
+ testImplementation('org.apache.zookeeper:zookeeper', {
+ exclude group: "org.apache.yetus", module: "audience-annotations"
+ })
// required for instantiating a Zookeeper server in tests or embedded
testRuntimeOnly 'org.xerial.snappy:snappy-java'
}
diff --git a/solr/modules/jwt-auth/build.gradle b/solr/modules/jwt-auth/build.gradle
index 92fae20b085..280b1f60bb1 100644
--- a/solr/modules/jwt-auth/build.gradle
+++ b/solr/modules/jwt-auth/build.gradle
@@ -52,9 +52,7 @@ dependencies {
exclude group: "net.bytebuddy", module: "byte-buddy-agent"
})
testImplementation('no.nav.security:mock-oauth2-server', {
- exclude group: "ch.qos.logback", module: "logback-core"
exclude group: "io.netty", module: "netty-all"
- exclude group: "ch.qos.logback", module: "logback-classic"
})
// required by mock-oauth2-server
testImplementation 'com.fasterxml.jackson.core:jackson-databind'
diff --git a/solr/prometheus-exporter/build.gradle b/solr/prometheus-exporter/build.gradle
index 4a91969e4a9..1d6e69c3529 100644
--- a/solr/prometheus-exporter/build.gradle
+++ b/solr/prometheus-exporter/build.gradle
@@ -22,7 +22,10 @@ description = 'Prometheus exporter for exposing metrics from Solr using Metrics
dependencies {
implementation project(':solr:solrj')
- implementation('org.apache.zookeeper:zookeeper') { transitive = false } // ideally remove ZK dep
+ // ideally remove ZK dep
+ implementation('org.apache.zookeeper:zookeeper', {
+ exclude group: "org.apache.yetus", module: "audience-annotations"
+ })
implementation ('io.prometheus:simpleclient')
implementation ('io.prometheus:simpleclient_httpserver')
diff --git a/solr/solrj-zookeeper/build.gradle b/solr/solrj-zookeeper/build.gradle
index 21d23a809cc..024a702f3f1 100644
--- a/solr/solrj-zookeeper/build.gradle
+++ b/solr/solrj-zookeeper/build.gradle
@@ -39,8 +39,6 @@ dependencies {
implementation('org.apache.zookeeper:zookeeper', {
exclude group: "org.apache.yetus", module: "audience-annotations"
- exclude group: "log4j", module: "log4j"
- exclude group: "org.slf4j", module: "slf4j-log4j12"
})
implementation ('org.apache.zookeeper:zookeeper-jute') {
exclude group: 'org.apache.yetus', module: 'audience-annotations'
@@ -54,4 +52,4 @@ dependencies {
testImplementation 'com.google.guava:guava'
permitTestUsedUndeclared project(':solr:solrj-zookeeper') // duh!
-}
\ No newline at end of file
+}
diff --git a/solr/solrj/build.gradle b/solr/solrj/build.gradle
index b733ad97c34..26ff8724501 100644
--- a/solr/solrj/build.gradle
+++ b/solr/solrj/build.gradle
@@ -51,9 +51,11 @@ dependencies {
// ideally ZK centric tests move to solrj-zookeeper but sometimes we depend on ZK here anyway
testImplementation project(':solr:solrj-zookeeper')
- testImplementation 'org.apache.zookeeper:zookeeper'
- testImplementation 'org.apache.zookeeper:zookeeper-jute'
+ testImplementation('org.apache.zookeeper:zookeeper', {
+ exclude group: "org.apache.yetus", module: "audience-annotations"
+ })
permitTestUnusedDeclared 'org.apache.zookeeper:zookeeper'
+ testImplementation 'org.apache.zookeeper:zookeeper-jute'
testImplementation 'org.apache.lucene:lucene-core'
testImplementation 'org.apache.lucene:lucene-test-framework'
diff --git a/solr/test-framework/build.gradle b/solr/test-framework/build.gradle
index c9d5294ce8a..76a182e37a1 100644
--- a/solr/test-framework/build.gradle
+++ b/solr/test-framework/build.gradle
@@ -42,8 +42,6 @@ dependencies {
var zkExcludes = {
exclude group: "org.apache.yetus", module: "audience-annotations"
- exclude group: "log4j", module: "log4j"
- exclude group: "org.slf4j", module: "slf4j-log4j12"
}
implementation('org.apache.zookeeper:zookeeper', zkExcludes)
diff --git a/versions.lock b/versions.lock
index 360c6fe9cfa..50daa2a73ff 100644
--- a/versions.lock
+++ b/versions.lock
@@ -67,7 +67,7 @@ com.zaxxer:SparseBitSet:1.2 (1 constraints: 0d081e75)
commons-cli:commons-cli:1.4 (1 constraints: a9041e2c)
commons-codec:commons-codec:1.15 (8 constraints: bd67e40b)
commons-collections:commons-collections:3.2.2 (1 constraints: 09050236)
-commons-io:commons-io:2.11.0 (8 constraints: ea57002a)
+commons-io:commons-io:2.11.0 (9 constraints: 9d65151d)
de.l3s.boilerpipe:boilerpipe:1.1.0 (1 constraints: 590ce401)
edu.ucar:cdm:4.5.5 (3 constraints: 9d1abd7d)
edu.ucar:grib:4.5.5 (1 constraints: 650c0402)
@@ -86,11 +86,13 @@ io.jaegertracing:jaeger-thrift:1.6.0 (1 constraints: 09050236)
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)
-io.netty:netty-handler:4.1.82.Final (2 constraints: 891d643a)
+io.netty:netty-handler:4.1.82.Final (2 constraints: 851d4a3a)
io.netty:netty-resolver:4.1.82.Final (2 constraints: 521a7331)
+io.netty:netty-tcnative:2.0.48.Final (1 constraints: d60fe48e)
+io.netty:netty-tcnative-classes:2.0.48.Final (1 constraints: 210d451b)
io.netty:netty-transport:4.1.82.Final (6 constraints: dd608a22)
io.netty:netty-transport-classes-epoll:4.1.82.Final (1 constraints: ae12e21e)
-io.netty:netty-transport-native-epoll:4.1.82.Final (1 constraints: db0f158f)
+io.netty:netty-transport-native-epoll:4.1.82.Final (1 constraints: d70ffb8e)
io.netty:netty-transport-native-unix-common:4.1.82.Final (3 constraints: 6332e497)
io.opencensus:opencensus-api:0.31.1 (5 constraints: 974d3996)
io.opencensus:opencensus-contrib-http-util:0.31.1 (3 constraints: 7232a9fc)
@@ -205,8 +207,8 @@ org.apache.thrift:libthrift:0.14.1 (1 constraints: 900d0134)
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)
-org.apache.zookeeper:zookeeper:3.7.0 (2 constraints: 9e13f45e)
-org.apache.zookeeper:zookeeper-jute:3.7.0 (2 constraints: 95120523)
+org.apache.zookeeper:zookeeper:3.8.0 (2 constraints: 9f13215f)
+org.apache.zookeeper:zookeeper-jute:3.8.0 (2 constraints: 97123223)
org.apiguardian:apiguardian-api:1.1.2 (2 constraints: 601bd5a8)
org.bitbucket.b_c:jose4j:0.7.9 (1 constraints: 12050936)
org.bouncycastle:bcmail-jdk15on:1.70 (1 constraints: 310c8af5)
diff --git a/versions.props b/versions.props
index 0e2e3a0d5c6..23498efabca 100644
--- a/versions.props
+++ b/versions.props
@@ -51,7 +51,7 @@ org.apache.logging.log4j:*=2.17.2
org.apache.lucene:*=9.3.0
org.apache.opennlp:opennlp-tools=1.9.4
org.apache.tika:*=1.28.4
-org.apache.zookeeper:*=3.7.0
+org.apache.zookeeper:*=3.8.0
org.bitbucket.b_c:jose4j=0.7.9
org.carrot2:carrot2-core=4.4.3
org.codehaus.woodstox:stax2-api=4.2.1