You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2015/03/19 18:27:27 UTC
cxf git commit: Ignoring TLSv1.2 tests on JDK 1.6
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes 426dbdc11 -> 2e0d84711
Ignoring TLSv1.2 tests on JDK 1.6
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/2e0d8471
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/2e0d8471
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/2e0d8471
Branch: refs/heads/3.0.x-fixes
Commit: 2e0d84711a94a946aeff82e01f21412212f1fbd9
Parents: 426dbdc
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Thu Mar 19 17:27:07 2015 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Thu Mar 19 17:27:07 2015 +0000
----------------------------------------------------------------------
.../systest/https/ciphersuites/CipherSuitesTest.java | 12 ++++++++++++
1 file changed, 12 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/2e0d8471/systests/transports/src/test/java/org/apache/cxf/systest/https/ciphersuites/CipherSuitesTest.java
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/https/ciphersuites/CipherSuitesTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/https/ciphersuites/CipherSuitesTest.java
index a38f6ff..c363cc7 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/https/ciphersuites/CipherSuitesTest.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/https/ciphersuites/CipherSuitesTest.java
@@ -455,6 +455,12 @@ public class CipherSuitesTest extends AbstractBusClientServerTestBase {
// Both client + server include AES, client enables a TLS v1.2 CipherSuite
@org.junit.Test
public void testAESIncludedTLSv12() throws Exception {
+ // TLS v1.2 ciphersuites not supported in JDK 1.6
+ String javaVersion = System.getProperty("java.version");
+ if (javaVersion != null && javaVersion.contains("1.6")) {
+ return;
+ }
+
SpringBusFactory bf = new SpringBusFactory();
URL busFile = CipherSuitesTest.class.getResource("ciphersuites-client-tlsv12.xml");
@@ -479,6 +485,12 @@ public class CipherSuitesTest extends AbstractBusClientServerTestBase {
// Both client + server include AES, client enables a TLS v1.2 CipherSuite
@org.junit.Test
public void testAESIncludedTLSv12ViaCode() throws Exception {
+ // TLS v1.2 ciphersuites not supported in JDK 1.6
+ String javaVersion = System.getProperty("java.version");
+ if (javaVersion != null && javaVersion.contains("1.6")) {
+ return;
+ }
+
SpringBusFactory bf = new SpringBusFactory();
URL busFile = CipherSuitesTest.class.getResource("ciphersuites-client-noconfig.xml");