diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index c82f108..5351bb9 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -14,7 +14,7 @@ name: "CodeQL" on: pull_request: # The branches below must be a subset of the branches above - branches: '*' + branches: [master] jobs: analyze: @@ -54,6 +54,19 @@ jobs: # - name: Autobuild # uses: github/codeql-action/autobuild@v2 +# Custom build steps for Java + - name: Set up JDK 17 + if: matrix.language == 'java' + uses: actions/setup-java@v3 + with: + java-version: '17' + distribution: 'temurin' # You can use 'zulu' or another distribution if needed + + - name: Build with Maven + if: matrix.language == 'java' + run: mvn -B package --file pom.xml + + # ℹī¸ Command-line programs to run using the OS shell. # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index c8aeb3a..9b70728 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -15,10 +15,11 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - name: Set up JDK 1.8 - uses: actions/setup-java@v1 + - uses: actions/checkout@v3 + - name: Set up JDK 17 + uses: actions/setup-java@v3 with: - java-version: 1.8 + java-version: 17 + distribution: 'temurin' # You can change this to 'zulu' or other distributions if needed - name: Build with Maven run: mvn -B package --file pom.xml diff --git a/.github/workflows/sca-scan.yml b/.github/workflows/sca-scan.yml index f09161f..2296ece 100644 --- a/.github/workflows/sca-scan.yml +++ b/.github/workflows/sca-scan.yml @@ -8,8 +8,8 @@ jobs: steps: - uses: actions/checkout@master - name: Run Snyk to check for vulnerabilities - uses: snyk/actions/node@master + uses: snyk/actions/maven@master env: SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }} with: - args: --all-projects --fail-on=all + args: --fail-on=all diff --git a/pom.xml b/pom.xml index e5955ab..573a9a0 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ - 1.8 + 17 3.1.4 5.2.2 1.12.2 @@ -25,22 +25,18 @@ org.springframework.boot spring-boot-starter-web - ${spring-boot.version} org.springframework.boot spring-boot-starter-freemarker - ${spring-boot.version} org.springframework.boot spring-boot-starter-thymeleaf - ${spring-boot.version} org.springframework.boot spring-boot-starter - ${spring-boot.version} com.contentstack.sdk @@ -60,7 +56,6 @@ org.springframework.boot spring-boot-maven-plugin - 3.1.4