Merge branch 'master' into lsembera/snyk-e2e-snappy-java

snowflakedb · Oct 19, 2023 · 4e7051d · 4e7051d
2 parents ee3742d + c690d56
commit 4e7051d
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/.github/workflows/snyk-issue.yml b/.github/workflows/snyk-issue.yml
@@ -4,6 +4,11 @@ on:
   schedule:
     - cron: '* */12 * * *'
 
+permissions:
+  contents: read
+  issues: write
+  pull-requests: write
+
 concurrency: snyk-issue
 
 jobs:

diff --git a/.github/workflows/snyk-pr.yml b/.github/workflows/snyk-pr.yml
@@ -3,6 +3,12 @@ on:
   pull_request:
     branches:
       - master
+
+permissions:
+  contents: read
+  issues: write
+  pull-requests: write
+
 jobs:
   snyk:
     runs-on: ubuntu-latest

diff --git a/format.sh b/format.sh
@@ -19,3 +19,6 @@ if ! command -v java > /dev/null; then
 fi
 echo "Running Google Java Format"
 find ./src -type f -name "*.java" -print0 | xargs -0 java -jar "${JAR_FILE}" --replace --set-exit-if-changed && echo "OK"
+
+echo "Sorting pom.xml"
+mvn com.github.ekryd.sortpom:sortpom-maven-plugin:sort