bugfix:fix ClassNotFoundException during the ZK unit test (#5101)

apache · Nov 24, 2022 · 6673078 · 6673078
1 parent cda49cc
commit 6673078
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 3 deletions.
diff --git a/changes/en-us/develop.md b/changes/en-us/develop.md
@@ -73,8 +73,9 @@ Add changes here for all PR submitted to the develop branch.
 
 
 ### test:
+- [[#4411](https://github.com/seata/seata/pull/4411)] add UT for oracle in AT mode
 - [[#4794](https://github.com/seata/seata/pull/4794)] try to fix the test `DataSourceProxyTest.getResourceIdTest()`
-
+- [[#5101](https://github.com/seata/seata/pull/5101)] fix ClassNotFoundException during the zk unit test
 
 Thanks to these contributors for their code commits. Please report an unintended omission.
 
@@ -102,6 +103,6 @@ Thanks to these contributors for their code commits. Please report an unintended
 - [zhangzq7](https://github.com/zhangzq7)
 - [l81893521](https://github.com/l81893521)
 - [zhuyoufeng](https://github.com/zhuyoufeng)
-
+- [xingfudeshi](https://github.com/xingfudeshi)
 
 Also, we receive many valuable issues, questions and advices from our community. Thanks for you all.
diff --git a/changes/zh-cn/develop.md b/changes/zh-cn/develop.md
@@ -74,6 +74,7 @@
 ### test：
 - [[#4411](https://github.com/seata/seata/pull/4411)] 测试Oracle数据库AT模式下类型支持
 - [[#4794](https://github.com/seata/seata/pull/4794)] 重构代码，尝试修复单元测试 `DataSourceProxyTest.getResourceIdTest()`
+- [[#5101](https://github.com/seata/seata/pull/5101)] 修复zk注册和配置中心报ClassNotFoundException的问题 `DataSourceProxyTest.getResourceIdTest()`
 
 
 非常感谢以下 contributors 的代码贡献。若有无意遗漏，请报告。
@@ -104,5 +105,5 @@
 - [zhangzq7](https://github.com/zhangzq7)
 - [l81893521](https://github.com/l81893521)
 - [zhuyoufeng](https://github.com/zhuyoufeng)
-
+- [xingfudeshi](https://github.com/xingfudeshi)
 同时，我们收到了社区反馈的很多有价值的issue和建议，非常感谢大家。
diff --git a/dependencies/pom.xml b/dependencies/pom.xml
@@ -111,6 +111,7 @@
         <junit-platform.version>1.8.2</junit-platform.version>
         <mockito.version>2.23.4</mockito.version>
         <assertj-core.version>3.12.2</assertj-core.version>
+        <jetty-version>9.4.38.v20210224</jetty-version>
     </properties>
 
     <dependencyManagement>
@@ -691,6 +692,16 @@
                     </exclusion>
                 </exclusions>
             </dependency>
+            <dependency>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-security</artifactId>
+                <version>${jetty-version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-servlet</artifactId>
+                <version>${jetty-version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 </project>
diff --git a/discovery/seata-discovery-zk/pom.xml b/discovery/seata-discovery-zk/pom.xml
@@ -47,5 +47,16 @@
             <artifactId>curator-test</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-security</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-servlet</artifactId>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
 </project>