From 5c5b6aecf8d6738016db976dbd26ab45a78f5533 Mon Sep 17 00:00:00 2001
From: SanderOpperud <60642441+SanderOpperud@users.noreply.github.com>
Date: Tue, 5 Jan 2021 15:48:32 +0100
Subject: [PATCH] Oppdaterer dusseldorf-ktor (#16)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Oppdatere dusseldorf-ktor

* Endrer til https for maven("http://packages.confluent.io/maven/")

* Fikser rekkerfølge på repositories.

Co-authored-by: Ramin Esfandiari <ramin_esfandiari_93@hotmail.com>
---
 build.gradle.kts        | 19 +++++++++----------
 dependabot/build.gradle | 36 ++++++++++++++++++------------------
 2 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 7717190..e48ce37 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,7 +1,7 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
-val dusseldorfKtorVersion = "1.4.3.4d13d2f"
+val dusseldorfKtorVersion = "1.5.0.3315e68"
 val ktorVersion = ext.get("ktorVersion").toString()
 val mainClass = "no.nav.omsorgspengermidlertidigalene.AppKt"
 val kafkaEmbeddedEnvVersion = "2.4.0"
@@ -14,7 +14,7 @@ plugins {
 
 buildscript {
     // Henter ut diverse dependency versjoner, i.e. ktorVersion.
-    apply("https://raw.githubusercontent.com/navikt/dusseldorf-ktor/4d13d2f1b89e32fd12b989022245705151dd519b/gradle/dusseldorf-ktor.gradle.kts")
+    apply("https://raw.githubusercontent.com/navikt/dusseldorf-ktor/3315e68ec40ad9a24fa0c45d4f463d9cbae56fa0/gradle/dusseldorf-ktor.gradle.kts")
 }
 
 dependencies {
@@ -46,11 +46,7 @@ dependencies {
 }
 
 repositories {
-    maven("https://dl.bintray.com/kotlin/ktor")
-    maven("https://kotlin.bintray.com/kotlinx")
-    maven("http://packages.confluent.io/maven/")
-    maven("https://jitpack.io")
-
+    mavenLocal()
     maven {
         name = "GitHubPackages"
         url = uri("https://maven.pkg.github.com/navikt/dusseldorf-ktor")
@@ -59,10 +55,13 @@ repositories {
             password = project.findProperty("gpr.key") as String? ?: System.getenv("GITHUB_TOKEN")
         }
     }
-
-    jcenter()
-    mavenLocal()
     mavenCentral()
+    jcenter()
+    maven("https://dl.bintray.com/kotlin/ktor")
+    maven("https://kotlin.bintray.com/kotlinx")
+    maven("https://packages.confluent.io/maven/")
+    maven("https://jitpack.io")
+    maven("https://dl.bintray.com/kotlin/kotlin-eap")
 }
 
 
diff --git a/dependabot/build.gradle b/dependabot/build.gradle
index a77b125..17b73b0 100644
--- a/dependabot/build.gradle
+++ b/dependabot/build.gradle
@@ -1,28 +1,28 @@
 // Do not edit manually! This file was created by the 'createDependabotFile' task defined in the root build.gradle.kts file.
 dependencies {
-    compile 'no.nav.helse:dusseldorf-ktor-core:1.4.3.4d13d2f'
-    compile 'no.nav.helse:dusseldorf-ktor-jackson:1.4.3.4d13d2f'
-    compile 'no.nav.helse:dusseldorf-ktor-metrics:1.4.3.4d13d2f'
-    compile 'no.nav.helse:dusseldorf-ktor-health:1.4.3.4d13d2f'
-    compile 'no.nav.helse:dusseldorf-ktor-auth:1.4.3.4d13d2f'
-    compile 'io.ktor:ktor-locations:1.4.3'
-    compile 'no.nav.helse:dusseldorf-ktor-client:1.4.3.4d13d2f'
-    compile 'no.nav.helse:dusseldorf-oauth2-client:1.4.3.4d13d2f'
+    compile 'no.nav.helse:dusseldorf-ktor-core:1.5.0.3315e68'
+    compile 'no.nav.helse:dusseldorf-ktor-jackson:1.5.0.3315e68'
+    compile 'no.nav.helse:dusseldorf-ktor-metrics:1.5.0.3315e68'
+    compile 'no.nav.helse:dusseldorf-ktor-health:1.5.0.3315e68'
+    compile 'no.nav.helse:dusseldorf-ktor-auth:1.5.0.3315e68'
+    compile 'io.ktor:ktor-locations:1.5.0'
+    compile 'no.nav.helse:dusseldorf-ktor-client:1.5.0.3315e68'
+    compile 'no.nav.helse:dusseldorf-oauth2-client:1.5.0.3315e68'
     compile 'io.lettuce:lettuce-core:5.3.5.RELEASE'
     compile 'com.github.fppt:jedis-mock:0.1.16'
     compile 'org.apache.kafka:kafka-clients:2.4.0'
-    testCompile 'no.nav.helse:dusseldorf-test-support:1.4.3.4d13d2f'
+    testCompile 'no.nav.helse:dusseldorf-test-support:1.5.0.3315e68'
     testCompile 'no.nav:kafka-embedded-env:2.4.0'
-    testCompile 'io.ktor:ktor-server-test-host:1.4.3'
+    testCompile 'io.ktor:ktor-server-test-host:1.5.0'
     testCompile 'org.skyscreamer:jsonassert:1.5.0'
-    testCompile 'no.nav.helse:dusseldorf-ktor-core:1.4.3.4d13d2f'
-    testCompile 'no.nav.helse:dusseldorf-ktor-jackson:1.4.3.4d13d2f'
-    testCompile 'no.nav.helse:dusseldorf-ktor-metrics:1.4.3.4d13d2f'
-    testCompile 'no.nav.helse:dusseldorf-ktor-health:1.4.3.4d13d2f'
-    testCompile 'no.nav.helse:dusseldorf-ktor-auth:1.4.3.4d13d2f'
-    testCompile 'io.ktor:ktor-locations:1.4.3'
-    testCompile 'no.nav.helse:dusseldorf-ktor-client:1.4.3.4d13d2f'
-    testCompile 'no.nav.helse:dusseldorf-oauth2-client:1.4.3.4d13d2f'
+    testCompile 'no.nav.helse:dusseldorf-ktor-core:1.5.0.3315e68'
+    testCompile 'no.nav.helse:dusseldorf-ktor-jackson:1.5.0.3315e68'
+    testCompile 'no.nav.helse:dusseldorf-ktor-metrics:1.5.0.3315e68'
+    testCompile 'no.nav.helse:dusseldorf-ktor-health:1.5.0.3315e68'
+    testCompile 'no.nav.helse:dusseldorf-ktor-auth:1.5.0.3315e68'
+    testCompile 'io.ktor:ktor-locations:1.5.0'
+    testCompile 'no.nav.helse:dusseldorf-ktor-client:1.5.0.3315e68'
+    testCompile 'no.nav.helse:dusseldorf-oauth2-client:1.5.0.3315e68'
     testCompile 'io.lettuce:lettuce-core:5.3.5.RELEASE'
     testCompile 'com.github.fppt:jedis-mock:0.1.16'
     testCompile 'org.apache.kafka:kafka-clients:2.4.0'