Merge branch '3.x' into tatu/3.1/514-avro-1.12.1

Author: cowtowncoder

.github/workflows/main.yml

@@ -18,7 +18,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java_version: ['17', '21', '23']
+        java_version: ['17', '21', '25']
         include:
           - java_version: '17'
             release_build: 'R'