Skip to content

Commit a8a53da

Browse files
authored
Merge pull request #308 from linux-china/develop
Upgrade to Jackson 2.10.0
2 parents 5889abc + 11c3edd commit a8a53da

File tree

5 files changed

+13
-3
lines changed

5 files changed

+13
-3
lines changed

codec-parent/codec-jackson-smile/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@
2828
<groupId>com.fasterxml.jackson.datatype</groupId>
2929
<artifactId>jackson-datatype-jsr310</artifactId>
3030
</dependency>
31+
<dependency>
32+
<groupId>com.fasterxml.jackson.datatype</groupId>
33+
<artifactId>jackson-datatype-jdk8</artifactId>
34+
</dependency>
3135
</dependencies>
3236

3337
</project>

codec-parent/codec-jackson-smile/src/main/java/io/scalecube/cluster/codec/jackson/smile/DefaultObjectMapper.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,11 @@ private static ObjectMapper initMapper() {
2828
mapper.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);
2929
mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
3030
mapper.configure(SerializationFeature.WRITE_ENUMS_USING_TO_STRING, true);
31-
mapper.enableDefaultTyping(
31+
mapper.activateDefaultTyping(
3232
LaissezFaireSubTypeValidator.instance,
3333
DefaultTyping.JAVA_LANG_OBJECT,
3434
JsonTypeInfo.As.WRAPPER_OBJECT);
35+
mapper.findAndRegisterModules();
3536
return mapper;
3637
}
3738
}

codec-parent/codec-jackson/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@
2323
<groupId>com.fasterxml.jackson.datatype</groupId>
2424
<artifactId>jackson-datatype-jsr310</artifactId>
2525
</dependency>
26+
<dependency>
27+
<groupId>com.fasterxml.jackson.datatype</groupId>
28+
<artifactId>jackson-datatype-jdk8</artifactId>
29+
</dependency>
2630
</dependencies>
2731

2832
</project>

codec-parent/codec-jackson/src/main/java/io/scalecube/cluster/codec/jackson/DefaultObjectMapper.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,11 @@ private static ObjectMapper initMapper() {
2727
mapper.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);
2828
mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
2929
mapper.configure(SerializationFeature.WRITE_ENUMS_USING_TO_STRING, true);
30-
mapper.enableDefaultTyping(
30+
mapper.activateDefaultTyping(
3131
LaissezFaireSubTypeValidator.instance,
3232
DefaultTyping.JAVA_LANG_OBJECT,
3333
JsonTypeInfo.As.WRAPPER_OBJECT);
34+
mapper.findAndRegisterModules();
3435
return mapper;
3536
}
3637
}

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<slf4j.version>1.7.30</slf4j.version>
2626
<log4j.version>2.8.2</log4j.version>
2727
<reactor.version>Dysprosium-RELEASE</reactor.version>
28-
<jackson.version>2.10.0.pr1</jackson.version>
28+
<jackson.version>2.10.0</jackson.version>
2929

3030
<mockito-junit-jupiter.version>2.27.0</mockito-junit-jupiter.version>
3131
<junit-jupiter.version>5.1.1</junit-jupiter.version>

0 commit comments

Comments
 (0)