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 18f00bd SCB-2168 Upgrade jackson from 2.10.5 to 2.12.0 (#2184)
18f00bd is described below
commit 18f00bd79290df70e54b706ca6afdbbb332486cc
Author: zyl <[email protected]>
AuthorDate: Mon Jan 11 09:54:16 2021 +0800
SCB-2168 Upgrade jackson from 2.10.5 to 2.12.0 (#2184)
* SCB-2168 Upgrade jackson from 2.10.2 to 2.11.2
* SCB-2168 Upgrade jackson from 2.10.2 to 2.11.2
#2.11.2
需要依赖io.swagger升级到2.1.2版本之上，swagger在2.x后已经转移到io.swagger.core.v3,导致swagger模块变动较大，
#因此，升级到2.11.0，改版本暂时没有已知的重大漏洞
#，配套依赖swagger升级到1.6.x
* SCB-2168 Upgrade jackson from 2.10.5 to 2.12.0
#link issue SCB-2180 upgrade swagger from 1.5.24 to 1.6.2
---
.../servicecomb/common/rest/codec/TestRestObjectMapper.java | 4 ++--
.../org/apache/servicecomb/common/rest/codec/fix/TestDoSFix.java | 8 ++++----
.../servicecomb/common/rest/codec/param/TestCookieProcessor.java | 2 +-
.../servicecomb/common/rest/codec/param/TestHeaderProcessor.java | 2 +-
dependencies/default/pom.xml | 4 ++--
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git
a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/TestRestObjectMapper.java
b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/TestRestObjectMapper.java
index 6df01d9..c5a0d2d 100644
---
a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/TestRestObjectMapper.java
+++
b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/TestRestObjectMapper.java
@@ -43,11 +43,11 @@ public class TestRestObjectMapper {
// must read/write ISO 8061 dates
Date date = mapper.readValue("\"2017-07-21T17:32:28Z\"".getBytes(),
Date.class);
String dateStr = mapper.writeValueAsString(date);
- Assert.assertEquals(dateStr, "\"2017-07-21T17:32:28.000+0000\"");
+ Assert.assertEquals(dateStr, "\"2017-07-21T17:32:28.000+00:00\"");
date = mapper.readValue("\"2017-07-21T17:32:28.320+0100\"".getBytes(),
Date.class);
dateStr = mapper.writeValueAsString(date);
- Assert.assertEquals(dateStr, "\"2017-07-21T16:32:28.320+0000\""); // one
hour later
+ Assert.assertEquals(dateStr, "\"2017-07-21T16:32:28.320+00:00\""); // one
hour later
}
@Test
diff --git
a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/fix/TestDoSFix.java
b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/fix/TestDoSFix.java
index 6ce310d..3b28c13 100644
---
a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/fix/TestDoSFix.java
+++
b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/fix/TestDoSFix.java
@@ -130,11 +130,11 @@ public class TestDoSFix {
@Test
public void testChar() {
- batFastFail(char.class, InputCoercionException.class,
MismatchedInputException.class);
- batFastFail(Character.class, InputCoercionException.class,
MismatchedInputException.class);
+ batFastFail(char.class, InputCoercionException.class,
InvalidFormatException.class);
+ batFastFail(Character.class, InputCoercionException.class,
InvalidFormatException.class);
- batFastFail("cValue", JsonMappingException.class,
MismatchedInputException.class);
- batFastFail("cObjValue", JsonMappingException.class,
MismatchedInputException.class);
+ batFastFail("cValue", JsonMappingException.class,
InvalidFormatException.class);
+ batFastFail("cObjValue", JsonMappingException.class,
InvalidFormatException.class);
}
@Test
diff --git
a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestCookieProcessor.java
b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestCookieProcessor.java
index 2124b29..0fab41c 100644
---
a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestCookieProcessor.java
+++
b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestCookieProcessor.java
@@ -188,7 +188,7 @@ public class TestCookieProcessor {
@Test
public void testSetValueDateFixed() throws Exception {
Date date = new Date(1586957400199L);
- String strDate = "2020-04-15T13:30:00.199+0000";
+ String strDate = "2020-04-15T13:30:00.199+00:00";
createClientRequest();
diff --git
a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestHeaderProcessor.java
b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestHeaderProcessor.java
index f01bb36..866bb9a 100644
---
a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestHeaderProcessor.java
+++
b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestHeaderProcessor.java
@@ -225,7 +225,7 @@ public class TestHeaderProcessor {
@Test
public void testSetValueDateFixed() throws Exception {
Date date = new Date(1586957400199L);
- String strDate = "2020-04-15T13:30:00.199+0000";
+ String strDate = "2020-04-15T13:30:00.199+00:00";
createClientRequest();
diff --git a/dependencies/default/pom.xml b/dependencies/default/pom.xml
index 62837d3..27d0629 100644
--- a/dependencies/default/pom.xml
+++ b/dependencies/default/pom.xml
@@ -60,7 +60,7 @@
<hibernate-validator.version>6.1.5.Final</hibernate-validator.version>
<httpcomponents.version>4.5.7</httpcomponents.version>
<hystrix.version>1.5.18</hystrix.version>
- <jackson.version>2.10.5</jackson.version>
+ <jackson.version>2.12.0</jackson.version>
<javakaffee.version>0.26</javakaffee.version>
<javax-annotation.version>1.3.2</javax-annotation.version>
<javax-inject.version>1</javax-inject.version>
@@ -100,7 +100,7 @@
<spring.version>5.2.9.RELEASE</spring.version>
<spring-boot.version>2.3.4.RELEASE</spring-boot.version>
<stax2-api.version>4.2</stax2-api.version>
- <swagger.version>1.5.24</swagger.version>
+ <swagger.version>1.6.2</swagger.version>
<swagger2markup.version>1.3.3</swagger2markup.version>
<tcnetty.version>2.0.31.Final</tcnetty.version>
<tec-zkclient.version>0.10</tec-zkclient.version>
