From 93a29d70ff1b4803237bdc04cedd41459e4e7b66 Mon Sep 17 00:00:00 2001 From: Jamie Goodyear Date: Wed, 3 Apr 2024 15:27:51 -0230 Subject: [PATCH] [CXF-8997] AbstractSTSTokenTest and TransportBindingTests no longer need to set https protocol to TLSv1 on IBM Java (#1785) --- .../systest/sts/stsclient/AbstractSTSTokenTest.java | 5 ----- .../systest/sts/transport/TransportBindingTest.java | 10 ---------- 2 files changed, 15 deletions(-) diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/AbstractSTSTokenTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/AbstractSTSTokenTest.java index 74666f23d77..fe7be5863cd 100644 --- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/AbstractSTSTokenTest.java +++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/AbstractSTSTokenTest.java @@ -161,11 +161,6 @@ public boolean verify(String hostname, javax.net.ssl.SSLSession sslSession) { SSLContext sc = SSLUtils.getSSLContext(TLSClientParametersUtils.getTLSClientParameters()); HttpsURLConnection.setDefaultSSLSocketFactory(sc.getSocketFactory()); - - // Needed to prevent test failure using IBM JDK - if ("IBM Corporation".equals(System.getProperty("java.vendor"))) { - System.setProperty("https.protocols", "TLSv1"); - } } static void validateSecurityToken(SecurityToken token) { diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java index d6c29e1e54f..26c89f20489 100644 --- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java +++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java @@ -302,11 +302,6 @@ public void testUnknownAddress() throws Exception { @org.junit.Test public void testSAML2Dispatch() throws Exception { - // Needed to prevent test failure using IBM JDK - if ("IBM Corporation".equals(System.getProperty("java.vendor"))) { - System.setProperty("https.protocols", "TLSv1"); - } - createBus(getClass().getResource("cxf-client.xml").toString()); URL wsdl = TransportBindingTest.class.getResource("DoubleIt.wsdl"); @@ -342,11 +337,6 @@ public void testSAML2Dispatch() throws Exception { @org.junit.Test public void testSAML2DispatchLocation() throws Exception { - // Needed to prevent test failure using IBM JDK - if ("IBM Corporation".equals(System.getProperty("java.vendor"))) { - System.setProperty("https.protocols", "TLSv1"); - } - createBus(getClass().getResource("cxf-client.xml").toString()); URL wsdl = TransportBindingTest.class.getResource("DoubleIt.wsdl");