Revert - JDK 19 fix (#7630)

square · Jan 5, 2023 · 46c15b6 · 46c15b6
1 parent 34b6053
commit 46c15b6
Showing 1 changed file with 13 additions and 15 deletions.
diff --git a/okhttp/src/jvmTest/java/okhttp3/internal/tls/CertificatePinnerChainValidationTest.java b/okhttp/src/jvmTest/java/okhttp3/internal/tls/CertificatePinnerChainValidationTest.java
@@ -15,21 +15,8 @@
  */
 package okhttp3.internal.tls;
 
-import java.security.GeneralSecurityException;
-import java.security.SecureRandom;
-import java.security.cert.X509Certificate;
-import java.util.Collections;
-import javax.net.ssl.KeyManager;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLHandshakeException;
-import javax.net.ssl.SSLPeerUnverifiedException;
-import javax.net.ssl.SSLSocketFactory;
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.X509KeyManager;
-import javax.net.ssl.X509TrustManager;
 import mockwebserver3.MockResponse;
 import mockwebserver3.MockWebServer;
-import mockwebserver3.SocketPolicy;
 import mockwebserver3.SocketPolicy.DisconnectAtEnd;
 import okhttp3.Call;
 import okhttp3.CertificatePinner;
@@ -46,6 +33,19 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
+import javax.net.ssl.KeyManager;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLHandshakeException;
+import javax.net.ssl.SSLPeerUnverifiedException;
+import javax.net.ssl.SSLSocketFactory;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509KeyManager;
+import javax.net.ssl.X509TrustManager;
+import java.security.GeneralSecurityException;
+import java.security.SecureRandom;
+import java.security.cert.X509Certificate;
+import java.util.Collections;
+
 import static okhttp3.tls.internal.TlsUtil.newKeyManager;
 import static okhttp3.tls.internal.TlsUtil.newTrustManager;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -182,7 +182,6 @@ public void setup(MockWebServer server) {
  // https://github.com/square/okhttp/issues/4729
  platform.expectFailureOnConscryptPlatform();
  platform.expectFailureOnCorrettoPlatform();
- platform.expectFailureFromJdkVersion(19);
 
  // Start with a trusted root CA certificate.
  HeldCertificate rootCa = new HeldCertificate.Builder()
@@ -263,7 +262,6 @@ public void setup(MockWebServer server) {
  // https://github.com/square/okhttp/issues/4729
  platform.expectFailureOnConscryptPlatform();
  platform.expectFailureOnCorrettoPlatform();
- platform.expectFailureFromJdkVersion(19);
 
  // Start with two root CA certificates, one is good and the other is compromised.
  HeldCertificate rootCa = new HeldCertificate.Builder()