Skip to content

Commit 38ecf12

Browse files
Bdegraaf1234Bdegraaf1234
authored
Merge pull request #550 from RADAR-base/security-updates
security updates and updated maintainers
2 parents f6ad635 + 450aee1 commit 38ecf12

File tree

7 files changed

+109
-16
lines changed

7 files changed

+109
-16
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" ]
17+
pull_request:
18+
branches: [ "main", "dev" ]
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
@@ -95,8 +95,8 @@ jobs:
9595
# Use runtime labels from docker_meta as well as fixed labels
9696
labels: |
9797
${{ steps.docker_meta.outputs.labels }}
98-
maintainer=Joris Borgdorff <joris@thehyve.nl>
99-
org.opencontainers.image.authors=Joris Borgdorff <joris@thehyve.nl>
98+
maintainer=Bastiaan de Graaf <bastiaan@thehyve.nl>
99+
org.opencontainers.image.authors=Bastiaan de Graaf <bastiaan@thehyve.nl>
100100
org.opencontainers.image.vendor=RADAR-base
101101
org.opencontainers.image.licenses=Apache-2.0
102102

‎.github/workflows/release.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@ jobs:
9191
# Use runtime labels from docker_meta as well as fixed labels
9292
labels: |
9393
${{ steps.docker_meta.outputs.labels }}
94-
maintainer=Joris Borgdorff <joris@thehyve.nl>
95-
org.opencontainers.image.authors=Joris Borgdorff <joris@thehyve.nl>
94+
maintainer=Bastiaan de Graaf <bastiaan@thehyve.nl>
95+
org.opencontainers.image.authors=Bastiaan de Graaf <bastiaan@thehyve.nl>
9696
org.opencontainers.image.vendor=RADAR-base
9797
org.opencontainers.image.licenses=Apache-2.0
9898

‎.github/workflows/snyk.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ on:
33
pull_request:
44
branches:
55
- main
6+
- dev
67

78
jobs:
89
security:
@@ -29,3 +30,6 @@ jobs:
2930
--configuration-matching='^runtimeClasspath$'
3031
--org=radar-base
3132
--policy-path=$PWD/.snyk
33+
--all-projects
34+
--severity-threshold=high
35+
--fail-on=upgradable

‎build.gradle.kts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ radarPublishing {
3131
githubUrl.set("https://github.com/$githubRepoName.git")
3232
developers {
3333
developer {
34-
id.set("blootsvoets")
35-
name.set("Joris Borgdorff")
36-
email.set("joris@thehyve.nl")
34+
id.set("bdegraaf1234")
35+
name.set("Bastiaan de Graaf")
36+
email.set("bastiaan@thehyve.nl")
3737
organization.set("The Hyve")
3838
}
3939
}

‎buildSrc/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
22
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
33

44
plugins {
5-
kotlin("jvm") version "1.8.21"
5+
kotlin("jvm") version "1.9.22"
66
}
77

88
repositories {

‎buildSrc/src/main/kotlin/Versions.kt‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ object Versions {
33
const val project = "2.3.3-SNAPSHOT"
44

55
const val java = 17
6-
const val kotlin = "1.9.10"
6+
const val kotlin = "1.9.22"
77
const val dockerCompose = "0.17.5"
88

9-
const val radarCommons = "1.1.1"
10-
const val radarSchemas = "0.8.5"
9+
const val radarCommons = "1.1.2"
10+
const val radarSchemas = "0.8.7"
1111
const val jackson = "2.15.3"
1212
const val slf4j = "2.0.9"
1313
const val log4j2 = "2.21.0"
@@ -19,19 +19,19 @@ object Versions {
1919

2020
const val wrapper = "8.4"
2121

22-
const val managementPortal = "2.1.0"
22+
const val managementPortal = "2.1.1"
2323
const val coroutines = "1.7.3"
2424
const val snappy = "1.1.10.5"
2525
const val jCommander = "1.82"
2626
const val almworks = "1.1.2"
27-
const val minio = "8.5.6"
27+
const val minio = "8.5.9"
2828
const val guava = "31.1-jre"
2929
const val opencsv = "5.8"
3030
const val okhttp = "4.12.0"
31-
const val jedis = "5.0.1"
32-
const val azureStorage = "12.24.0"
31+
const val jedis = "jedis-3.6.2"
32+
const val azureStorage = "12.25.1"
3333
const val netty = "4.1.100.Final"
3434
const val snakeYaml = "2.2"
3535
const val apacheCommonsText = "1.10.0"
36-
const val projectReactorNetty = "1.1.11"
36+
const val projectReactorNetty = "1.1.13"
3737
}

0 commit comments

Comments
 (0)