Skip to content

Commit

Permalink
Merge branch 'master' into uventet_sql_feilkode
Browse files Browse the repository at this point in the history
  • Loading branch information
boerta authored Dec 13, 2024
2 parents d91d2c5 + 20ec610 commit 6b8359e
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
16 changes: 8 additions & 8 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar

val mainClass = "no.nav.k9.los.K9LosKt"
val hikariVersion = "6.1.0"
val flywayVersion = "10.21.0"
val hikariVersion = "6.2.1"
val flywayVersion = "11.1.0"
val vaultJdbcVersion = "1.3.10"
val koinVersion = "4.0.0"
val kotliqueryVersion = "1.9.0"
Expand All @@ -12,21 +12,21 @@ val fuelVersion = "2.3.1"
val jacksonVersion = "2.17.2"
val commonsTextVersion = "1.12.0"

val dusseldorfKtorVersion = "5.0.10"
val dusseldorfKtorVersion = "5.0.14"
val ktorVersion = "2.3.13"
val kafkaVersion = "3.9.0"

val navTilgangskontroll = "3.2024.01.24_10.14-f70bae69bd65"

// Test Dependencies
val testContainers = "1.20.3"
val testContainers = "1.20.4"
val jsonassertVersion = "1.5.3"
val jupiterVersion = "5.11.3"
val assertkVersion = "0.28.1"
val mockkVersion = "1.13.13"

plugins {
id("org.jetbrains.kotlin.jvm") version "2.0.21"
id("org.jetbrains.kotlin.jvm") version "2.1.0"
id("com.github.johnrengelman.shadow") version "8.1.1"
}

Expand Down Expand Up @@ -73,8 +73,8 @@ dependencies {
implementation("no.nav.k9.statistikk:kontrakter:2.0_20220411110858_dc06dd1")

// opentelemetry
implementation("io.opentelemetry:opentelemetry-api:1.44.1")
implementation("io.opentelemetry:opentelemetry-extension-kotlin:1.44.1")
implementation("io.opentelemetry:opentelemetry-api:1.45.0")
implementation("io.opentelemetry:opentelemetry-extension-kotlin:1.45.0")
implementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations:2.10.0")

// Div
Expand All @@ -86,7 +86,7 @@ dependencies {
exclude(group = "org.jetbrains.kotlinx", module = "kotlinx-coroutines-core")
}

implementation( "io.github.smiley4:ktor-swagger-ui:3.5.1")
implementation( "io.github.smiley4:ktor-swagger-ui:3.6.0")


// DI
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/application.conf
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ktor {

connectionGroupSize = 16
callGroupSize = 100
workerGroupSize = 16
workerGroupSize = 50

requestQueueLimit=20

Expand Down

0 comments on commit 6b8359e

Please sign in to comment.