Skip to content

Commit

Permalink
JVMCBC-1509 Upgrade Jackson from 2.16.1 to 2.17.0
Browse files Browse the repository at this point in the history
And use Builder instead of deprecated KotlinModule constructor

Change-Id: I3ef78a495b5ad567ac7cbff6a1fc3ff0a7243347
Reviewed-on: https://review.couchbase.org/c/couchbase-jvm-clients/+/208601
Tested-by: Build Bot <build@couchbase.com>
Reviewed-by: Graham Pople <graham.pople@couchbase.com>
  • Loading branch information
dnault committed Apr 16, 2024
1 parent 9ebdb1e commit ddaed24
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion core-io-deps/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

<!-- When bumping this, it may be necessary to bump the grpc-netty dependency in protostellar/pom.xml also -->
<netty.version>4.1.108.Final</netty.version>
<jackson.version>2.16.1</jackson.version>
<jackson.version>2.17.0</jackson.version>

<shaded.package.prefix>com.couchbase.client.core.deps.</shaded.package.prefix>
<shaded.native.lib.prefix>com_couchbase_client_core_deps_</shaded.native.lib.prefix>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public class ClusterEnvironment private constructor(builder: Builder) : CoreEnvi
this.cryptoManager = builder.cryptoManager
jsonSerializer = builder.jsonSerializer ?: JacksonJsonSerializer(jsonMapper {
addModule(Jdk8Module())
addModule(KotlinModule())
addModule(KotlinModule.Builder().build())
})
transcoder = builder.transcoder ?: JsonTranscoder(jsonSerializer)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import org.junit.jupiter.api.Test
import org.junit.jupiter.api.assertThrows

internal class JacksonJsonSerializerTest {
private val serializer = JacksonJsonSerializer(jsonMapper { addModule(KotlinModule()) })
private val serializer = JacksonJsonSerializer(jsonMapper { addModule(KotlinModule.Builder().build()) })

@Test
fun `can serialize null`() {
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<assertj.version>3.23.1</assertj.version>
<log4j-slf4j-impl.version>2.20.0</log4j-slf4j-impl.version>

<jackson.version>2.16.1</jackson.version>
<jackson.version>2.17.0</jackson.version>
<reactor.version>3.6.3</reactor.version>
<reactive-streams.version>1.0.4</reactive-streams.version>
<blockhound.version>1.0.8.RELEASE</blockhound.version>
Expand Down

0 comments on commit ddaed24

Please sign in to comment.