This is an automated email from the ASF dual-hosted git repository.

ddanielr pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git

commit 317c288568e9c46e7854aafb8bb8c4fda6260b12
Merge: f3da862fc0 5abb7fac8a
Author: Daniel Roberts ddanielr <[email protected]>
AuthorDate: Mon Aug 17 17:34:58 2026 +0000

    Merge branch '2.1'

 .../java/org/apache/accumulo/core/logging/EscalatingLoggerTest.java   | 4 ++--
 pom.xml                                                               | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --cc pom.xml
index 53cec4171c,331e4ddbca..cc43e3f245
--- a/pom.xml
+++ b/pom.xml
@@@ -170,12 -170,12 +170,12 @@@ under the License
      <version.bouncycastle>1.84</version.bouncycastle>
      <version.curator>5.8.0</version.curator>
      <version.errorprone>2.41.0</version.errorprone>
 -    <version.hadoop>3.3.6</version.hadoop>
 +    <version.flatbuffers>24.3.25</version.flatbuffers>
 +    <version.hadoop>3.5.0</version.hadoop>
-     <version.log4j>2.25.4</version.log4j>
+     <version.log4j>2.26.1</version.log4j>
 -    <version.opentelemetry>1.48.0</version.opentelemetry>
 -    <version.powermock>2.0.9</version.powermock>
 +    <version.opentelemetry>1.60.1</version.opentelemetry>
      <version.slf4j>2.0.17</version.slf4j>
 -    <version.thrift>0.17.0</version.thrift>
 +    <version.thrift>0.23.0</version.thrift>
      <version.zookeeper>3.9.5</version.zookeeper>
    </properties>
    <dependencyManagement>

Reply via email to