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 2018/04/16 14:35:19 UTC
[cxf] branch master updated: Getting rid of some java version
checks that are no longer needed
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new 19130e4 Getting rid of some java version checks that are no longer needed
19130e4 is described below
commit 19130e4d5ff7d9fe2d40a0e1ef6c7f8a34273cad
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Mon Apr 16 15:34:52 2018 +0100
Getting rid of some java version checks that are no longer needed
---
.../jaxrs/security/xml/JAXRSXmlSecTest.java | 12 -----
.../org/apache/cxf/systest/ws/gcm/GCMTest.java | 59 ----------------------
2 files changed, 71 deletions(-)
diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/JAXRSXmlSecTest.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/JAXRSXmlSecTest.java
index dd1b722..82c0537 100644
--- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/JAXRSXmlSecTest.java
+++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/JAXRSXmlSecTest.java
@@ -503,18 +503,6 @@ public class JAXRSXmlSecTest extends AbstractBusClientServerTestBase {
@Test
public void testPostEncryptedBookGCM() throws Exception {
- //
- // This test fails with the IBM JDK 7
- // IBM JDK 7 appears to require a GCMParameter class to be used, which
- // only exists in JDK 7. The Sun JDK appears to be more lenient and
- // allows us to use the existing IVParameterSpec class.
- //
- if ("IBM Corporation".equals(System.getProperty("java.vendor"))
- && System.getProperty("java.version") != null
- && System.getProperty("java.version").startsWith("1.7")) {
- return;
- }
-
String address = "https://localhost:" + test.port + "/xmlenc/bookstore/books";
Map<String, Object> properties = new HashMap<>();
properties.put(SecurityConstants.CALLBACK_HANDLER,
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/GCMTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/GCMTest.java
index 89872d0..75a5e45 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/GCMTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/GCMTest.java
@@ -106,17 +106,6 @@ public class GCMTest extends AbstractBusClientServerTestBase {
@org.junit.Test
public void testAESGCM128() throws Exception {
- //
- // This test fails with the IBM JDK 7
- // IBM JDK 7 appears to require a GCMParameter class to be used, which
- // only exists in JDK 7. The Sun JDK appears to be more lenient and
- // allows us to use the existing IVParameterSpec class.
- //
- if ("IBM Corporation".equals(System.getProperty("java.vendor"))
- && System.getProperty("java.version") != null
- && System.getProperty("java.version").startsWith("1.7")) {
- return;
- }
SpringBusFactory bf = new SpringBusFactory();
URL busFile = GCMTest.class.getResource("client.xml");
@@ -148,18 +137,6 @@ public class GCMTest extends AbstractBusClientServerTestBase {
return;
}
- //
- // This test fails with the IBM JDK 7
- // IBM JDK 7 appears to require a GCMParameter class to be used, which
- // only exists in JDK 7. The Sun JDK appears to be more lenient and
- // allows us to use the existing IVParameterSpec class.
- //
- if ("IBM Corporation".equals(System.getProperty("java.vendor"))
- && System.getProperty("java.version") != null
- && System.getProperty("java.version").startsWith("1.7")) {
- return;
- }
-
SpringBusFactory bf = new SpringBusFactory();
URL busFile = GCMTest.class.getResource("client.xml");
@@ -191,18 +168,6 @@ public class GCMTest extends AbstractBusClientServerTestBase {
return;
}
- //
- // This test fails with the IBM JDK 7
- // IBM JDK 7 appears to require a GCMParameter class to be used, which
- // only exists in JDK 7. The Sun JDK appears to be more lenient and
- // allows us to use the existing IVParameterSpec class.
- //
- if ("IBM Corporation".equals(System.getProperty("java.vendor"))
- && System.getProperty("java.version") != null
- && System.getProperty("java.version").startsWith("1.7")) {
- return;
- }
-
SpringBusFactory bf = new SpringBusFactory();
URL busFile = GCMTest.class.getResource("client.xml");
@@ -233,18 +198,6 @@ public class GCMTest extends AbstractBusClientServerTestBase {
return;
}
- //
- // This test fails with the IBM JDK 7
- // IBM JDK 7 appears to require a GCMParameter class to be used, which
- // only exists in JDK 7. The Sun JDK appears to be more lenient and
- // allows us to use the existing IVParameterSpec class.
- //
- if ("IBM Corporation".equals(System.getProperty("java.vendor"))
- && System.getProperty("java.version") != null
- && System.getProperty("java.version").startsWith("1.7")) {
- return;
- }
-
SpringBusFactory bf = new SpringBusFactory();
URL busFile = GCMTest.class.getResource("mgf-client.xml");
@@ -281,18 +234,6 @@ public class GCMTest extends AbstractBusClientServerTestBase {
return;
}
- //
- // This test fails with the IBM JDK 7
- // IBM JDK 7 appears to require a GCMParameter class to be used, which
- // only exists in JDK 7. The Sun JDK appears to be more lenient and
- // allows us to use the existing IVParameterSpec class.
- //
- if ("IBM Corporation".equals(System.getProperty("java.vendor"))
- && System.getProperty("java.version") != null
- && System.getProperty("java.version").startsWith("1.7")) {
- return;
- }
-
SpringBusFactory bf = new SpringBusFactory();
URL busFile = GCMTest.class.getResource("mgf-client.xml");
--
To stop receiving notification emails like this one, please contact
coheigea@apache.org.