diff --git a/build.sbt b/build.sbt index 8393a4a52e7..405d905272d 100644 --- a/build.sbt +++ b/build.sbt @@ -161,8 +161,9 @@ lazy val commonSettings = ), //here we add dependencies that we want to have fixed across all modules dependencyOverrides ++= Seq( - //currently Flink (1.9) uses 1.8.2 Avro version - "org.apache.avro" % "avro" % avroV + //currently Flink (1.11 -> https://github.com/apache/flink/blob/master/pom.xml#L128) uses 1.8.2 Avro version + "org.apache.avro" % "avro" % avroV, + "com.typesafe" % "config" % configV ) ) @@ -195,7 +196,7 @@ val slf4jV = "1.7.21" val scalaLoggingV = "3.9.0" val scalaCompatV = "0.9.0" val ficusV = "1.4.1" -val configV = "1.3.0" +val configV = "1.4.0" val commonsLangV = "3.3.2" val commonsTextV = "1.8" //we want to use 5.x for standalone metrics to have tags, however dropwizard development kind of freezed. Maybe we should consider micrometer? diff --git a/docs/Changelog.md b/docs/Changelog.md index a2a0ac1d36a..dec5c331dd2 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -11,6 +11,7 @@ Nussknacker versions 0.3.0 (not released yet) ------------------------ * [#1054](https://github.com/TouK/nussknacker/pull/1054) Tabbed dark process list +* [#1151](https://github.com/TouK/nussknacker/pull/1151) Upgrade Typesafe Config to latest version 0.2.1 (not released yet) -----------------------