Merge branch 'apache:main' into master

apache · Mar 6, 2024 · 044b995 · 044b995
2 parents 1a7210e + 9c7e14d
commit 044b995
Show file tree

Hide file tree

Showing 516 changed files with 34,933 additions and 7,739 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
@@ -19,12 +19,29 @@ root = true
 charset = utf-8
 end_of_line = lf
 insert_final_newline = true
+ij_any_block_comment_at_first_column = false
+ij_any_line_comment_at_first_column = false
 
 [*.{java,xml,sh}]
 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/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -13,7 +13,7 @@
 
   - Fill out the template below to describe the changes contributed by the pull request. That will give reviewers the context they need to do the review.
   
-  - Make sure that the change passes the automated tests. You can [build the entire project](https://github.com/apache/avro/blob/master/BUILD.md) or just the [language-specific SDK](https://avro.apache.org/project/how-to-contribute/#unit-tests).
+  - Make sure that the change passes the automated tests. You can [build the entire project](https://github.com/apache/avro/blob/main/BUILD.md) or just the [language-specific SDK](https://avro.apache.org/project/how-to-contribute/#unit-tests).
 
   - Each pull request should address only one issue, not mix up code from multiple issues.
   

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -84,7 +84,6 @@ updates:
     schedule:
       interval: "daily"
     open-pull-requests-limit: 20
-    target-branch: master
 
   - package-ecosystem: "github-actions"
     directory: "/"

diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -18,15 +18,39 @@
 #
 # Pull Request Labeler Github Action Configuration: https://github.com/marketplace/actions/labeler
 
-C: ["lang/c/**/*"]
-C++: ["lang/c++/**/*"]
-C#: ["lang/csharp/**/*"]
-Java: ["lang/java/**/*"]
-Js: ["lang/js/**/*"]
-Perl: ["lang/perl/**/*"]
-Php: ["lang/php/**/*"]
-Python: ["lang/py/**/*"]
-Ruby: ["lang/ruby/**/*"]
-Rust: ["lang/rust/**/*"]
-build: ["**/*Dockerfile*", "**/*.sh", "**/*pom.xml", ".github/**/*"]
-website: ["doc/**/*"]
+C: 
+  - changed-files:
+    - any-glob-to-any-file: "lang/c/**/*"
+C++: 
+  - changed-files:
+    - any-glob-to-any-file: "lang/c++/**/*"
+C#: 
+  - changed-files:
+    - any-glob-to-any-file: "lang/csharp/**/*"
+Java: 
+  - changed-files:
+    - any-glob-to-any-file: "lang/java/**/*"
+Js: 
+  - changed-files:
+    - any-glob-to-any-file: "lang/js/**/*"
+Perl: 
+  - changed-files:
+    - any-glob-to-any-file: "lang/perl/**/*"
+Php: 
+  - changed-files:
+    - any-glob-to-any-file: "lang/php/**/*"
+Python: 
+  - changed-files:
+    - any-glob-to-any-file: "lang/py/**/*"
+Ruby: 
+  - changed-files:
+    - any-glob-to-any-file: "lang/ruby/**/*"
+Rust: 
+  - changed-files:
+    - any-glob-to-any-file: "lang/rust/**/*"
+build: 
+  - changed-files:
+    - any-glob-to-any-file: ["**/*Dockerfile*", "**/*.sh", "**/*pom.xml", ".github/**/*"]
+website: 
+  - changed-files:
+    - any-glob-to-any-file: "doc/**/*"
diff --git a/.github/workflows/codeql-csharp-analysis.yml b/.github/workflows/codeql-csharp-analysis.yml
@@ -23,11 +23,11 @@ name: "CodeQL C#"
 on:
   push:
     branches:
-    - master
+    - main
   pull_request:
     # The branches below must be a subset of the branches above
     branches:
-    - master
+    - main
     paths:
     - .github/workflows/codeql-csharp-analysis.yml
     - lang/csharp/**
@@ -53,25 +53,26 @@ 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.
         fetch-depth: 2
 
     # Install .NET SDKs
     - name: Install .NET SDKs
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v4
       with:
         dotnet-version: |
           3.1.x
           5.0.x
           6.0.x
           7.0.x
+          8.0.x
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -83,7 +84,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@v3
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -93,4 +94,4 @@ jobs:
     #    uses a compiled language
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3
diff --git a/.github/workflows/codeql-java-analysis.yml b/.github/workflows/codeql-java-analysis.yml
@@ -23,10 +23,10 @@ on:
   workflow_dispatch:
   push:
     branches:
-    - master
+    - main
   pull_request:
     branches:
-    - master
+    - main
     paths:
     - .github/workflows/codeql-java-analysis.yml
     - lang/java/**
@@ -53,15 +53,15 @@ 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.
         fetch-depth: 2
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -70,17 +70,34 @@ jobs:
         # queries: ./path/to/local/query, your-org/your-repo/queries@main
         queries: +security-and-quality
 
+    - name: 'Setup Temurin JDK 8, 11, 17 & 21'
+      uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
+      with:
+        distribution: 'temurin'
+        java-version: |
+          8
+          11
+          17
+          21
+
+    - name: 'Setup Maven 3.9.6'
+      uses: stCarolas/setup-maven@07fbbe97d97ef44336b7382563d66743297e442f # v4.5
+      with:
+        maven-version: 3.9.6
+
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+#    - name: Autobuild
+#      uses: github/codeql-action/autobuild@v3
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
 
     # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
     #    and modify them (or add more) to build your code if your project
     #    uses a compiled language
+    - name: 'Java Test'
+      run: mvn clean test
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3
diff --git a/.github/workflows/codeql-js-analysis.yml b/.github/workflows/codeql-js-analysis.yml
@@ -23,11 +23,11 @@ name: "CodeQL JavaScript"
 on:
   push:
     branches:
-    - master
+    - main
   pull_request:
     # The branches below must be a subset of the branches above
     branches:
-    - master
+    - main
     paths:
     - .github/workflows/codeql-js-analysis.yml
     - lang/js/**
@@ -53,15 +53,15 @@ 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.
         fetch-depth: 2
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -73,7 +73,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@v3
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -83,4 +83,4 @@ jobs:
     #    uses a compiled language
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3
diff --git a/.github/workflows/codeql-py-analysis.yml b/.github/workflows/codeql-py-analysis.yml
@@ -23,11 +23,11 @@ name: "CodeQL Python"
 on:
   push:
     branches:
-    - master
+    - main
   pull_request:
     # The branches below must be a subset of the branches above
     branches:
-    - master
+    - main
     paths:
     - .github/workflows/codeql-py-analysis.yml
     - lang/py/**
@@ -53,15 +53,15 @@ 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.
         fetch-depth: 2
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -73,7 +73,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@v3
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -83,4 +83,4 @@ jobs:
     #    uses a compiled language
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3