diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index c82f108..bcfdf7c 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: @@ -48,21 +48,34 @@ jobs: # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs # queries: security-extended,security-and-quality - - # 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 + + # 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 + + # Conditional build steps based on the language + # Custom build steps + - name: Set up JDK 8 + if: matrix.language == 'java' + uses: actions/setup-java@v3 + with: + java-version: '8' + distribution: 'temurin' # You can use 'zulu' or other distributions if preferred - # ℹī¸ 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 + - name: Build with Maven + if: matrix.language == 'java' + run: mvn -B package --file pom.xml - # If the Autobuild fails above, remove it and uncomment the following three lines. - # modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance. + # ℹī¸ 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 - # - run: | - # echo "Run, Build Application using script" - # ./location_of_script_within_repo/buildscript.sh + # If the Autobuild fails above, remove it and uncomment the following three lines. + # modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance. + # - run: | + # echo "Run, Build Application using script" + # ./location_of_script_within_repo/buildscript.sh + - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 + uses: github/codeql-action/analyze@v2 \ No newline at end of file diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index c8aeb3a..51369e4 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -16,9 +16,10 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up JDK 1.8 - uses: actions/setup-java@v1 + - name: Set up JDK 8 + uses: actions/setup-java@v3 with: - java-version: 1.8 + java-version: '8' + distribution: 'temurin' # You can use 'zulu' or other distributions if preferred - name: Build with Maven - run: mvn -B package --file pom.xml + run: mvn -B package --file pom.xml \ No newline at end of file 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/.gitignore b/.gitignore index 9f856dc..2ee2d9f 100644 --- a/.gitignore +++ b/.gitignore @@ -131,3 +131,6 @@ Temporary Items .project */target/** /.env + +.vscode/ +target/* \ No newline at end of file diff --git a/pom.xml b/pom.xml index e5955ab..dc3944a 100644 --- a/pom.xml +++ b/pom.xml @@ -11,21 +11,30 @@ org.springframework.boot spring-boot-starter-parent - 3.1.4 + + 2.7.13 - 1.8 - 3.1.4 + + 1.8 + 2.7.13 + 5.2.2 + 1.13.0 + 1.8 + 1.8 + true org.springframework.boot spring-boot-starter-web - ${spring-boot.version} + + 3.2.7 org.springframework.boot @@ -35,17 +44,19 @@ org.springframework.boot spring-boot-starter-thymeleaf - ${spring-boot.version} + + 3.0.10 org.springframework.boot spring-boot-starter - ${spring-boot.version} + + 3.2.1 com.contentstack.sdk java - 1.12.2 + 1.13.0 io.github.cdimascio @@ -60,7 +71,18 @@ org.springframework.boot spring-boot-maven-plugin - 3.1.4 + 2.7.13 + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.11.0 + + 1.8 + 1.8 + true +