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/03 16:21:23 UTC
[cxf] 01/02: Removing BouncyCastle where it's not needed in a
couple of testsd
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
commit ad579cdefe5ec49066ebc9d41db6c7b79eceb2c4
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Tue Apr 3 15:36:35 2018 +0100
Removing BouncyCastle where it's not needed in a couple of testsd
---
.../systest/jaxrs/security/jose/jwt/JWTAuthnAuthzTest.java | 14 --------------
.../systest/jaxrs/security/jose/jwt/JWTPropertiesTest.java | 14 --------------
2 files changed, 28 deletions(-)
diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwt/JWTAuthnAuthzTest.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwt/JWTAuthnAuthzTest.java
index 4d3c2f4..50367e7 100644
--- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwt/JWTAuthnAuthzTest.java
+++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwt/JWTAuthnAuthzTest.java
@@ -20,7 +20,6 @@
package org.apache.cxf.systest.jaxrs.security.jose.jwt;
import java.net.URL;
-import java.security.Security;
import java.time.Instant;
import java.util.ArrayList;
import java.util.Collections;
@@ -39,9 +38,7 @@ import org.apache.cxf.rs.security.jose.jwt.JwtConstants;
import org.apache.cxf.rs.security.jose.jwt.JwtToken;
import org.apache.cxf.systest.jaxrs.security.Book;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.junit.AfterClass;
import org.junit.BeforeClass;
/**
@@ -54,17 +51,6 @@ public class JWTAuthnAuthzTest extends AbstractBusClientServerTestBase {
public static void startServers() throws Exception {
assertTrue("server did not launch correctly",
launchServer(BookServerJwtAuthnAuthz.class, true));
- registerBouncyCastleIfNeeded();
- }
-
- private static void registerBouncyCastleIfNeeded() throws Exception {
- // Still need it for Oracle Java 7 and Java 8
- Security.addProvider(new BouncyCastleProvider());
- }
-
- @AfterClass
- public static void unregisterBouncyCastleIfNeeded() throws Exception {
- Security.removeProvider(BouncyCastleProvider.PROVIDER_NAME);
}
@org.junit.Test
diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwt/JWTPropertiesTest.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwt/JWTPropertiesTest.java
index cf2f1a8..81e892c 100644
--- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwt/JWTPropertiesTest.java
+++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwt/JWTPropertiesTest.java
@@ -20,7 +20,6 @@
package org.apache.cxf.systest.jaxrs.security.jose.jwt;
import java.net.URL;
-import java.security.Security;
import java.time.ZoneOffset;
import java.time.ZonedDateTime;
import java.util.ArrayList;
@@ -40,9 +39,7 @@ import org.apache.cxf.rs.security.jose.jwt.JwtConstants;
import org.apache.cxf.rs.security.jose.jwt.JwtToken;
import org.apache.cxf.systest.jaxrs.security.Book;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.junit.AfterClass;
import org.junit.BeforeClass;
/**
@@ -55,17 +52,6 @@ public class JWTPropertiesTest extends AbstractBusClientServerTestBase {
public static void startServers() throws Exception {
assertTrue("server did not launch correctly",
launchServer(BookServerJwtProperties.class, true));
- registerBouncyCastleIfNeeded();
- }
-
- private static void registerBouncyCastleIfNeeded() throws Exception {
- // Still need it for Oracle Java 7 and Java 8
- Security.addProvider(new BouncyCastleProvider());
- }
-
- @AfterClass
- public static void unregisterBouncyCastleIfNeeded() throws Exception {
- Security.removeProvider(BouncyCastleProvider.PROVIDER_NAME);
}
@org.junit.Test
--
To stop receiving notification emails like this one, please contact
coheigea@apache.org.