cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [1/2] cxf git commit: Fixing failing test on JDK6
Date Wed, 13 May 2015 10:16:14 GMT
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 6c174a500 -> 06bb31c09


Fixing failing test on JDK6


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/84f2049b
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/84f2049b
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/84f2049b

Branch: refs/heads/3.0.x-fixes
Commit: 84f2049ba67df0c1c2b6613849a118c9f2dc036b
Parents: 6c174a5
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Wed May 13 10:16:20 2015 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Wed May 13 10:16:20 2015 +0100

----------------------------------------------------------------------
 .../cxf/systest/https/ciphersuites/CipherSuitesTest.java      | 7 +++++++
 1 file changed, 7 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/84f2049b/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 e66504a..d62ec5e 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
@@ -530,6 +530,13 @@ public class CipherSuitesTest extends AbstractBusClientServerTestBase
{
     // Both client + server include AES, client is TLSv1.1
     @org.junit.Test
     public void testAESIncludedTLSv11() throws Exception {
+        // TLS v1.1 not supported in JDK1.6
+        if (System.getProperty("java.version") != null
+            && System.getProperty("java.version").startsWith("1.6")) {
+            return;
+        }
+
+        
         SpringBusFactory bf = new SpringBusFactory();
         URL busFile = CipherSuitesTest.class.getResource("ciphersuites-client-noconfig.xml");
 


Mime
View raw message