diff --git a/build.sbt b/build.sbt index 182c3c77876..6022d6e61f7 100644 --- a/build.sbt +++ b/build.sbt @@ -287,7 +287,7 @@ val circeV = "0.14.14" val circeGenericExtrasV = "0.14.4" val circeYamlV = "0.15.2" // 0.15.3 drops Scala 2.12 val jwtCirceV = "11.0.2" -val jacksonV = "2.18.2" // 2.18.3+ breaks ContentTypesSchemas.schemaForPlain +val jacksonV = "2.18.4" val catsV = "2.13.0" val catsEffectV = "3.5.7" val everitSchemaV = "1.14.5" diff --git a/docs/Changelog.md b/docs/Changelog.md index 5e67f8825f2..3db5f865053 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -277,13 +277,13 @@ description: Stay informed with detailed changelogs covering new features, impro } } ``` -* [#8352](https://github.com/TouK/nussknacker/pull/8352) Updated dependencies: +* [#8352](https://github.com/TouK/nussknacker/pull/8352)[#8449](https://github.com/TouK/nussknacker/pull/8449) Updated dependencies: * Caffeine Cache 3.1.8 -> 3.2.1 * Cats Effect 3.5.4 -> 3.5.7 * Cats 2.12.0 -> 2.13.0 * Circe 0.14.10 -> 0.14.14 * HikariCP 6.2.1 -> 6.3.1 - * Jackson 2.17.2 -> 2.18.2 + * Jackson 2.17.2 -> 2.18.4 * Netty 4.1.119.Final -> 4.1.123.Final * PostgreSQL JDBC driver 42.7.4 -> 42.7.7 * sttp 3.9.8 -> 3.11.0 diff --git a/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/ContentTypes.scala b/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/ContentTypes.scala index a02d583ee2d..6bd4114753c 100644 --- a/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/ContentTypes.scala +++ b/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/ContentTypes.scala @@ -9,8 +9,6 @@ object ContentTypes extends Enumeration { } object ContentTypesSchemas { - val schemaForJson: OpenAPIJsonSchema = OpenAPIJsonSchema("{}") - // note: "" deserializes to com.fasterxml.jackson.databind.node.MissingNode, - // which causes NPE when using Jackson 2.18.3+, because from this version on it decodes to null - val schemaForPlain: OpenAPIJsonSchema = OpenAPIJsonSchema("") + val schemaForJson: OpenAPIJsonSchema = OpenAPIJsonSchema("{}") + val schemaForPlain: OpenAPIJsonSchema = OpenAPIJsonSchema("true") } diff --git a/utils/schemed-kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/ContentTypesSchemasTest.scala b/utils/schemed-kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/ContentTypesSchemasTest.scala new file mode 100644 index 00000000000..dbc9b602182 --- /dev/null +++ b/utils/schemed-kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/ContentTypesSchemasTest.scala @@ -0,0 +1,12 @@ +package pl.touk.nussknacker.engine.schemedkafka.schemaregistry + +import org.scalatest.funsuite.AnyFunSuite +import org.scalatest.matchers.should.Matchers + +class ContentTypesSchemasTest extends AnyFunSuite with Matchers { + + test("schemaForJson is distinct from schemaForPlain") { + ContentTypesSchemas.schemaForJson shouldNot be(ContentTypesSchemas.schemaForPlain) + } + +}