Skip to content

Commit fbd9e3f

Browse files
committed
Fix reported snyk vulnerabilities and set up Github Actions for the v2 branch
1 parent 459d7e2 commit fbd9e3f

File tree

5 files changed

+116
-25
lines changed

5 files changed

+116
-25
lines changed

.github/workflows/codeql.yml

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
# For most projects, this workflow file will not need changing; you simply need
2+
# to commit it to your repository.
3+
#
4+
# You may wish to alter this file to override the set of languages analyzed,
5+
# or to provide custom queries or build logic.
6+
#
7+
# ******** NOTE ********
8+
# We have attempted to detect the languages in your repository. Please check
9+
# the `language` matrix defined below to confirm you have the correct set of
10+
# supported CodeQL languages.
11+
#
12+
name: "CodeQL"
13+
14+
on:
15+
push:
16+
branches: [ "main", "dev", "v2" ]
17+
pull_request:
18+
branches: [ "main", "dev", "v2" ]
19+
schedule:
20+
- cron: '24 21 * * 0'
21+
22+
jobs:
23+
analyze:
24+
name: Analyze
25+
# Runner size impacts CodeQL analysis time. To learn more, please see:
26+
# - https://gh.io/recommended-hardware-resources-for-running-codeql
27+
# - https://gh.io/supported-runners-and-hardware-resources
28+
# - https://gh.io/using-larger-runners
29+
# Consider using larger runners for possible analysis time improvements.
30+
runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
31+
timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
32+
permissions:
33+
# required for all workflows
34+
security-events: write
35+
36+
# only required for workflows in private repositories
37+
actions: read
38+
contents: read
39+
40+
strategy:
41+
fail-fast: false
42+
matrix:
43+
language: [ 'java-kotlin' ]
44+
# CodeQL supports [ 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift' ]
45+
# Use only 'java-kotlin' to analyze code written in Java, Kotlin or both
46+
# Use only 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
47+
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
48+
49+
steps:
50+
- name: Checkout repository
51+
uses: actions/checkout@v4
52+
53+
- uses: actions/setup-java@v4
54+
with:
55+
distribution: 'temurin' # See 'Supported distributions' for available options
56+
java-version: '17'
57+
58+
# Initializes the CodeQL tools for scanning.
59+
- name: Initialize CodeQL
60+
uses: github/codeql-action/init@v3
61+
with:
62+
languages: ${{ matrix.language }}
63+
# If you wish to specify custom queries, you can do so here or in a config file.
64+
# By default, queries listed here will override any specified in a config file.
65+
# Prefix the list here with "+" to use these queries and those in the config file.
66+
67+
# For more 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
68+
# queries: security-extended,security-and-quality
69+
70+
71+
# Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
72+
# If this step fails, then you should remove it and run the build manually (see below)
73+
- name: Autobuild
74+
uses: github/codeql-action/autobuild@v3
75+
76+
# ℹ️ Command-line programs to run using the OS shell.
77+
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
78+
79+
# If the Autobuild fails above, remove it and uncomment the following three lines.
80+
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
81+
82+
# - run: |
83+
# echo "Run, Build Application using script"
84+
# ./location_of_script_within_repo/buildscript.sh
85+
86+
- name: Perform CodeQL Analysis
87+
uses: github/codeql-action/analyze@v3
88+
with:
89+
category: "/language:${{matrix.language}}"

.github/workflows/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ name: CI
44
# Run in main and dev branches and in all pull requests to those branches
55
on:
66
push:
7-
branches: [ main, dev ]
7+
branches: [ "main", "dev", "v2" ]
88
pull_request:
9-
branches: [ main, dev ]
9+
branches: [ "main", "dev", "v2" ]
1010

1111
env:
1212
DOCKER_IMAGE: radarbase/radar-output-restructure

.github/workflows/snyk.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
name: Snyk test
22
on:
33
pull_request:
4-
branches:
5-
- main
4+
branches: [ "main", "dev", "v2" ]
65

76
jobs:
87
security:
@@ -29,3 +28,6 @@ jobs:
2928
--configuration-matching='^runtimeClasspath$'
3029
--org=radar-base
3130
--policy-path=$PWD/.snyk
31+
--all-projects
32+
--severity-threshold=high
33+
--fail-on=upgradable

gradle.properties

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
11
kotlin.code.style=official
22

3-
kotlinVersion=1.7.22
4-
dokkaVersion=1.7.20
5-
dockerComposeVersion=0.16.11
3+
kotlinVersion=1.9.22
4+
dokkaVersion=1.9.20
5+
dockerComposeVersion=0.17.5
66
dependencyUpdateVersion=0.44.0
77
nexusPublishVersion=1.1.0
88
jsoupVersion=1.15.3
99

10-
coroutinesVersion=1.6.4
11-
avroVersion=1.11.1
12-
snappyVersion=1.1.8.4
13-
jacksonVersion=2.14.1
10+
coroutinesVersion=1.7.3
11+
avroVersion=1.11.3
12+
snappyVersion=1.1.10.5
13+
jacksonVersion=2.15.3
1414
jCommanderVersion=1.82
1515
almworksVersion=1.1.2
16-
minioVersion=8.4.6
16+
minioVersion=8.5.9
1717
guavaVersion=31.1-jre
18-
opencsvVersion=5.7.1
19-
okhttpVersion=4.10.0
20-
jedisVersion=4.3.1
21-
slf4jVersion=2.0.5
22-
log4jVersion=2.19.0
23-
azureStorageVersion=12.20.1
24-
nettyVersion=4.1.85.Final
25-
snakeYamlVersion=1.33
18+
opencsvVersion=5.8
19+
okhttpVersion=4.12.0
20+
jedisVersion=jedis-3.6.2
21+
slf4jVersion=2.0.9
22+
log4jVersion=2.21.0
23+
azureStorageVersion=12.25.1
24+
nettyVersion=4.1.100.Final
25+
snakeYamlVersion=2.2
2626
apacheCommonsTextVersion=1.10.0
27-
projectReactorNettyVersion=1.0.24
27+
projectReactorNettyVersion=1.1.13
2828

29-
junitVersion=5.9.1
30-
mockitoKotlinVersion=4.1.0
31-
radarSchemasVersion=0.8.2
29+
junitVersion=5.10.0
30+
mockitoKotlinVersion=5.1.0
31+
radarSchemasVersion=0.8.7
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
44
networkTimeout=10000
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)