From a425330561c5531e8d2e5bb24db82caa96a0cbec Mon Sep 17 00:00:00 2001 From: yrizhkov Date: Thu, 12 Dec 2024 09:59:22 +0200 Subject: [PATCH] FMWK-627 Update dependency versions --- .github/workflows/build.yml | 18 +++++------------- .github/workflows/snyk-scan.yml | 11 ++++++----- pom.xml | 4 ++-- reactor-client/pom.xml | 2 +- 4 files changed, 14 insertions(+), 21 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 97823a8..cec9d73 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,26 +12,18 @@ jobs: runs-on: ubuntu-latest steps: - # Checkout repo using https://github.com/marketplace/actions/checkout - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up JDK 1.8 - uses: actions/setup-java@v1 + uses: actions/setup-java@v4 with: - java-version: 1.8 + distribution: 'temurin' + java-version: 8 + cache: 'maven' - name: Set up Aerospike Database uses: reugn/github-action-aerospike@v1 - # See: https://github.com/actions/cache/blob/master/examples.md#java---maven - - name: Maven cache and restore deps - uses: actions/cache@v1 - with: - path: ~/.m2/repository - key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} - restore-keys: | - ${{ runner.os }}-maven- - - name: Build with Maven run: mvn clean test -B -U \ No newline at end of file diff --git a/.github/workflows/snyk-scan.yml b/.github/workflows/snyk-scan.yml index d8d5b31..5287bf7 100644 --- a/.github/workflows/snyk-scan.yml +++ b/.github/workflows/snyk-scan.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Run Snyk to check for vulnerabilities uses: snyk/actions/maven@master @@ -22,10 +22,6 @@ jobs: with: args: --all-projects --sarif-file-output=snyk.sarif - - name: Handle undefined security-severity - run: | - sed -i 's/"security-severity": "undefined"/"security-severity": "0"/g' snyk.sarif - - name: Check output file id: out-file run: | @@ -34,6 +30,11 @@ jobs: echo "::set-output name=exists::false" fi + - name: Handle undefined security-severity + if: steps.out-file.outputs.exists == 'true' + run: | + sed -i 's/"security-severity": "undefined"/"security-severity": "0"/g' snyk.sarif + - name: Upload result to GitHub Code Scanning if: steps.out-file.outputs.exists == 'true' uses: github/codeql-action/upload-sarif@v3 diff --git a/pom.xml b/pom.xml index ea5c5fe..3643bfa 100644 --- a/pom.xml +++ b/pom.xml @@ -30,10 +30,10 @@ 1.6 9.0.2 - 4.1.111.Final + 4.1.115.Final 1.5.0 4.13.2 - 2.0.13 + 2.0.16 diff --git a/reactor-client/pom.xml b/reactor-client/pom.xml index 87ee623..3b78b8a 100644 --- a/reactor-client/pom.xml +++ b/reactor-client/pom.xml @@ -19,7 +19,7 @@ UTF-8 UTF-8 - 3.6.7 + 3.7.1 3.24.2 0.10