Repository: cxf Updated Branches: refs/heads/3.0.x-fixes 1933ae27d -> 18de76943
Skipping AES GCM JweJson test in 3.0.x if Java6 is used Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/18de7694 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/18de7694 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/18de7694 Branch: refs/heads/3.0.x-fixes Commit: 18de76943ea1b547890107fb0ff802258235df42 Parents: 1933ae2 Author: Sergey Beryozkin <sberyoz...@gmail.com> Authored: Tue Mar 15 14:25:23 2016 +0000 Committer: Sergey Beryozkin <sberyoz...@gmail.com> Committed: Tue Mar 15 14:25:23 2016 +0000 ---------------------------------------------------------------------- .../systest/jaxrs/security/jose/jwejws/JAXRSJweJsonTest.java | 8 ++++++++ 1 file changed, 8 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/18de7694/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JAXRSJweJsonTest.java ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JAXRSJweJsonTest.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JAXRSJweJsonTest.java index 83832ac..8878b35 100644 --- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JAXRSJweJsonTest.java +++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JAXRSJweJsonTest.java @@ -42,7 +42,12 @@ import org.junit.Test; public class JAXRSJweJsonTest extends AbstractBusClientServerTestBase { public static final String PORT = BookServerJweJson.PORT; + private static final Boolean SKIP_AES_GCM_TESTS = isJava6(); + private static boolean isJava6() { + String version = System.getProperty("java.version"); + return 1.6D == Double.parseDouble(version.substring(0, 3)); + } @BeforeClass public static void startServers() throws Exception { assertTrue("server did not launch correctly", @@ -60,6 +65,9 @@ public class JAXRSJweJsonTest extends AbstractBusClientServerTestBase { @Test public void testJweJsonPlainTextHmac() throws Exception { + if (SKIP_AES_GCM_TESTS) { + return; + } String address = "https://localhost:" + PORT + "/jwejsonhmac"; BookStore bs = createBookStore(address, "org/apache/cxf/systest/jaxrs/security/secret.jwk.properties",