From 0830899ffc8308e730405ecb21afe466f159b54b Mon Sep 17 00:00:00 2001 From: Tom Everett Date: Sat, 22 Jun 2024 15:16:19 -0600 Subject: [PATCH] updates --- .github/workflows/codeql.yml | 47 +++++++++--------------------------- .github/workflows/main.yml | 8 +++--- pom.xml | 2 +- 3 files changed, 17 insertions(+), 40 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 7d6c853..042b6c6 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -1,14 +1,4 @@ -# For most projects, this workflow file will not need changing; you simply need -# to commit it to your repository. -# -# You may wish to alter this file to override the set of languages analyzed, -# or to provide custom queries or build logic. -# -# ******** NOTE ******** -# We have attempted to detect the languages in your repository. Please check -# the `language` matrix defined below to confirm you have the correct set of -# supported CodeQL languages. -# + name: "CodeQL" on: @@ -33,9 +23,7 @@ jobs: fail-fast: false matrix: language: [ 'java' ] - # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ] - # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support - + steps: - name: Checkout repository uses: actions/checkout@v4 @@ -45,29 +33,16 @@ jobs: uses: github/codeql-action/init@v3 with: languages: ${{ matrix.language }} - # If you wish to specify custom queries, you can do so here or in a config file. - # By default, queries listed here will override any specified in a config file. - # Prefix the list here with "+" to use these queries and those in the config file. - - # 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#, Go, 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@v3 - - # ℹī¸ 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 - - # 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: Set up JDK + uses: actions/setup-java@v4 + with: + distribution: 'temurin' + java-version: 21 + + - name: Build with Maven + run: mvn -B package verify --file pom.xml + - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@v3 with: diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2bb9791..f50f09c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,7 +19,9 @@ jobs: - name: Set up JDK uses: actions/setup-java@v4 with: - distribution: 'zulu' - java-version: 12 + distribution: 'temurin' + java-version: 21 + - name: Build with Maven - run: mvn -B package --file pom.xml + run: mvn -B package verify --file pom.xml + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 4a8c97f..cff3fe9 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ 1.6.0 2.15.1 7.10.1 - 1.8 + 21 1.5.4 UTF-8 1.17.0