From 5b3319a4a7f63c130eaab42eb319fd50d0e765c1 Mon Sep 17 00:00:00 2001
From: Bastiaan <bastiaan@thehyve.nl>
Date: Thu, 14 Mar 2024 14:40:15 +0100
Subject: [PATCH 1/3] snyk severity threshold to high, match github action to
 management-portal setup

---
 .github/workflows/snyk.yaml | 3 ++-
 .snyk                       | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/snyk.yaml b/.github/workflows/snyk.yaml
index a8e3119..d37e91e 100644
--- a/.github/workflows/snyk.yaml
+++ b/.github/workflows/snyk.yaml
@@ -29,4 +29,5 @@ jobs:
           --all-sub-projects
           --configuration-matching='^runtimeClasspath$'
           --org=radar-base
-          --policy-path=$PWD/.snyk
+          --policy-path=.snyk
+          --severity-threshold=high
diff --git a/.snyk b/.snyk
index 79c4305..9735564 100644
--- a/.snyk
+++ b/.snyk
@@ -8,3 +8,4 @@ ignore:
         expires: 2023-14-30T10:58:31.820Z
         created: 2022-10-31T10:58:31.828Z
 patch: {}
+severityThreshold: high

From a6146f88817c099fc74fd08c3e5b672527e545a4 Mon Sep 17 00:00:00 2001
From: Bastiaan <bastiaan@thehyve.nl>
Date: Thu, 14 Mar 2024 14:40:31 +0100
Subject: [PATCH 2/3] all java versions to jvm 17

---
 buildSrc/build.gradle.kts               | 10 +++++-----
 buildSrc/src/main/kotlin/Versions.kt    |  4 ++--
 radar-jersey-hibernate/build.gradle.kts |  5 +++++
 radar-jersey/build.gradle.kts           |  5 +++++
 4 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index da83967..04510a9 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -2,7 +2,7 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    kotlin("jvm") version "1.9.10"
+    kotlin("jvm") version "1.9.22"
 }
 
 repositories {
@@ -11,11 +11,11 @@ repositories {
 
 tasks.withType<KotlinCompile> {
     compilerOptions {
-        jvmTarget.set(JvmTarget.JVM_11)
+        jvmTarget.set(JvmTarget.JVM_17)
     }
 }
 
-tasks.withType<JavaCompile> {
-    sourceCompatibility = "11"
-    targetCompatibility = "11"
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }
diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
index 6db400b..9e996b7 100644
--- a/buildSrc/src/main/kotlin/Versions.kt
+++ b/buildSrc/src/main/kotlin/Versions.kt
@@ -13,7 +13,7 @@ object Versions {
 
     const val hk2 = "3.0.5"
     const val managementPortal = "2.1.0"
-    const val radarCommons = "1.1.1"
+    const val radarCommons = "1.1.2"
     const val javaJwt = "4.4.0"
     const val jakartaWsRs = "3.1.0"
     const val jakartaAnnotation = "2.1.1"
@@ -32,7 +32,7 @@ object Versions {
 
     const val hibernate = "6.4.2.Final"
     const val liquibase = "4.25.1"
-    const val postgres = "42.7.1"
+    const val postgres = "42.7.2"
     const val h2 = "2.2.224"
 
     const val wrapper = "8.4"
diff --git a/radar-jersey-hibernate/build.gradle.kts b/radar-jersey-hibernate/build.gradle.kts
index befaf10..31beeab 100644
--- a/radar-jersey-hibernate/build.gradle.kts
+++ b/radar-jersey-hibernate/build.gradle.kts
@@ -31,3 +31,8 @@ dependencies {
     testImplementation("org.hamcrest:hamcrest:${Versions.hamcrest}")
     testImplementation("com.squareup.okhttp3:okhttp:${Versions.okhttp}")
 }
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}
diff --git a/radar-jersey/build.gradle.kts b/radar-jersey/build.gradle.kts
index 85cbbc2..5faf276 100644
--- a/radar-jersey/build.gradle.kts
+++ b/radar-jersey/build.gradle.kts
@@ -55,6 +55,11 @@ dependencies {
     testImplementation("org.mockito.kotlin:mockito-kotlin:${Versions.mockitoKotlin}")
 }
 
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}
+
 tasks.processResources {
     val properties = mapOf("version" to project.version)
     inputs.properties(properties)

From f3b43be8183a0e0ac595e39ab6cd20da116f5845 Mon Sep 17 00:00:00 2001
From: Yatharth Ranjan <yatharthranjan89@gmail.com>
Date: Thu, 14 Mar 2024 19:39:11 +0530
Subject: [PATCH 3/3] trigger workflows