Merge remote-tracking branch 'upstream/main' into main-2.x

bitwiseman · bitwiseman · commit 7ffd2c0cf4a5 · 2024-06-20T01:56:09.000-07:00
diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main
+      - main-2.x
       - '!/refs/heads/dependabot/*'
   pull_request:
     branches:
