Fixing merge
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/bee60953 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/bee60953 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/bee60953 Branch: refs/heads/3.0.x-fixes Commit: bee60953d5f24318765676a2ca6a0805be8f13b8 Parents: ca46968 Author: Colm O hEigeartaigh <[email protected]> Authored: Wed Nov 4 17:54:23 2015 +0000 Committer: Colm O hEigeartaigh <[email protected]> Committed: Wed Nov 4 17:54:23 2015 +0000 ---------------------------------------------------------------------- .../cxf/systest/jaxrs/security/jose/jwejws/JAXRSJweJwsTest.java | 3 --- 1 file changed, 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/bee60953/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JAXRSJweJwsTest.java ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JAXRSJweJwsTest.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JAXRSJweJwsTest.java index 69683f8..b4a8eee 100644 --- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JAXRSJweJwsTest.java +++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JAXRSJweJwsTest.java @@ -47,11 +47,8 @@ import org.apache.cxf.rs.security.jose.jwe.AesWrapKeyEncryptionAlgorithm; import org.apache.cxf.rs.security.jose.jws.HmacJwsSignatureProvider; import org.apache.cxf.rs.security.jose.jws.JwsSignatureProvider; import org.apache.cxf.systest.jaxrs.security.Book; -<<<<<<< HEAD:systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jwt/JAXRSJweJwsTest.java import org.apache.cxf.systest.jaxrs.security.SecurityTestUtil; -======= import org.apache.cxf.systest.jaxrs.security.jose.BookStore; ->>>>>>> ecf6a38... Separate test classes + resources:systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JAXRSJweJwsTest.java import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase; import org.bouncycastle.jce.provider.BouncyCastleProvider;
