This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a commit to branch 2.1
in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/2.1 by this push:
new 704197f7d3 Update micrometer (#3223)
704197f7d3 is described below
commit 704197f7d38bdc9c2b151eac6a70a9efbc7d4045
Author: Christopher Tubbs <ctubb...@apache.org>
AuthorDate: Fri Mar 3 11:44:10 2023 -0500
Update micrometer (#3223)
* Converge netty transitive dependencies
---
core/pom.xml | 6 ------
pom.xml | 10 +++++++++-
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index ee75be936c..0280b5000c 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -130,12 +130,6 @@
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
- <exclusions>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
diff --git a/pom.xml b/pom.xml
index a68b9ff4c3..3f5a12f603 100644
--- a/pom.xml
+++ b/pom.xml
@@ -173,7 +173,15 @@
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-bom</artifactId>
- <version>1.9.5</version>
+ <version>1.9.8</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <!-- for dependency convergence between Micrometer and ZooKeeper -->
+ <groupId>io.netty</groupId>
+ <artifactId>netty-bom</artifactId>
+ <version>4.1.89.Final</version>
<type>pom</type>
<scope>import</scope>
</dependency>
