AVRO-3666: Merge branch 'main' into AVRO-3666-use-schema-parser

apache · Jan 23, 2024 · 41806c6 · 41806c6
2 parents 838eb0d + 328136a
commit 41806c6
Show file tree

Hide file tree

Showing 18 changed files with 42 additions and 42 deletions.
diff --git a/.github/workflows/java-publish-snapshot.yml b/.github/workflows/java-publish-snapshot.yml
@@ -40,7 +40,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Cache Local Maven Repository
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

diff --git a/.github/workflows/maven4.yml b/.github/workflows/maven4.yml
@@ -35,15 +35,15 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Cache Local Maven Repository
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
           restore-keys: |
             ${{ runner.os }}-maven-
 
       - name: Cache Maven 4 Build Cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2/build-cache
           key: ${{ runner.os }}-maven-build-cache-${{ hashFiles('**/pom.xml') }}

diff --git a/.github/workflows/rat.yml b/.github/workflows/rat.yml
@@ -32,7 +32,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Cache Local Maven Repository
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

diff --git a/.github/workflows/spotless.yml b/.github/workflows/spotless.yml
@@ -35,7 +35,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Cache Local Maven Repository
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

diff --git a/.github/workflows/test-lang-c.yml b/.github/workflows/test-lang-c.yml
@@ -48,7 +48,7 @@ jobs:
         run: ./build.sh test
 
       - name: Cache Local Maven Repository
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -87,7 +87,7 @@ jobs:
                                                             libzstd-dev
 
       - name: Cache Local Maven Repository
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

diff --git a/.github/workflows/test-lang-csharp.yml b/.github/workflows/test-lang-csharp.yml
@@ -52,7 +52,7 @@ jobs:
             7.0.x
             8.0.x
 
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: ~/.nuget/packages
           key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
@@ -85,7 +85,7 @@ jobs:
             8.0.x
 
       - name: Cache Local Maven Repository
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -119,7 +119,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Cache Nuget
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.nuget/packages
           key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}

diff --git a/.github/workflows/test-lang-java.yml b/.github/workflows/test-lang-java.yml
@@ -49,7 +49,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Cache Local Maven Repository
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -83,7 +83,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Cache Local Maven Repository
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -164,7 +164,7 @@ jobs:
           java-version: 11
 
       - name: Cache Local Maven Repository
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

diff --git a/.github/workflows/test-lang-js.yml b/.github/workflows/test-lang-js.yml
@@ -49,7 +49,7 @@ jobs:
         with:
           node-version: ${{ matrix.node }}
 
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: ~/.npm
           key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
@@ -78,7 +78,7 @@ jobs:
         with:
           node-version: ${{ matrix.node }}
 
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: ~/.npm
           key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
@@ -122,7 +122,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Cache Npm
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.npm
           key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}

diff --git a/.github/workflows/test-lang-perl.yml b/.github/workflows/test-lang-perl.yml
@@ -116,7 +116,7 @@ jobs:
                                                        inc::Module::Install
 
       - name: Cache Local Maven Repository
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

diff --git a/.github/workflows/test-lang-php.yml b/.github/workflows/test-lang-php.yml
@@ -56,7 +56,7 @@ jobs:
         id: composer-cache
         run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -89,7 +89,7 @@ jobs:
           tools: composer:2.2.5
 
       - name: Cache Local Maven Repository
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

diff --git a/.github/workflows/test-lang-py.yml b/.github/workflows/test-lang-py.yml
@@ -120,7 +120,7 @@ jobs:
           python3 -m pip install python-snappy zstandard
 
       - name: Cache Local Maven Repository
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

diff --git a/.github/workflows/test-lang-ruby.yml b/.github/workflows/test-lang-ruby.yml
@@ -54,7 +54,7 @@ jobs:
       - name: Install Dependencies
         run: sudo apt-get install -qqy libsnappy-dev
 
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: .gem
           key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
@@ -95,7 +95,7 @@ jobs:
       - name: Install Dependencies
         run: sudo apt-get install -qqy libsnappy-dev
 
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: .gem
           key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
@@ -106,7 +106,7 @@ jobs:
         run: bundle config path .gem
 
       - name: Cache Local Maven Repository
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -152,7 +152,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Cache gems
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: .gem
           key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}

diff --git a/.github/workflows/test-lang-rust-audit.yml b/.github/workflows/test-lang-rust-audit.yml
@@ -49,7 +49,7 @@ jobs:
         uses: actions/checkout@v4
       - name: Dependency Review
         if: github.event_name == 'pull_request'
-        uses: actions/dependency-review-action@v3
+        uses: actions/dependency-review-action@v4
       - name: Install Cargo Audit
         run: cargo install cargo-audit
       - name: Audit

diff --git a/.github/workflows/test-lang-rust-ci.yml b/.github/workflows/test-lang-rust-ci.yml
@@ -60,14 +60,14 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Cache Cargo
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           # these represent dependencies downloaded by cargo
           # and thus do not depend on the OS, arch nor rust version.
           path: ~/.cargo
           key: ${{ runner.os }}-target-cache1-${{ hashFiles('**/Cargo.lock') }}
       - name: Cache Rust dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           # these represent compiled steps of both dependencies and avro
           # and thus are specific for a particular OS, arch and rust version.
@@ -83,7 +83,7 @@ jobs:
 
       - name: Cache cargo-rdme
         if: matrix.rust == 'stable' && matrix.target == 'x86_64-unknown-linux-gnu'
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.cargo-${{ matrix.rust }}/cargo-rdme
           key: cargo-rdme-
@@ -130,22 +130,22 @@ jobs:
           toolchain: stable
 
       - name: Cache Cargo
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           # these represent dependencies downloaded by cargo
           # and thus do not depend on the OS, arch nor rust version.
           path: ~/.cargo
           key: ${{ runner.os }}-target-cache1-${{ hashFiles('**/Cargo.lock') }}
       - name: Cache Rust dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           # these represent compiled steps of both dependencies and avro
           # and thus are specific for a particular OS, arch and rust version.
           path: lang/rust/target
           key: ${{ runner.os }}-target-cache1-stable-${{ hashFiles('**/Cargo.lock') }}
 
       - name: Cache Local Maven Repository
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -215,15 +215,15 @@ jobs:
           targets: wasm32-unknown-unknown
 
       - name: Cache Cargo
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           # these represent dependencies downloaded by cargo
           # and thus do not depend on the OS, arch nor rust version.
           path: ~/.cargo
           key: ${{ runner.os }}-target-cache1-${{ hashFiles('**/Cargo.lock') }}
 
       - name: Cache Rust dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           # these represent compiled steps of both dependencies and avro
           # and thus are specific for a particular OS, arch and rust version.
@@ -248,15 +248,15 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Cache Cargo
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           # these represent dependencies downloaded by cargo
           # and thus do not depend on the OS, arch nor rust version.
           path: ~/.cargo
           key: ${{ runner.os }}-target-arm64-${{ hashFiles('**/Cargo.lock') }}
 
       - name: Cache Rust dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           # these represent compiled steps of both dependencies and avro
           # and thus are specific for a particular OS, arch and rust version.

diff --git a/lang/java/pom.xml b/lang/java/pom.xml
@@ -51,7 +51,7 @@
     <junit5.version>5.10.1</junit5.version>
     <maven-core.version>3.3.9</maven-core.version>
     <mockito.version>4.11.0</mockito.version>
-    <netty.version>4.1.104.Final</netty.version>
+    <netty.version>4.1.106.Final</netty.version>
     <protobuf.version>3.25.2</protobuf.version>
     <reload4j.version>1.2.25</reload4j.version>
     <servlet-api.version>4.0.1</servlet-api.version>

diff --git a/lang/rust/Cargo.lock b/lang/rust/Cargo.lock
diff --git a/lang/rust/avro/Cargo.toml b/lang/rust/avro/Cargo.toml
@@ -70,7 +70,7 @@ strum = { default-features = false, version = "0.25.0" }
 strum_macros = { default-features = false, version = "0.25.3" }
 thiserror = { default-features = false, version = "1.0.56" }
 typed-builder = { default-features = false, version = "0.18.1" }
-uuid = { default-features = false, version = "1.6.1", features = ["serde", "std"] }
+uuid = { default-features = false, version = "1.7.0", features = ["serde", "std"] }
 xz2 = { default-features = false, version = "0.1.7", optional = true }
 zstd = { default-features = false, version = "0.13.0", optional = true }
 

diff --git a/lang/rust/avro_derive/Cargo.toml b/lang/rust/avro_derive/Cargo.toml
@@ -34,7 +34,7 @@ proc-macro = true
 
 [dependencies]
 darling = { default-features = false, version = "0.20.3" }
-proc-macro2 = { default-features = false, version = "1.0.76" }
+proc-macro2 = { default-features = false, version = "1.0.78" }
 quote = { default-features = false, version = "1.0.35" }
 serde_json = { workspace = true }
 syn = { default-features = false, version = "2.0.48", features = ["full", "fold"] }