Skip to content

Commit

Permalink
FMWK-627 Update dependency versions
Browse files Browse the repository at this point in the history
  • Loading branch information
reugn committed Dec 12, 2024
1 parent 66f5f88 commit a425330
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 21 deletions.
18 changes: 5 additions & 13 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
11 changes: 6 additions & 5 deletions .github/workflows/snyk-scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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: |
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>

<aerospike-client.version>9.0.2</aerospike-client.version>
<netty.version>4.1.111.Final</netty.version>
<netty.version>4.1.115.Final</netty.version>
<commons-cli.version>1.5.0</commons-cli.version>
<junit.version>4.13.2</junit.version>
<slf4j-api.version>2.0.13</slf4j-api.version>
<slf4j-api.version>2.0.16</slf4j-api.version>
</properties>

<licenses>
Expand Down
2 changes: 1 addition & 1 deletion reactor-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

<reactor.version>3.6.7</reactor.version>
<reactor.version>3.7.1</reactor.version>
<assertj.version>3.24.2</assertj.version>
<netcrusher.version>0.10</netcrusher.version>

Expand Down

0 comments on commit a425330

Please sign in to comment.