This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a commit to branch 3.2
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/3.2 by this push:
new cc95b52dfb Com.google.code.gson gson 2.11.0 (#14224)
cc95b52dfb is described below
commit cc95b52dfbed87cdcf72a3ab1176329c36595604
Author: 王聪洋 <[email protected]>
AuthorDate: Tue May 21 18:57:10 2024 +0800
Com.google.code.gson gson 2.11.0 (#14224)
* Bump com.google.code.gson:gson from 2.10.1 to 2.11.0
Bumps [com.google.code.gson:gson](https://github.com/google/gson) from
2.10.1 to 2.11.0.
- [Release notes](https://github.com/google/gson/releases)
- [Changelog](https://github.com/google/gson/blob/main/CHANGELOG.md)
-
[Commits](https://github.com/google/gson/compare/gson-parent-2.10.1...gson-parent-2.11.0)
---
updated-dependencies:
- dependency-name: com.google.code.gson:gson
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <[email protected]>
* fix testcase
* format code
---------
Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot]
<49699333+dependabot[bot]@users.noreply.github.com>
---
.../java/org/apache/dubbo/common/extension/ExtensionDirectorTest.java | 3 +--
.../src/test/java/org/apache/dubbo/common/json/GsonUtilsTest.java | 3 ++-
dubbo-dependencies-bom/pom.xml | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git
a/dubbo-common/src/test/java/org/apache/dubbo/common/extension/ExtensionDirectorTest.java
b/dubbo-common/src/test/java/org/apache/dubbo/common/extension/ExtensionDirectorTest.java
index 13f1945d18..e15ab27fde 100644
---
a/dubbo-common/src/test/java/org/apache/dubbo/common/extension/ExtensionDirectorTest.java
+++
b/dubbo-common/src/test/java/org/apache/dubbo/common/extension/ExtensionDirectorTest.java
@@ -45,8 +45,7 @@ class ExtensionDirectorTest {
// 2. Child ExtensionDirector can get extension instance from parent
// 3. Parent ExtensionDirector can't get extension instance from child
- ExtensionDirector fwExtensionDirector =
- new ExtensionDirector(null, ExtensionScope.FRAMEWORK,
FrameworkModel.defaultModel());
+ ExtensionDirector fwExtensionDirector =
FrameworkModel.defaultModel().getExtensionDirector();
ExtensionDirector appExtensionDirector =
new ExtensionDirector(fwExtensionDirector,
ExtensionScope.APPLICATION, ApplicationModel.defaultModel());
ExtensionDirector moduleExtensionDirector = new ExtensionDirector(
diff --git
a/dubbo-common/src/test/java/org/apache/dubbo/common/json/GsonUtilsTest.java
b/dubbo-common/src/test/java/org/apache/dubbo/common/json/GsonUtilsTest.java
index c28f4ad8da..2a4a5a9b1d 100644
--- a/dubbo-common/src/test/java/org/apache/dubbo/common/json/GsonUtilsTest.java
+++ b/dubbo-common/src/test/java/org/apache/dubbo/common/json/GsonUtilsTest.java
@@ -36,7 +36,8 @@ class GsonUtilsTest {
Assertions.fail();
} catch (RuntimeException ex) {
Assertions.assertEquals(
- "Generic serialization [gson] Json syntax exception thrown
when parsing (message:{'name':'Tom','age':} type:class
org.apache.dubbo.common.json.GsonUtilsTest$User)
error:com.google.gson.stream.MalformedJsonException: Expected value at line 1
column 21 path $.age",
+ "Generic serialization [gson] Json syntax exception thrown
when parsing (message:{'name':'Tom','age':} type:class
org.apache.dubbo.common.json.GsonUtilsTest$User)
error:com.google.gson.stream.MalformedJsonException: Expected value at line 1
column 21 path $.age\n"
+ + "See
https://github.com/google/gson/blob/main/Troubleshooting.md#malformed-json";,
ex.getMessage());
}
}
diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml
index 6144bf983b..e6badb7129 100644
--- a/dubbo-dependencies-bom/pom.xml
+++ b/dubbo-dependencies-bom/pom.xml
@@ -160,7 +160,7 @@
<snappy_java_version>1.1.10.5</snappy_java_version>
<bouncycastle-bcprov_version>1.70</bouncycastle-bcprov_version>
<metrics_version>2.0.6</metrics_version>
- <gson_version>2.10.1</gson_version>
+ <gson_version>2.11.0</gson_version>
<jackson_version>2.17.1</jackson_version>
<mortbay_jetty_version>6.1.26</mortbay_jetty_version>
<portlet_version>2.0</portlet_version>
