From 939192bc5b89520d08f38bfa78e6b81ee5f1614f Mon Sep 17 00:00:00 2001 From: david steinsland Date: Fri, 15 Nov 2024 11:46:03 +0100 Subject: [PATCH] sammenstiller versjoner --- build.gradle.kts | 13 ++++--------- .../no/nav/rapids_and_rivers/cli/JsonRiver.kt | 2 -- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index a317d5b..013c51a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,6 +1,8 @@ val junitJupiterVersion = "5.11.3" val jacksonVersion = "2.18.1" val kafkaVersion = "3.9.0" +val logbackClassicVersion = "1.5.12" +val logbackEncoderVersion = "8.0" group = "com.github.navikt" version = properties["version"] ?: "local-build" @@ -11,22 +13,15 @@ plugins { id("maven-publish") } -buildscript { - dependencies { - classpath("org.junit.platform:junit-platform-gradle-plugin:1.2.0") - } -} - repositories { mavenCentral() - maven("https://jitpack.io") } dependencies { api("org.apache.kafka:kafka-clients:$kafkaVersion") - api("ch.qos.logback:logback-classic:1.5.12") - api("net.logstash.logback:logstash-logback-encoder:8.0") { + api("ch.qos.logback:logback-classic:$logbackClassicVersion") + api("net.logstash.logback:logstash-logback-encoder:$logbackEncoderVersion") { exclude("com.fasterxml.jackson.core") } diff --git a/src/main/kotlin/no/nav/rapids_and_rivers/cli/JsonRiver.kt b/src/main/kotlin/no/nav/rapids_and_rivers/cli/JsonRiver.kt index 436f47d..b1742f0 100644 --- a/src/main/kotlin/no/nav/rapids_and_rivers/cli/JsonRiver.kt +++ b/src/main/kotlin/no/nav/rapids_and_rivers/cli/JsonRiver.kt @@ -2,7 +2,6 @@ package no.nav.rapids_and_rivers.cli import com.fasterxml.jackson.core.JsonProcessingException import com.fasterxml.jackson.databind.JsonNode -import com.fasterxml.jackson.databind.MapperFeature import com.fasterxml.jackson.databind.SerializationFeature import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper @@ -15,7 +14,6 @@ class JsonRiver(rapids: RapidsCliApplication) : MessageListener { private val validations = mutableListOf() private val mapper = jacksonObjectMapper() .registerModule(JavaTimeModule()) - .enable(MapperFeature.SORT_PROPERTIES_ALPHABETICALLY) .disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS) init {