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/10/05 15:43:14 UTC

[1/2] cxf git commit: Fixing SSLv3 test on IBM JDK

Repository: cxf
Updated Branches:
  refs/heads/master caf903f11 -> 712e96428


Fixing SSLv3 test on IBM JDK


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

Branch: refs/heads/master
Commit: 712e96428c926bf8aedce8eb91c33d79801dd636
Parents: 321b2f8
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Mon Oct 5 14:39:39 2015 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Mon Oct 5 14:40:26 2015 +0100

----------------------------------------------------------------------
 .../org/apache/cxf/https/ssl3/SSLv3Test.java    | 25 ++++++++++++++++++++
 1 file changed, 25 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/712e9642/systests/transports-ssl3/src/test/java/org/apache/cxf/https/ssl3/SSLv3Test.java
----------------------------------------------------------------------
diff --git a/systests/transports-ssl3/src/test/java/org/apache/cxf/https/ssl3/SSLv3Test.java b/systests/transports-ssl3/src/test/java/org/apache/cxf/https/ssl3/SSLv3Test.java
index 44b5e4e..c7be234 100644
--- a/systests/transports-ssl3/src/test/java/org/apache/cxf/https/ssl3/SSLv3Test.java
+++ b/systests/transports-ssl3/src/test/java/org/apache/cxf/https/ssl3/SSLv3Test.java
@@ -104,6 +104,11 @@ public class SSLv3Test extends AbstractBusClientServerTestBase {
     
     @org.junit.Test
     public void testSSLv3ServerAllowed() throws Exception {
+        
+        // Doesn't work with IBM JDK 
+        if ("IBM Corporation".equals(System.getProperty("java.vendor"))) {
+            return;
+        }
 
         SpringBusFactory bf = new SpringBusFactory();
         URL busFile = SSLv3Test.class.getResource("sslv3-client.xml");
@@ -198,6 +203,11 @@ public class SSLv3Test extends AbstractBusClientServerTestBase {
     
     @org.junit.Test
     public void testClientSSL3Allowed() throws Exception {
+        // Doesn't work with IBM JDK 
+        if ("IBM Corporation".equals(System.getProperty("java.vendor"))) {
+            return;
+        }
+        
         SpringBusFactory bf = new SpringBusFactory();
         URL busFile = SSLv3Test.class.getResource("sslv3-client-allow.xml");
 
@@ -221,6 +231,11 @@ public class SSLv3Test extends AbstractBusClientServerTestBase {
     
     @org.junit.Test
     public void testAsyncClientSSL3Allowed() throws Exception {
+        // Doesn't work with IBM JDK 
+        if ("IBM Corporation".equals(System.getProperty("java.vendor"))) {
+            return;
+        }
+        
         SpringBusFactory bf = new SpringBusFactory();
         URL busFile = SSLv3Test.class.getResource("sslv3-client-allow.xml");
 
@@ -247,6 +262,11 @@ public class SSLv3Test extends AbstractBusClientServerTestBase {
  
     @org.junit.Test
     public void testTLSClientToEndpointWithSSL3Allowed() throws Exception {
+        // Doesn't work with IBM JDK 
+        if ("IBM Corporation".equals(System.getProperty("java.vendor"))) {
+            return;
+        }
+        
         SpringBusFactory bf = new SpringBusFactory();
         URL busFile = SSLv3Test.class.getResource("sslv3-client.xml");
 
@@ -270,6 +290,11 @@ public class SSLv3Test extends AbstractBusClientServerTestBase {
     
     @org.junit.Test
     public void testSSL3ClientToEndpointWithSSL3Allowed() throws Exception {
+        // Doesn't work with IBM JDK 
+        if ("IBM Corporation".equals(System.getProperty("java.vendor"))) {
+            return;
+        }
+        
         SpringBusFactory bf = new SpringBusFactory();
         URL busFile = SSLv3Test.class.getResource("sslv3-client-allow.xml");
 


[2/2] cxf git commit: Skip OSGi tests with IBM JDK

Posted by co...@apache.org.
Skip OSGi tests with IBM JDK


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

Branch: refs/heads/master
Commit: 321b2f8b66bf6b9d1fa68aba086c8cddf18070e3
Parents: caf903f
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Mon Oct 5 12:05:31 2015 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Mon Oct 5 14:40:26 2015 +0100

----------------------------------------------------------------------
 services/sts/systests/sts-itests/pom.xml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/321b2f8b/services/sts/systests/sts-itests/pom.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/sts-itests/pom.xml b/services/sts/systests/sts-itests/pom.xml
index 5bf4f7c..11b3940 100644
--- a/services/sts/systests/sts-itests/pom.xml
+++ b/services/sts/systests/sts-itests/pom.xml
@@ -164,4 +164,20 @@
             </plugins>
         </pluginManagement>
     </build>
+
+    <profiles>
+        <profile>
+            <id>ibm</id>
+            <activation>
+                <property>
+                    <name>java.vendor</name>
+                    <value>IBM Corporation</value>
+                </property>
+            </activation>
+            <properties>
+                <maven.test.skip>true</maven.test.skip>
+            </properties>
+         </profile>
+    </profiles>
+
 </project>