This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch 3.1.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git
commit c79a793fbd98e0461e2b3fbd8c47de2a3aa6453f Author: Colm O hEigeartaigh <[email protected]> AuthorDate: Wed Jan 17 12:15:37 2018 +0000 Recording .gitmergeinfo Changes --- .gitmergeinfo | 1 + .../policyvalidators/AbstractSupportingTokenPolicyValidator.java | 1 - .../org/apache/cxf/systest/sts/transport/TransportBindingTest.java | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmergeinfo b/.gitmergeinfo index ec06e8f..1255991 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -1046,6 +1046,7 @@ M ee248ce7a4a1b04bcbddbdcef82d695ccc140160 M ee62e3c371cd7d41796cba09f110f5cff12f5060 M eeae04330ebd610be9cb46891e9f05851afad2a4 M eec5aaf5a7974dffef5c25ddcbd1d0b3721660d0 +M ef477b7225535a3182694f4a99a949c7e4ce8803 M ef562f6c17a417081651d55364c4dc17191aa741 M ef8dda985d1fbe31812b932650026658032d3ec4 M efa3c8a93e85278a2f6eca5740b1b5aca6dd8f15 diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractSupportingTokenPolicyValidator.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractSupportingTokenPolicyValidator.java index 69afb7e..6ef9efc 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractSupportingTokenPolicyValidator.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractSupportingTokenPolicyValidator.java @@ -49,7 +49,6 @@ import org.apache.cxf.security.transport.TLSSessionInfo; import org.apache.cxf.ws.policy.AssertionInfo; import org.apache.cxf.ws.policy.AssertionInfoMap; import org.apache.cxf.ws.security.policy.PolicyUtils; -import org.apache.wss4j.common.WSS4JConstants; import org.apache.wss4j.common.saml.SAMLKeyInfo; import org.apache.wss4j.common.saml.SamlAssertionWrapper; import org.apache.wss4j.common.token.BinarySecurity; diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java index b87199c..92a170e 100644 --- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java +++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java @@ -459,8 +459,8 @@ public class TransportBindingTest extends AbstractBusClientServerTestBase { URL busFile = TransportBindingTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - BusFactory.setDefaultBus(bus); - BusFactory.setThreadDefaultBus(bus); + SpringBusFactory.setDefaultBus(bus); + SpringBusFactory.setThreadDefaultBus(bus); URL wsdl = TransportBindingTest.class.getResource("DoubleIt.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
