From 40a60fe409aa4264d53c530ba0ea2b9afd9eb835 Mon Sep 17 00:00:00 2001
From: Tore Langedal Endestad <tore.langedal.endestad@nav.no>
Date: Mon, 16 Dec 2024 19:06:55 +0100
Subject: [PATCH] Ha mer konsistent versjon av dependencies (samme versjon for
 alle netty-artefakter, jackson, kotlin-stdlib) (#835)

* Ha mer konsistent versjon av dependencies (samme versjon for alle netty-artefakter, jackson, kotlin-stdlib)

* Ha mer konsistent versjon av dependencies (samme versjon for alle netty-artefakter, jackson, kotlin-stdlib)

* Kotlin 2.0
---
 gradle/dusseldorf-ktor.gradle.kts | 23 +++++++-------
 pom.xml                           | 50 ++++++++++++++++++++++++++++---
 2 files changed, 58 insertions(+), 15 deletions(-)

diff --git a/gradle/dusseldorf-ktor.gradle.kts b/gradle/dusseldorf-ktor.gradle.kts
index 3ff26ec..62d0262 100644
--- a/gradle/dusseldorf-ktor.gradle.kts
+++ b/gradle/dusseldorf-ktor.gradle.kts
@@ -1,12 +1,13 @@
-val ktorVersion by extra("2.3.2")
-val kotlinVersion by extra("1.9.0")
-val logbackVersion by extra("1.4.8")
-val logstashLogbackVersion by extra("7.4")
+val ktorVersion by extra("2.3.13")
+val kotlinVersion by extra("2.1.0")
+val logbackVersion by extra("1.5.12")
+val logstashLogbackVersion by extra("8.0")
 val prometheusVersion by extra("0.16.0")
-val jacksonVersion by extra("2.15.2")
-val caffeineVersion by extra("3.1.7")
-val slf4jVersion by extra("2.0.7")
-val kotlinxCoroutinesVersion by extra("1.7.3")
-val micrometerVersion by extra("1.11.2")
-val kafkaVersion by extra("3.5.1")
-val orgjsonVersion by extra("20230618")
+val jacksonVersion by extra("2.18.2")
+val caffeineVersion by extra("3.1.8")
+val slf4jVersion by extra("2.0.16")
+val kotlinxCoroutinesVersion by extra("1.9.0")
+val micrometerVersion by extra("1.12.5")
+val kafkaVersion by extra("3.9.0")
+val kafkaEmbeddedEnvVersion by extra("")
+val orgjsonVersion by extra("20240303")
diff --git a/pom.xml b/pom.xml
index 7e54cb0..7e1c971 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,11 +33,13 @@
 
         <!-- Versjoner også eksponert i gradle/dusseldorf-ktor.gradle.kts -->
         <kotlinx.coroutines.version>1.9.0</kotlinx.coroutines.version>
-        <kotlin.version>2.1.0</kotlin.version>
+
+        <!-- kan ikke gå for 2.1 fordi ktor.versjon 2.3 importerer kotlin-stdlib-common, og den er ikke tilgjengelig i nyere kotlin-stdlib-versjoner -->
+        <kotlin.version>2.0.21</kotlin.version>
+
         <ktor.version>2.3.13</ktor.version>
         <jackson.version>2.18.2</jackson.version>
         <micrometer.version>1.12.5</micrometer.version>
-        <jackson.version>2.18.2</jackson.version>
         <logback.version>1.5.12</logback.version>
         <slf4j.version>2.0.16</slf4j.version>
         <logstash.logback.version>8.0</logstash.logback.version>
@@ -50,7 +52,7 @@
         <junit.version>5.11.3</junit.version>
         <oauth2-oidc-sdk.version>11.20.1</oauth2-oidc-sdk.version>
         <wiremock.version>3.10.0</wiremock.version>
-        <netty-codec-http2.version>4.1.115.Final</netty-codec-http2.version>
+        <netty.version>4.1.115.Final</netty.version>
     </properties>
 
     <dependencyManagement>
@@ -65,6 +67,16 @@
                 <artifactId>kotlin-stdlib-jdk8</artifactId>
                 <version>${kotlin.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.jetbrains.kotlin</groupId>
+                <artifactId>kotlin-stdlib-jdk7</artifactId>
+                <version>${kotlin.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jetbrains.kotlin</groupId>
+                <artifactId>kotlin-stdlib-common</artifactId>
+                <version>${kotlin.version}</version>
+            </dependency>
             <dependency>
                 <groupId>ch.qos.logback</groupId>
                 <artifactId>logback-classic</artifactId>
@@ -78,7 +90,32 @@
             <dependency>
                 <groupId>io.netty</groupId>
                 <artifactId>netty-codec-http2</artifactId>
-                <version>${netty-codec-http2.version}</version>
+                <version>${netty.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-transport-native-kqueue</artifactId>
+                <version>${netty.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-transport-native-epoll</artifactId>
+                <version>${netty.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jetbrains.kotlinx</groupId>
+                <artifactId>kotlinx-coroutines-jdk8</artifactId>
+                <version>${kotlinx.coroutines.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jetbrains.kotlinx</groupId>
+                <artifactId>kotlinx-coroutines-core-jvm</artifactId>
+                <version>${kotlinx.coroutines.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jetbrains.kotlinx</groupId>
+                <artifactId>kotlinx-coroutines-slf4j</artifactId>
+                <version>${kotlinx.coroutines.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.ktor</groupId>
@@ -97,6 +134,11 @@
                 <version>${kotlin.version}</version>
                 <scope>test</scope>
             </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.core</groupId>
+                <artifactId>jackson-databind</artifactId>
+                <version>${jackson.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>