(servicecomb-java-chassis) branch master updated: remove okhttp3 dependency management (#4899)

[liubao]

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 ac2f1f6db remove okhttp3 dependency management (#4899)
ac2f1f6db is described below

commit ac2f1f6db5bdab665ce88960ca3834052c8091c1
Author: liubao68 <liubao68...@163.com>
AuthorDate: Tue Aug 5 14:54:56 2025 +0800

    remove okhttp3 dependency management (#4899)
---
 .../core/filter/impl/ProducerOperationFilterTest.java       |  3 +--
 dependencies/default/pom.xml                                | 13 -------------
 .../apache/servicecomb/foundation/ssl/KeyStoreUtilTest.java |  8 +-------
 3 files changed, 2 insertions(+), 22 deletions(-)

diff --git 
a/core/src/test/java/org/apache/servicecomb/core/filter/impl/ProducerOperationFilterTest.java
 
b/core/src/test/java/org/apache/servicecomb/core/filter/impl/ProducerOperationFilterTest.java
index 4531895e9..dd46b17d2 100644
--- 
a/core/src/test/java/org/apache/servicecomb/core/filter/impl/ProducerOperationFilterTest.java
+++ 
b/core/src/test/java/org/apache/servicecomb/core/filter/impl/ProducerOperationFilterTest.java
@@ -189,8 +189,7 @@ public class ProducerOperationFilterTest {
     assertThat(future)
         .failsWithin(Duration.ofSeconds(1))
         .withThrowableOfType(ExecutionException.class)
-        .withCauseExactlyInstanceOf(IllegalArgumentException.class)
-        .withMessage("java.lang.IllegalArgumentException: wrong number of 
arguments");
+        .withCauseExactlyInstanceOf(IllegalArgumentException.class);
 
     InvocationException throwable = Exceptions
         .convert(invocation, catchThrowable(future::get), 
INTERNAL_SERVER_ERROR);
diff --git a/dependencies/default/pom.xml b/dependencies/default/pom.xml
index b79037029..9e729c44c 100644
--- a/dependencies/default/pom.xml
+++ b/dependencies/default/pom.xml
@@ -71,7 +71,6 @@
     <mock-server.version>5.15.0</mock-server.version>
     <nacos-client.version>3.0.2</nacos-client.version>
     <netflix-commons.version>0.3.0</netflix-commons.version>
-    <okhttp3.version>4.12.0</okhttp3.version>
     <prometheus.version>0.16.0</prometheus.version>
     <protobuf.version>3.23.4</protobuf.version>
     <protostuff.version>1.8.0</protostuff.version>
@@ -192,18 +191,6 @@
         <scope>test</scope>
       </dependency>
 
-      <dependency>
-        <groupId>com.squareup.okhttp3</groupId>
-        <artifactId>okhttp</artifactId>
-        <version>${okhttp3.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>com.squareup.okhttp3</groupId>
-        <artifactId>mockwebserver</artifactId>
-        <version>${okhttp3.version}</version>
-      </dependency>
-
       <dependency>
         <groupId>commons-beanutils</groupId>
         <artifactId>commons-beanutils</artifactId>
diff --git 
a/foundations/foundation-ssl/src/test/java/org/apache/servicecomb/foundation/ssl/KeyStoreUtilTest.java
 
b/foundations/foundation-ssl/src/test/java/org/apache/servicecomb/foundation/ssl/KeyStoreUtilTest.java
index f7d046f65..549551390 100644
--- 
a/foundations/foundation-ssl/src/test/java/org/apache/servicecomb/foundation/ssl/KeyStoreUtilTest.java
+++ 
b/foundations/foundation-ssl/src/test/java/org/apache/servicecomb/foundation/ssl/KeyStoreUtilTest.java
@@ -26,13 +26,12 @@ import java.security.cert.CertificateException;
 import java.security.cert.CertificateFactory;
 import java.util.Collection;
 
-import org.apache.commons.lang3.SystemUtils;
 import org.junit.Test;
 import org.junit.jupiter.api.Assertions;
-import org.mockito.Mockito;
 
 import mockit.Mock;
 import mockit.MockUp;
+import org.mockito.Mockito;
 
 public class KeyStoreUtilTest {
   final String strFilePath = 
Thread.currentThread().getContextClassLoader().getResource("").getPath();
@@ -78,14 +77,9 @@ public class KeyStoreUtilTest {
     try {
       KeyStoreUtil.createKeyManagers(keystore, storeKeyValue);
     } catch (IllegalArgumentException e) {
-      if (SystemUtils.JAVA_SPECIFICATION_VERSION.startsWith("17")) {
         Assertions.assertEquals("Bad key store.Get Key failed:"
                         + " Cannot read the array length because \"password\" 
is null",
                 e.getMessage());
-      } else {
-        Assertions.assertEquals("Bad key store.Get Key failed: null",
-                e.getMessage());
-      }
     }
   }