From c1883b11a30bb2e1937099490fbd63f9c5bf540a Mon Sep 17 00:00:00 2001 From: Ismael Juma Date: Thu, 27 May 2021 07:20:25 -0700 Subject: [PATCH] KAFKA-12856: Upgrade Jackson to 2.12.3 2.10.x is no longer supported, so we should move to 2.12 for the 3.0 release. ScalaObjectMapper has been deprecated and it looks like we don't actually need it, so remove its usage. --- core/src/main/scala/kafka/admin/ConsumerGroupCommand.scala | 3 +-- gradle/dependencies.gradle | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/core/src/main/scala/kafka/admin/ConsumerGroupCommand.scala b/core/src/main/scala/kafka/admin/ConsumerGroupCommand.scala index 2c0dc8c423ef7..6c6090f006dee 100755 --- a/core/src/main/scala/kafka/admin/ConsumerGroupCommand.scala +++ b/core/src/main/scala/kafka/admin/ConsumerGroupCommand.scala @@ -21,7 +21,6 @@ import java.time.{Duration, Instant} import java.util.Properties import com.fasterxml.jackson.dataformat.csv.CsvMapper import com.fasterxml.jackson.module.scala.DefaultScalaModule -import com.fasterxml.jackson.module.scala.experimental.ScalaObjectMapper import kafka.utils._ import kafka.utils.Implicits._ import org.apache.kafka.clients.admin._ @@ -146,7 +145,7 @@ object ConsumerGroupCommand extends Logging { } // Example: CsvUtils().readerFor[CsvRecordWithoutGroup] private[admin] case class CsvUtils() { - val mapper = new CsvMapper with ScalaObjectMapper + val mapper = new CsvMapper mapper.registerModule(DefaultScalaModule) def readerFor[T <: CsvRecord : ClassTag] = { val schema = getSchema[T] diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index 48e9b1232ce73..9ce6be0180cea 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -65,8 +65,7 @@ versions += [ grgit: "4.1.0", httpclient: "4.5.13", easymock: "4.3", - jackson: "2.10.5", - jacksonDatabind: "2.10.5.1", + jackson: "2.12.3", jacoco: "0.8.7", javassist: "3.27.0-GA", jetty: "9.4.39.v20210325", @@ -131,7 +130,7 @@ libs += [ commonsCli: "commons-cli:commons-cli:$versions.commonsCli", easymock: "org.easymock:easymock:$versions.easymock", jacksonAnnotations: "com.fasterxml.jackson.core:jackson-annotations:$versions.jackson", - jacksonDatabind: "com.fasterxml.jackson.core:jackson-databind:$versions.jacksonDatabind", + jacksonDatabind: "com.fasterxml.jackson.core:jackson-databind:$versions.jackson", jacksonDataformatCsv: "com.fasterxml.jackson.dataformat:jackson-dataformat-csv:$versions.jackson", jacksonModuleScala: "com.fasterxml.jackson.module:jackson-module-scala_$versions.baseScala:$versions.jackson", jacksonJDK8Datatypes: "com.fasterxml.jackson.datatype:jackson-datatype-jdk8:$versions.jackson",