Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump radar commons #82

Merged
merged 3 commits into from
Mar 14, 2024
Merged

Bump radar commons #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5b3319a
snyk severity threshold to high, match github action to management-po…
Bdegraaf1234 Mar 14, 2024
a6146f8
all java versions to jvm 17
Bdegraaf1234 Mar 14, 2024
f3b43be
trigger workflows
yatharthranjan Mar 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/snyk.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,5 @@ jobs:
--all-sub-projects
--configuration-matching='^runtimeClasspath$'
--org=radar-base
--policy-path=$PWD/.snyk
--policy-path=.snyk
--severity-threshold=high
1 change: 1 addition & 0 deletions .snyk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ ignore:
expires: 2023-14-30T10:58:31.820Z
created: 2022-10-31T10:58:31.828Z
patch: {}
severityThreshold: high
10 changes: 5 additions & 5 deletions buildSrc/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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
}
4 changes: 2 additions & 2 deletions buildSrc/src/main/kotlin/Versions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
5 changes: 5 additions & 0 deletions radar-jersey-hibernate/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
5 changes: 5 additions & 0 deletions radar-jersey/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading