You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by li...@apache.org on 2022/04/13 02:18:56 UTC
[servicecomb-java-chassis] branch master updated: [SCB-2447]upgrade jackson version (#2779)
This is an automated email from the ASF dual-hosted git repository.
liubao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git
The following commit(s) were added to refs/heads/master by this push:
new 0fb9f677c [SCB-2447]upgrade jackson version (#2779)
0fb9f677c is described below
commit 0fb9f677cacbe3004a717dec2118cc103f53b5dc
Author: ZhangJian He <sh...@gmail.com>
AuthorDate: Wed Apr 13 10:18:51 2022 +0800
[SCB-2447]upgrade jackson version (#2779)
---
.../org/apache/servicecomb/http/client/common/MessageObjectMapper.java | 3 ++-
dependencies/default/pom.xml | 2 +-
.../apache/servicecomb/foundation/common/utils/RestObjectMapper.java | 3 ++-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/clients/http-client-common/src/main/java/org/apache/servicecomb/http/client/common/MessageObjectMapper.java b/clients/http-client-common/src/main/java/org/apache/servicecomb/http/client/common/MessageObjectMapper.java
index 3cb7f21ac..4eb854726 100644
--- a/clients/http-client-common/src/main/java/org/apache/servicecomb/http/client/common/MessageObjectMapper.java
+++ b/clients/http-client-common/src/main/java/org/apache/servicecomb/http/client/common/MessageObjectMapper.java
@@ -33,7 +33,8 @@ public class MessageObjectMapper extends ObjectMapper {
disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
disable(SerializationFeature.FAIL_ON_EMPTY_BEANS);
// no view annotations shouldn't be included in JSON
- disable(MapperFeature.DEFAULT_VIEW_INCLUSION);
+ this._deserializationConfig = this._deserializationConfig.without(MapperFeature.DEFAULT_VIEW_INCLUSION);
+ this._serializationConfig = this._serializationConfig.without(MapperFeature.DEFAULT_VIEW_INCLUSION);
disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
enable(DeserializationFeature.UNWRAP_SINGLE_VALUE_ARRAYS);
enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
diff --git a/dependencies/default/pom.xml b/dependencies/default/pom.xml
index 766c85756..9002fbd8e 100644
--- a/dependencies/default/pom.xml
+++ b/dependencies/default/pom.xml
@@ -60,7 +60,7 @@
<hibernate-validator.version>6.2.1.Final</hibernate-validator.version>
<httpcomponents.version>4.5.13</httpcomponents.version>
<hystrix.version>1.5.18</hystrix.version>
- <jackson.version>2.12.1</jackson.version>
+ <jackson.version>2.13.2.20220328</jackson.version>
<javakaffee.version>0.26</javakaffee.version>
<javax-annotation.version>1.3.2</javax-annotation.version>
<javax-inject.version>1</javax-inject.version>
diff --git a/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/utils/RestObjectMapper.java b/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/utils/RestObjectMapper.java
index 4fd41fcb9..1f5669d8e 100644
--- a/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/utils/RestObjectMapper.java
+++ b/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/utils/RestObjectMapper.java
@@ -53,7 +53,8 @@ public class RestObjectMapper extends AbstractRestObjectMapper {
disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
disable(SerializationFeature.FAIL_ON_EMPTY_BEANS);
// no view annotations shouldn't be included in JSON
- disable(MapperFeature.DEFAULT_VIEW_INCLUSION);
+ this._deserializationConfig = this._deserializationConfig.without(MapperFeature.DEFAULT_VIEW_INCLUSION);
+ this._serializationConfig = this._serializationConfig.without(MapperFeature.DEFAULT_VIEW_INCLUSION);
disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
enable(DeserializationFeature.UNWRAP_SINGLE_VALUE_ARRAYS);
enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);