AVRO-3641: Merge with master

apache · Sep 25, 2023 · e513365 · e513365
2 parents 592b8ee + bfc19ad
commit e513365
Show file tree

Hide file tree

Showing 356 changed files with 20,452 additions and 3,886 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -1,42 +1,36 @@
 {
     "name": "Avro Development",
-
-    "build": { "dockerfile": "../share/docker/Dockerfile" },
-
-    // Use 'settings' to set *default* container specific settings.json values on container create.
-    // You can edit these settings after create using File > Preferences > Settings > Remote.
-    "settings": {
+    "build": {
+        "dockerfile": "../share/docker/Dockerfile",
+        "context": ".."
     },
-
-    // Add the IDs of extensions you want installed when the container is created in the array below.
-    "extensions": [
-        // Python
-        "ms-python.python",
-        "ms-python.vscode-pylance",
-
-         // C/C++
-        "ms-vscode.cpptools",
-
-        // C#
-        "ms-dotnettools.csharp",
-
-        // Rust
-        "vadimcn.vscode-lldb",
-        "mutantdino.resourcemonitor",
-        "matklad.rust-analyzer",
-        "tamasfe.even-better-toml",
-        "serayuzgur.crates",
-
-        // Java
-        "vscjava.vscode-java-pack",
-
-        // Shell script
-        "timonwong.shellcheck",
-
-        // YAML
-        "redhat.vscode-yaml",
-
-        // Git
-        "eamodio.gitlens"
-    ]
+    "customizations": {
+        "vscode": {
+            "settings": {
+            },
+            "extensions": [
+                // Python
+                "ms-python.python",
+                "ms-python.vscode-pylance",
+                // C/C++
+                "ms-vscode.cpptools",
+                // C#
+                "ms-dotnettools.csharp",
+                // Rust
+                "vadimcn.vscode-lldb",
+                "mutantdino.resourcemonitor",
+                "matklad.rust-analyzer",
+                "tamasfe.even-better-toml",
+                "serayuzgur.crates",
+                // Java
+                "vscjava.vscode-java-pack",
+                // Shell script
+                "timonwong.shellcheck",
+                // YAML
+                "redhat.vscode-yaml",
+                // Git
+                "eamodio.gitlens"
+            ]
+        }
+    }
 }
diff --git a/.editorconfig b/.editorconfig
@@ -25,6 +25,21 @@ indent_style = space
 indent_size = 2
 trim_trailing_whitespace=true
 
+ij_continuation_indent_size = 4
+ij_java_wrap_comments = true
+ij_any_indent_case_from_switch = false
+
+[*.{avsc,avpr,avdl}]
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace=true
+
+ij_continuation_indent_size = 4
+ij_json_space_after_colon = true
+ij_json_space_before_colon = true
+ij_json_spaces_within_brackets = true
+ij_any_array_initializer_wrap = off
+
 [*.{ps1}]
 indent_style = space
 indent_size = 4

diff --git a/.github/workflows/codeql-csharp-analysis.yml b/.github/workflows/codeql-csharp-analysis.yml
@@ -53,7 +53,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         # We must fetch at least the immediate parents so that if this is
         # a pull request then we can checkout the head.

diff --git a/.github/workflows/codeql-java-analysis.yml b/.github/workflows/codeql-java-analysis.yml
@@ -53,7 +53,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         # We must fetch at least the immediate parents so that if this is
         # a pull request then we can checkout the head.

diff --git a/.github/workflows/codeql-js-analysis.yml b/.github/workflows/codeql-js-analysis.yml
@@ -53,7 +53,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         # We must fetch at least the immediate parents so that if this is
         # a pull request then we can checkout the head.

diff --git a/.github/workflows/codeql-py-analysis.yml b/.github/workflows/codeql-py-analysis.yml
@@ -53,7 +53,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         # We must fetch at least the immediate parents so that if this is
         # a pull request then we can checkout the head.

diff --git a/.github/workflows/java-publish-snapshot.yml b/.github/workflows/java-publish-snapshot.yml
@@ -37,7 +37,7 @@ jobs:
   publish-snapshot:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Cache Local Maven Repository
         uses: actions/cache@v3

diff --git a/.github/workflows/maven4.yml b/.github/workflows/maven4.yml
@@ -32,7 +32,7 @@ jobs:
   maven4:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Cache Local Maven Repository
         uses: actions/cache@v3

diff --git a/.github/workflows/rat.yml b/.github/workflows/rat.yml
@@ -29,7 +29,7 @@ jobs:
   rat:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Cache Local Maven Repository
         uses: actions/cache@v3

diff --git a/.github/workflows/spotless.yml b/.github/workflows/spotless.yml
@@ -32,7 +32,7 @@ jobs:
   spotless:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Cache Local Maven Repository
         uses: actions/cache@v3

diff --git a/.github/workflows/test-lang-c++.yml b/.github/workflows/test-lang-c++.yml
@@ -36,7 +36,7 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Install Dependencies
         run: sudo apt update && sudo apt-get install -qqy cppcheck libboost-all-dev libsnappy-dev cmake

diff --git a/.github/workflows/test-lang-c.yml b/.github/workflows/test-lang-c.yml
@@ -36,7 +36,7 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Install Dependencies
         run: sudo apt-get install -qqy libjansson-dev libsnappy-dev
@@ -76,7 +76,7 @@ jobs:
   interop:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Install Dependencies
         run: |

diff --git a/.github/workflows/test-lang-csharp.yml b/.github/workflows/test-lang-csharp.yml
@@ -36,7 +36,7 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Add libzstd
         shell: bash
@@ -67,7 +67,7 @@ jobs:
   interop:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Add libzstd
         shell: bash

diff --git a/.github/workflows/test-lang-java.yml b/.github/workflows/test-lang-java.yml
@@ -43,9 +43,9 @@ jobs:
         - '8'
         - '11'
         - '17'
-        - '19'
+        - '21-ea'
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Cache Local Maven Repository
         uses: actions/cache@v3
@@ -56,20 +56,11 @@ jobs:
             ${{ runner.os }}-maven-
 
       - name: Setup Temurin JDK
-        if: matrix.java == '8' || matrix.java == '11' || matrix.java == '17'
         uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
           java-version: ${{ matrix.java }}
 
-      - name: Setup Oracle JDK
-        if: matrix.java == '18' || matrix.java == '19'
-        uses: oracle-actions/setup-java@v1
-        with:
-          website: jdk.java.net
-          release: ${{ matrix.java }}
-          version: latest
-
       - name: Lint
         run: ./build.sh lint
 
@@ -85,8 +76,9 @@ jobs:
         - '8'
         - '11'
         - '17'
+        - '21-ea'
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Cache Local Maven Repository
         uses: actions/cache@v3

diff --git a/.github/workflows/test-lang-js.yml b/.github/workflows/test-lang-js.yml
@@ -43,7 +43,7 @@ jobs:
         - 14
         - 16
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Setup Node
         uses: actions/setup-node@v3
         with:
@@ -72,7 +72,7 @@ jobs:
         - 14
         - 16
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Setup Node
         uses: actions/setup-node@v3
         with:

diff --git a/.github/workflows/test-lang-perl.yml b/.github/workflows/test-lang-perl.yml
@@ -41,7 +41,7 @@ jobs:
         perl:
         - '5.32'
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: shogo82148/actions-setup-perl@v1
         with:
@@ -87,7 +87,7 @@ jobs:
         perl:
         - '5.32'
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: shogo82148/actions-setup-perl@v1
         with:

diff --git a/.github/workflows/test-lang-php.yml b/.github/workflows/test-lang-php.yml
@@ -44,7 +44,7 @@ jobs:
         - '8.0'
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -54,7 +54,7 @@ jobs:
 
       - name: Get Composer Cache Directory
         id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+        run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - uses: actions/cache@v3
         with:
@@ -80,7 +80,7 @@ jobs:
         - '8.0'
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -108,7 +108,7 @@ jobs:
         working-directory: lang/java/avro
         run: mvn -B -P interop-data-generate generate-resources
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           repository: kjdev/php-ext-zstd
           path: lang/php/php-ext-zstd
@@ -124,7 +124,7 @@ jobs:
           echo "extension=zstd.so" | sudo tee -a /etc/php/${{ matrix.php }}/cli/conf.d/10-zstd.ini
           php -m
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           repository: kjdev/php-ext-snappy
           path: lang/php/php-ext-snappy

diff --git a/.github/workflows/test-lang-py.yml b/.github/workflows/test-lang-py.yml
@@ -45,12 +45,13 @@ jobs:
         - '3.9'
         - '3.8'
         - '3.7'
-        - '3.6'
         - 'pypy-3.7'
-        - 'pypy-3.6'
+        - 'pypy-3.8'
+        - 'pypy-3.9'
+        - 'pypy-3.10'
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup Python
         uses: actions/setup-python@v4
@@ -92,12 +93,13 @@ jobs:
         - '3.9'
         - '3.8'
         - '3.7'
-        - '3.6'
         - 'pypy-3.7'
-        - 'pypy-3.6'
+        - 'pypy-3.8'
+        - 'pypy-3.9'
+        - 'pypy-3.10'
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup Python
         uses: actions/setup-python@v4

diff --git a/.github/workflows/test-lang-ruby.yml b/.github/workflows/test-lang-ruby.yml
@@ -44,7 +44,7 @@ jobs:
         - '3.1'
         - '3.2'
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: ruby/setup-ruby@v1
         with:
@@ -84,7 +84,7 @@ jobs:
         - '3.1'
         - '3.2'
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: ruby/setup-ruby@v1
         with: