Merge branch 'master' into dependabot/npm_and_yarn/frontend/typescrip…

…t-eslint/parser-7.1.0
spoud · Feb 28, 2024 · 0021ace · 0021ace
2 parents 756ed27 + 75a8b32
commit 0021ace
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/dependabot-auto-merge.yaml b/.github/workflows/dependabot-auto-merge.yaml
@@ -11,7 +11,7 @@ jobs:
     if: github.actor == 'dependabot[bot]'
     steps:
       - name: Enable auto-merge for Dependabot PRs
-        run: gh pr merge --auto --merge "$PR_URL"
+        run: gh pr merge --auto --squash "$PR_URL"
         env:
           PR_URL: ${{github.event.pull_request.html_url}}
           GH_TOKEN: ${{secrets.GITHUB_TOKEN}}
diff --git a/aggregator/pom.xml b/aggregator/pom.xml
@@ -17,7 +17,7 @@
         <maven.compiler.release>17</maven.compiler.release>
         <compiler-plugin.version>3.12.1</compiler-plugin.version>
         <surefire-plugin.version>3.2.5</surefire-plugin.version>
-        <kafka.version>3.5.1</kafka.version>
+        <kafka.version>3.6.1</kafka.version>
         <confluent.platform.version>7.6.0</confluent.platform.version>
     </properties>
     <dependencyManagement>