Skip to content

Commit ac2f1f6

Browse files
authored
remove okhttp3 dependency management (#4899)
1 parent 4ee2d55 commit ac2f1f6

File tree

3 files changed

+2
-22
lines changed

3 files changed

+2
-22
lines changed

core/src/test/java/org/apache/servicecomb/core/filter/impl/ProducerOperationFilterTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,8 +189,7 @@ public void should_unify_IllegalArgumentException_message_when_convert_exception
189189
assertThat(future)
190190
.failsWithin(Duration.ofSeconds(1))
191191
.withThrowableOfType(ExecutionException.class)
192-
.withCauseExactlyInstanceOf(IllegalArgumentException.class)
193-
.withMessage("java.lang.IllegalArgumentException: wrong number of arguments");
192+
.withCauseExactlyInstanceOf(IllegalArgumentException.class);
194193

195194
InvocationException throwable = Exceptions
196195
.convert(invocation, catchThrowable(future::get), INTERNAL_SERVER_ERROR);

dependencies/default/pom.xml

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@
7171
<mock-server.version>5.15.0</mock-server.version>
7272
<nacos-client.version>3.0.2</nacos-client.version>
7373
<netflix-commons.version>0.3.0</netflix-commons.version>
74-
<okhttp3.version>4.12.0</okhttp3.version>
7574
<prometheus.version>0.16.0</prometheus.version>
7675
<protobuf.version>3.23.4</protobuf.version>
7776
<protostuff.version>1.8.0</protostuff.version>
@@ -192,18 +191,6 @@
192191
<scope>test</scope>
193192
</dependency>
194193

195-
<dependency>
196-
<groupId>com.squareup.okhttp3</groupId>
197-
<artifactId>okhttp</artifactId>
198-
<version>${okhttp3.version}</version>
199-
</dependency>
200-
201-
<dependency>
202-
<groupId>com.squareup.okhttp3</groupId>
203-
<artifactId>mockwebserver</artifactId>
204-
<version>${okhttp3.version}</version>
205-
</dependency>
206-
207194
<dependency>
208195
<groupId>commons-beanutils</groupId>
209196
<artifactId>commons-beanutils</artifactId>

foundations/foundation-ssl/src/test/java/org/apache/servicecomb/foundation/ssl/KeyStoreUtilTest.java

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,12 @@
2626
import java.security.cert.CertificateFactory;
2727
import java.util.Collection;
2828

29-
import org.apache.commons.lang3.SystemUtils;
3029
import org.junit.Test;
3130
import org.junit.jupiter.api.Assertions;
32-
import org.mockito.Mockito;
3331

3432
import mockit.Mock;
3533
import mockit.MockUp;
34+
import org.mockito.Mockito;
3635

3736
public class KeyStoreUtilTest {
3837
final String strFilePath = Thread.currentThread().getContextClassLoader().getResource("").getPath();
@@ -78,14 +77,9 @@ public void testCreateKeyManagersException() {
7877
try {
7978
KeyStoreUtil.createKeyManagers(keystore, storeKeyValue);
8079
} catch (IllegalArgumentException e) {
81-
if (SystemUtils.JAVA_SPECIFICATION_VERSION.startsWith("17")) {
8280
Assertions.assertEquals("Bad key store.Get Key failed:"
8381
+ " Cannot read the array length because \"password\" is null",
8482
e.getMessage());
85-
} else {
86-
Assertions.assertEquals("Bad key store.Get Key failed: null",
87-
e.getMessage());
88-
}
8983
}
9084
}
9185

0 commit comments

Comments
 (0)