diff -Nru apache-cxf-3.1.4-src/core/src/main/java/org/apache/cxf/bus/osgi/CXFActivator.java apache-cxf-3.1.4-src.osgi/core/src/main/java/org/apache/cxf/bus/osgi/CXFActivator.java --- apache-cxf-3.1.4-src/core/src/main/java/org/apache/cxf/bus/osgi/CXFActivator.java 2015-10-30 21:06:12.000000000 +0100 +++ apache-cxf-3.1.4-src.osgi/core/src/main/java/org/apache/cxf/bus/osgi/CXFActivator.java 2016-08-08 18:08:51.049724693 +0200 @@ -94,7 +94,7 @@ Class<?> serviceClass, Object service, String servicePid) { - Properties props = new Properties(); + java.util.Dictionary<String,String> props = new java.util.Hashtable<String,String>(); props.put(Constants.SERVICE_PID, servicePid); return context.registerService(serviceClass.getName(), service, props); } diff -Nru apache-cxf-3.1.4-src/core/src/main/java/org/apache/cxf/bus/osgi/OSGIBusListener.java apache-cxf-3.1.4-src.osgi/core/src/main/java/org/apache/cxf/bus/osgi/OSGIBusListener.java --- apache-cxf-3.1.4-src/core/src/main/java/org/apache/cxf/bus/osgi/OSGIBusListener.java 2015-10-30 21:06:12.000000000 +0100 +++ apache-cxf-3.1.4-src.osgi/core/src/main/java/org/apache/cxf/bus/osgi/OSGIBusListener.java 2016-08-08 18:08:51.057724307 +0200 @@ -207,9 +207,9 @@ private void registerBusAsService() { BundleContext context = bus.getExtension(BundleContext.class); if (context != null) { - Properties props = new Properties(); + java.util.Dictionary<String,String> props = new java.util.Hashtable<String,String>(); props.put(CONTEXT_SYMBOLIC_NAME_PROPERTY, context.getBundle().getSymbolicName()); - props.put(CONTEXT_VERSION_PROPERTY, getBundleVersion(context.getBundle())); + props.put(CONTEXT_VERSION_PROPERTY, getBundleVersion(context.getBundle()).toString()); props.put(CONTEXT_NAME_PROPERTY, bus.getId()); service = context.registerService(Bus.class.getName(), bus, props); diff -Nru apache-cxf-3.1.4-src/rt/transports/http/src/main/java/org/apache/cxf/transport/http/osgi/HttpServiceTrackerCust.java apache-cxf-3.1.4-src.osgi/rt/transports/http/src/main/java/org/apache/cxf/transport/http/osgi/HttpServiceTrackerCust.java --- apache-cxf-3.1.4-src/rt/transports/http/src/main/java/org/apache/cxf/transport/http/osgi/HttpServiceTrackerCust.java 2015-10-30 21:06:13.000000000 +0100 +++ apache-cxf-3.1.4-src.osgi/rt/transports/http/src/main/java/org/apache/cxf/transport/http/osgi/HttpServiceTrackerCust.java 2016-08-08 18:08:51.191717842 +0200 @@ -64,7 +64,7 @@ HttpService httpService = (HttpService)context.getService(reference); Servlet servlet = new CXFNonSpringServlet(destinationRegistry, false); servletExporter = new ServletExporter(servlet, httpService); - Properties servProps = new Properties(); + java.util.Dictionary<String,String> servProps = new java.util.Hashtable<String,String>(); servProps.put(Constants.SERVICE_PID, CXF_CONFIG_PID); servletPublisherReg = context.registerService(ManagedService.class.getName(), servletExporter, servProps); diff -Nru apache-cxf-3.1.4-src/rt/transports/http/src/main/java/org/apache/cxf/transport/http/osgi/HTTPTransportActivator.java apache-cxf-3.1.4-src.osgi/rt/transports/http/src/main/java/org/apache/cxf/transport/http/osgi/HTTPTransportActivator.java --- apache-cxf-3.1.4-src/rt/transports/http/src/main/java/org/apache/cxf/transport/http/osgi/HTTPTransportActivator.java 2015-10-30 21:06:13.000000000 +0100 +++ apache-cxf-3.1.4-src.osgi/rt/transports/http/src/main/java/org/apache/cxf/transport/http/osgi/HTTPTransportActivator.java 2016-08-08 18:08:51.192717794 +0200 @@ -79,7 +79,7 @@ private ServiceRegistration registerService(BundleContext context, Class<?> serviceInterface, Object serviceObject, String servicePid) { - Properties servProps = new Properties(); + java.util.Dictionary<String,String> servProps = new java.util.Hashtable<String,String>(); servProps.put(Constants.SERVICE_PID, servicePid); return context.registerService(serviceInterface.getName(), serviceObject, servProps); } diff -Nru apache-cxf-3.1.4-src/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/osgi/HTTPJettyTransportActivator.java apache-cxf-3.1.4-src.osgi/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/osgi/HTTPJettyTransportActivator.java --- apache-cxf-3.1.4-src/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/osgi/HTTPJettyTransportActivator.java 2015-10-30 21:06:13.000000000 +0100 +++ apache-cxf-3.1.4-src.osgi/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/osgi/HTTPJettyTransportActivator.java 2016-08-08 18:08:51.196717601 +0200 @@ -72,7 +72,7 @@ public void start(BundleContext ctx) throws Exception { this.context = ctx; - Properties servProps = new Properties(); + java.util.Dictionary<String,String> servProps = new java.util.Hashtable<String,String>(); servProps.put(Constants.SERVICE_PID, FACTORY_PID); reg = context.registerService(ManagedServiceFactory.class.getName(), this, servProps);