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

Fokko pushed a commit to branch dependabot/github_actions
in repository https://gitbox.apache.org/repos/asf/avro.git

commit 917258b629d5f3b11a824a0d93d1dcf07274ca8b
Merge: f7a679b4f9 a4972181af
Author: Fokko Driesprong <[email protected]>
AuthorDate: Mon Nov 9 20:01:06 2026 +0000

    Merge remote-tracking branch 'origin/main' into fix-4026
    
    # Conflicts:
    #       lang/java/pom.xml

 .github/workflows/asf-allowlist-check.yml          |   2 +-
 .github/workflows/deploy-docs.yml                  |   2 +-
 .github/workflows/test-lang-java.yml               |   2 +-
 .github/workflows/test-lang-js.yml                 |   2 +-
 .github/workflows/test-lang-py.yml                 |   4 +-
 doc/package-lock.json                              | 540 +++++++--------------
 doc/package.json                                   |   6 +-
 lang/c++/CMakeLists.txt                            |   1 +
 lang/c++/impl/BinaryDecoder.cc                     |  21 +-
 lang/c++/impl/BinaryEncoder.cc                     |  16 +-
 lang/c++/include/avro/Layout.hh                    |   2 +
 .../c++/include/avro/buffer/detail/BufferDetail.hh |   1 +
 lang/c++/test/CodecTests.cc                        |  71 +++
 lang/c++/test/LayoutTests.cc                       |  43 ++
 lang/csharp/versions.props                         |  14 +-
 lang/java/pom.xml                                  |  30 +-
 lang/js/package-lock.json                          | 247 +++++-----
 lang/py/pyproject.toml                             |   2 +-
 lang/py/uv.lock                                    | 122 ++---
 pom.xml                                            |  12 +-
 20 files changed, 537 insertions(+), 603 deletions(-)

diff --cc lang/java/pom.xml
index defee7ac96,aeebad1ea2..b7b2267bb6
--- a/lang/java/pom.xml
+++ b/lang/java/pom.xml
@@@ -50,22 -50,22 +50,22 @@@
      <jopt-simple.version>5.0.4</jopt-simple.version>
      <junit5.version>5.14.4</junit5.version>
      <maven-core.version>3.9.6</maven-core.version>
-     <mockito.version>5.23.0</mockito.version>
-     <netty.version>4.2.16.Final</netty.version>
-     <protobuf.version>4.35.1</protobuf.version>
-     <reload4j.version>1.2.26</reload4j.version>
+     <mockito.version>5.24.0</mockito.version>
+     <netty.version>4.2.20.Final</netty.version>
+     <protobuf.version>4.36.2</protobuf.version>
+     <reload4j.version>1.2.27</reload4j.version>
      <servlet-api.version>4.0.1</servlet-api.version>
-     <slf4j.version>2.0.18</slf4j.version>
-     <snappy.version>1.1.10.8</snappy.version>
+     <slf4j.version>2.0.20</slf4j.version>
+     <snappy.version>1.1.10.12</snappy.version>
 -    <thrift.version>0.20.0</thrift.version>
 +    <thrift.version>0.25.0</thrift.version>
      <tukaani.version>1.12</tukaani.version>
      <velocity.version>2.4.1</velocity.version>
-     <zstd-jni.version>1.5.7-12</zstd-jni.version>
+     <zstd-jni.version>1.5.7-25</zstd-jni.version>
      <!-- version properties for plugins -->
      <archetype-plugin.version>3.4.1</archetype-plugin.version>
-     <bundle-plugin-version>6.1.0</bundle-plugin-version>
-     <cyclonedx-maven-plugin.version>2.9.2</cyclonedx-maven-plugin.version>
-     <exec-plugin.version>3.6.3</exec-plugin.version>
+     <bundle-plugin-version>6.2.0</bundle-plugin-version>
+     <cyclonedx-maven-plugin.version>2.9.3</cyclonedx-maven-plugin.version>
+     <exec-plugin.version>3.6.4</exec-plugin.version>
      <file-management.version>3.2.0</file-management.version>
      <javacc-plugin.version>3.8.0</javacc-plugin.version>
      <javacc.version>7.0.13</javacc.version>

Reply via email to