Repository: cxf Updated Branches: refs/heads/master 5b4275ce2 -> 95f4daedb
Fix eclipse warnings Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/95f4daed Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/95f4daed Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/95f4daed Branch: refs/heads/master Commit: 95f4daedb6b856b1a4009b7531c67dea8a626d07 Parents: 5b4275c Author: Daniel Kulp <[email protected]> Authored: Thu May 4 16:06:34 2017 -0400 Committer: Daniel Kulp <[email protected]> Committed: Thu May 4 16:06:34 2017 -0400 ---------------------------------------------------------------------- .../test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java | 2 +- .../src/test/java/org/apache/cxf/jaxws/JaxWsClientTest.java | 2 -- .../org/apache/cxf/systest/https/conduit/HTTPSClientTest.java | 4 ++-- 3 files changed, 3 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/95f4daed/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java ---------------------------------------------------------------------- diff --git a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java index 5773e18..280a0f2 100644 --- a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java +++ b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java @@ -177,7 +177,7 @@ public class CXFOSGiTestSupport { public void assertServicePublished(String filter, int timeout) { try { Filter serviceFilter = bundleContext.createFilter(filter); - ServiceTracker tracker = new ServiceTracker(bundleContext, serviceFilter, null); + ServiceTracker<?, ?> tracker = new ServiceTracker<>(bundleContext, serviceFilter, null); tracker.open(); Object service = tracker.waitForService(timeout); tracker.close(); http://git-wip-us.apache.org/repos/asf/cxf/blob/95f4daed/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JaxWsClientTest.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JaxWsClientTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JaxWsClientTest.java index 2817d1b..7aaa08e 100644 --- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JaxWsClientTest.java +++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JaxWsClientTest.java @@ -54,8 +54,6 @@ import org.apache.hello_world_soap_http.GreeterImpl; import org.junit.Before; import org.junit.Test; -import static org.junit.Assert.assertFalse; - public class JaxWsClientTest extends AbstractJaxWsTest { private final QName serviceName = new QName("http://apache.org/hello_world_soap_http";, http://git-wip-us.apache.org/repos/asf/cxf/blob/95f4daed/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSClientTest.java ---------------------------------------------------------------------- diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSClientTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSClientTest.java index 7b71db9..ec0f0ac 100644 --- a/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSClientTest.java +++ b/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSClientTest.java @@ -207,7 +207,7 @@ public class HTTPSClientTest extends AbstractBusClientServerTestBase { tmt.setKeyStore(kst); try { - return TLSParameterJaxBUtils.getTrustManagers(tmt); + return TLSParameterJaxBUtils.getTrustManagers(tmt, false); } catch (Exception e) { throw new RuntimeException("failed to retrieve trust managers", e); } @@ -240,7 +240,7 @@ public class HTTPSClientTest extends AbstractBusClientServerTestBase { tmt.setKeyStore(kst); try { - return TLSParameterJaxBUtils.getTrustManagers(tmt); + return TLSParameterJaxBUtils.getTrustManagers(tmt, false); } catch (Exception e) { throw new RuntimeException("failed to retrieve trust managers", e); }
