diff --git a/examples/osgi-http-service/bundle/pom.xml b/examples/osgi-http-service/bundle/pom.xml
index 8ac57977e2..f29505ecbe 100644
--- a/examples/osgi-http-service/bundle/pom.xml
+++ b/examples/osgi-http-service/bundle/pom.xml
@@ -41,7 +41,8 @@
 
 -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
 
@@ -58,6 +59,10 @@
 
     <description>OSGi HttpService example bundle</description>
 
+    <properties>
+        <spring4.version>4.3.5.RELEASE_1</spring4.version>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.glassfish.jersey.containers</groupId>
@@ -77,6 +82,42 @@
             <artifactId>org.apache.felix.eventadmin</artifactId>
             <scope>provided</scope>
         </dependency>
+
+        <dependency>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.spring-beans</artifactId>
+            <version>${spring4.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.spring-core</artifactId>
+            <version>${spring4.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.spring-web</artifactId>
+            <version>${spring4.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.spring-aop</artifactId>
+            <version>${spring4.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.spring-context</artifactId>
+            <version>${spring4.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.spring-expression</artifactId>
+            <version>${spring4.version}</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -87,8 +128,22 @@
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
-                        <Export-Package>org.glassfish.jersey.examples.osgihttpservice</Export-Package>
-                        <Import-Package>javax.servlet.*;version="[2.4,5.0)",*</Import-Package>
+                        <Export-Package>
+                            org.glassfish.jersey.examples.osgihttpservice,
+                            org.glassfish.jersey.examples.osgihttpservice.spring
+                        </Export-Package>
+                        <Import-Package>
+                            javax.servlet.*;version="[3.0,5.0)",
+                            org.springframework.expression,
+                            org.springframework.beans.factory,
+                            org.springframework.beans.factory.xml,
+                            org.springframework.cglib.core,
+                            org.springframework.cglib.proxy,
+                            org.springframework.beans,
+                            org.springframework.context,
+                            org.springframework.context.config,
+                            *
+                        </Import-Package>
                         <Bundle-Activator>org.glassfish.jersey.examples.osgihttpservice.Activator</Bundle-Activator>
                         <Implementation-Title>jersey-osgi-http-service-bundle</Implementation-Title>
                         <Implementation-Version>${project.version}</Implementation-Version>
diff --git a/examples/osgi-http-service/bundle/src/main/java/org/glassfish/jersey/examples/osgihttpservice/Activator.java b/examples/osgi-http-service/bundle/src/main/java/org/glassfish/jersey/examples/osgihttpservice/Activator.java
index c87c40b410..eb0e365627 100644
--- a/examples/osgi-http-service/bundle/src/main/java/org/glassfish/jersey/examples/osgihttpservice/Activator.java
+++ b/examples/osgi-http-service/bundle/src/main/java/org/glassfish/jersey/examples/osgihttpservice/Activator.java
@@ -40,15 +40,7 @@
 
 package org.glassfish.jersey.examples.osgihttpservice;
 
-import java.util.Dictionary;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.logging.Logger;
-
-import javax.servlet.ServletException;
-
 import org.glassfish.jersey.servlet.ServletContainer;
-
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;
@@ -58,6 +50,10 @@
 import org.osgi.service.http.NamespaceException;
 import org.osgi.util.tracker.ServiceTracker;
 
+import javax.servlet.ServletException;
+import java.util.HashMap;
+import java.util.logging.Logger;
+
 public class Activator implements BundleActivator {
 
     private BundleContext bc;
@@ -119,7 +115,8 @@ private void rawRegisterServlets() throws ServletException, NamespaceException,
         ClassLoader originalContextClassLoader = Thread.currentThread().getContextClassLoader();
         try {
             Thread.currentThread().setContextClassLoader(myClassLoader);
-            httpService.registerServlet("/jersey-http-service", new ServletContainer(), getJerseyServletParams(), null);
+            ServletContainer servletToRegister = new ServletContainer(new JerseyApplication());
+            httpService.registerServlet("/jersey-http-service", servletToRegister, null, null);
         } finally {
             Thread.currentThread().setContextClassLoader(originalContextClassLoader);
         }
@@ -150,11 +147,4 @@ private void unregisterServlets() {
             logger.info("JERSEY BUNDLE: SERVLETS UNREGISTERED");
         }
     }
-
-    @SuppressWarnings("UseOfObsoleteCollectionType")
-    private Dictionary<String, String> getJerseyServletParams() {
-        Dictionary<String, String> jerseyServletParams = new Hashtable<>();
-        jerseyServletParams.put("javax.ws.rs.Application", JerseyApplication.class.getName());
-        return jerseyServletParams;
-    }
 }
diff --git a/examples/osgi-http-service/bundle/src/main/java/org/glassfish/jersey/examples/osgihttpservice/JerseyApplication.java b/examples/osgi-http-service/bundle/src/main/java/org/glassfish/jersey/examples/osgihttpservice/JerseyApplication.java
index 52714120f1..d343aec784 100644
--- a/examples/osgi-http-service/bundle/src/main/java/org/glassfish/jersey/examples/osgihttpservice/JerseyApplication.java
+++ b/examples/osgi-http-service/bundle/src/main/java/org/glassfish/jersey/examples/osgihttpservice/JerseyApplication.java
@@ -40,17 +40,16 @@
 
 package org.glassfish.jersey.examples.osgihttpservice;
 
-import java.util.HashSet;
-import java.util.Set;
-import javax.ws.rs.core.Application;
+import org.glassfish.jersey.server.ResourceConfig;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
 
-public class JerseyApplication extends Application {
+public class JerseyApplication extends ResourceConfig {
 
-    @Override
-    public Set<Class<?>> getClasses() {
-        Set<Class<?>> result = new HashSet<Class<?>>();
-        result.add(StatusResource.class);
-        return result;
-    }
+    public JerseyApplication() {
+        property("contextConfig", new ClassPathXmlApplicationContext(
+                "org/glassfish/jersey/examples/osgihttpservice/spring/spring-context.xml"));
 
+        packages(false, "org.glassfish.jersey.examples.osgihttpservice.spring");
+        register(StatusResource.class);
+    }
 }
diff --git a/examples/osgi-http-service/bundle/src/main/java/org/glassfish/jersey/examples/osgihttpservice/spring/SpringResource.java b/examples/osgi-http-service/bundle/src/main/java/org/glassfish/jersey/examples/osgihttpservice/spring/SpringResource.java
new file mode 100644
index 0000000000..37f3eea0e5
--- /dev/null
+++ b/examples/osgi-http-service/bundle/src/main/java/org/glassfish/jersey/examples/osgihttpservice/spring/SpringResource.java
@@ -0,0 +1,21 @@
+package org.glassfish.jersey.examples.osgihttpservice.spring;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+
+@Path("status2")
+@Named
+public class SpringResource {
+
+    @Inject
+    private StatusGenerator statusGenerator;
+
+    @GET
+    @Produces("text/plain")
+    public String getStatus() {
+        return statusGenerator.status();
+    }
+}
diff --git a/examples/osgi-http-service/bundle/src/main/java/org/glassfish/jersey/examples/osgihttpservice/spring/StatusGenerator.java b/examples/osgi-http-service/bundle/src/main/java/org/glassfish/jersey/examples/osgihttpservice/spring/StatusGenerator.java
new file mode 100644
index 0000000000..ccfa22dd22
--- /dev/null
+++ b/examples/osgi-http-service/bundle/src/main/java/org/glassfish/jersey/examples/osgihttpservice/spring/StatusGenerator.java
@@ -0,0 +1,6 @@
+package org.glassfish.jersey.examples.osgihttpservice.spring;
+
+public interface StatusGenerator {
+
+    String status();
+}
diff --git a/examples/osgi-http-service/bundle/src/main/java/org/glassfish/jersey/examples/osgihttpservice/spring/impl/DefaultStatusGenerator.java b/examples/osgi-http-service/bundle/src/main/java/org/glassfish/jersey/examples/osgihttpservice/spring/impl/DefaultStatusGenerator.java
new file mode 100644
index 0000000000..27231bd1d7
--- /dev/null
+++ b/examples/osgi-http-service/bundle/src/main/java/org/glassfish/jersey/examples/osgihttpservice/spring/impl/DefaultStatusGenerator.java
@@ -0,0 +1,11 @@
+package org.glassfish.jersey.examples.osgihttpservice.spring.impl;
+
+import org.glassfish.jersey.examples.osgihttpservice.spring.StatusGenerator;
+
+public class DefaultStatusGenerator implements StatusGenerator {
+
+    @Override
+    public String status() {
+        return "status from generator";
+    }
+}
diff --git a/examples/osgi-http-service/bundle/src/main/resources/org/glassfish/jersey/examples/osgihttpservice/spring/spring-context.xml b/examples/osgi-http-service/bundle/src/main/resources/org/glassfish/jersey/examples/osgihttpservice/spring/spring-context.xml
new file mode 100644
index 0000000000..6fb4f2f35f
--- /dev/null
+++ b/examples/osgi-http-service/bundle/src/main/resources/org/glassfish/jersey/examples/osgihttpservice/spring/spring-context.xml
@@ -0,0 +1,8 @@
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="
+       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+    <bean id="statusGenerator"
+          class="org.glassfish.jersey.examples.osgihttpservice.spring.impl.DefaultStatusGenerator"/>
+</beans>
\ No newline at end of file
diff --git a/examples/osgi-http-service/functional-test/pom.xml b/examples/osgi-http-service/functional-test/pom.xml
index 88c03f0ea2..ef7371318f 100644
--- a/examples/osgi-http-service/functional-test/pom.xml
+++ b/examples/osgi-http-service/functional-test/pom.xml
@@ -41,7 +41,8 @@
 
 -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
 
@@ -91,11 +92,13 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.framework</artifactId>
+            <version>5.6.10</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.eventadmin</artifactId>
+            <version>1.4.10</version>
             <scope>test</scope>
         </dependency>
 
@@ -103,15 +106,18 @@
         <dependency>
             <groupId>org.ops4j.pax.exam</groupId>
             <artifactId>pax-exam</artifactId>
+            <version>4.11.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.ops4j.pax.exam</groupId>
             <artifactId>pax-exam-junit4</artifactId>
+            <version>4.11.0</version>
         </dependency>
         <dependency>
             <groupId>org.ops4j.pax.exam</groupId>
             <artifactId>pax-exam-container-forked</artifactId>
+            <version>4.11.0</version>
         </dependency>
 
         <dependency>
@@ -122,11 +128,49 @@
         <dependency>
             <groupId>org.ops4j.pax.web</groupId>
             <artifactId>pax-web-jetty-bundle</artifactId>
+            <version>6.1.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.ops4j.pax.web</groupId>
-            <artifactId>pax-web-extender-war</artifactId>
+            <artifactId>pax-web-api</artifactId>
+            <version>6.1.1</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.web</groupId>
+            <artifactId>pax-web-spi</artifactId>
+            <version>6.1.1</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.xbean</groupId>
+            <artifactId>xbean-finder</artifactId>
+            <version>4.6</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.xbean</groupId>
+            <artifactId>xbean-bundleutils</artifactId>
+            <version>4.6</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.ow2.asm</groupId>
+            <artifactId>asm</artifactId>
+            <version>6.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.ow2.asm</groupId>
+            <artifactId>asm-tree</artifactId>
+            <version>6.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.ow2.asm</groupId>
+            <artifactId>asm-commons</artifactId>
+            <version>6.0</version>
             <scope>test</scope>
         </dependency>
 
@@ -159,6 +203,16 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.glassfish.jersey.ext</groupId>
+            <artifactId>jersey-spring4</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>${servlet3.version}</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -247,7 +301,7 @@
                             <configuration>
                                 <!-- disable JaCoCo listener because it's not working with <forkMode>always</fork> (<reuseForks>false</reuseForks> respectively)
                                 https://jira.sonarsource.com/browse/SONARJAVA-728 (https://github.com/SonarSource/sonar-java/pull/324) -->
-                                <properties combine.self="override" />
+                                <properties combine.self="override"/>
                             </configuration>
                         </plugin>
                     </plugins>
diff --git a/examples/osgi-http-service/functional-test/src/test/java/org/glassfish/jersey/examples/osgihttpservice/test/AbstractHttpServiceTest.java b/examples/osgi-http-service/functional-test/src/test/java/org/glassfish/jersey/examples/osgihttpservice/test/AbstractHttpServiceTest.java
index 740e699056..702243f37a 100644
--- a/examples/osgi-http-service/functional-test/src/test/java/org/glassfish/jersey/examples/osgihttpservice/test/AbstractHttpServiceTest.java
+++ b/examples/osgi-http-service/functional-test/src/test/java/org/glassfish/jersey/examples/osgihttpservice/test/AbstractHttpServiceTest.java
@@ -40,6 +40,21 @@
 
 package org.glassfish.jersey.examples.osgihttpservice.test;
 
+import org.glassfish.jersey.internal.util.PropertiesHelper;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.Option;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.BundleException;
+import org.osgi.service.event.Event;
+import org.osgi.service.event.EventConstants;
+import org.osgi.service.event.EventHandler;
+
+import javax.inject.Inject;
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.UriBuilder;
 import java.net.URI;
 import java.security.AccessController;
 import java.util.ArrayList;
@@ -53,23 +68,6 @@
 import java.util.concurrent.TimeoutException;
 import java.util.logging.Logger;
 
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.UriBuilder;
-
-import javax.inject.Inject;
-
-import org.glassfish.jersey.internal.util.PropertiesHelper;
-
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.BundleException;
-import org.osgi.service.event.Event;
-import org.osgi.service.event.EventConstants;
-import org.osgi.service.event.EventHandler;
 import static org.junit.Assert.assertEquals;
 import static org.ops4j.pax.exam.CoreOptions.junitBundles;
 import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
@@ -84,10 +82,14 @@ public abstract class AbstractHttpServiceTest {
     @Inject
     BundleContext bundleContext;
 
-    /** maximum waiting time for runtime initialization and Jersey deployment */
-    public static final long MAX_WAITING_SECONDS = 10L;
+    /**
+     * maximum waiting time for runtime initialization and Jersey deployment
+     */
+    public static final long MAX_WAITING_SECONDS = 60L;
 
-    /** Latch for blocking the testing thread until the runtime is ready and Jersey deployed */
+    /**
+     * Latch for blocking the testing thread until the runtime is ready and Jersey deployed
+     */
     final CountDownLatch countDownLatch = new CountDownLatch(1);
 
     private static final int port = getProperty("jersey.config.test.container.port", 8080);
@@ -102,8 +104,7 @@ public abstract class AbstractHttpServiceTest {
     public abstract List<Option> osgiRuntimeOptions();
 
     public List<Option> genericOsgiOptions() {
-        @SuppressWarnings("RedundantStringToString")
-        final String bundleLocation = mavenBundle()
+        @SuppressWarnings("RedundantStringToString") final String bundleLocation = mavenBundle()
                 .groupId("org.glassfish.jersey.examples.osgi-http-service")
                 .artifactId("bundle")
                 .versionAsInProject().getURL().toString();
@@ -115,7 +116,7 @@ public List<Option> genericOsgiOptions() {
                 systemProperty("org.osgi.framework.system.packages.extra").value("javax.annotation"),
 
                 // do not remove the following line
-                // systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("FINEST"),
+                systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("FINEST"),
 
                 // uncomment for logging (do not remove the following two lines)
                 // mavenBundle("org.ops4j.pax.logging", "pax-logging-api", "1.4"),
@@ -134,8 +135,35 @@ public List<Option> genericOsgiOptions() {
                 mavenBundle().groupId("org.glassfish.hk2").artifactId("hk2-utils").versionAsInProject(),
                 mavenBundle().groupId("org.glassfish.hk2.external").artifactId("javax.inject").versionAsInProject(),
                 mavenBundle().groupId("org.glassfish.hk2.external").artifactId("aopalliance-repackaged").versionAsInProject(),
+
+                // ASM
+                mavenBundle().groupId("org.ow2.asm").artifactId("asm").versionAsInProject(),
+                mavenBundle().groupId("org.ow2.asm").artifactId("asm-commons").versionAsInProject(),
+                mavenBundle().groupId("org.ow2.asm").artifactId("asm-tree").versionAsInProject(),
+
+                // xbean
+                mavenBundle().groupId("org.apache.xbean").artifactId("xbean-finder").versionAsInProject(),
+                mavenBundle().groupId("org.apache.xbean").artifactId("xbean-bundleutils").versionAsInProject(),
+
                 mavenBundle().groupId("org.javassist").artifactId("javassist").versionAsInProject(),
 
+                // Spring
+                mavenBundle().groupId("org.apache.servicemix.bundles").artifactId("org.apache.servicemix.bundles.spring-core")
+                        .versionAsInProject(),
+                mavenBundle().groupId("org.apache.servicemix.bundles").artifactId("org.apache.servicemix.bundles.spring-beans")
+                        .versionAsInProject(),
+                mavenBundle().groupId("org.apache.servicemix.bundles").artifactId("org.apache.servicemix.bundles.spring-aop")
+                        .versionAsInProject(),
+                mavenBundle().groupId("org.apache.servicemix.bundles").artifactId("org.apache.servicemix.bundles.spring-context")
+                        .versionAsInProject(),
+                mavenBundle().groupId("org.apache.servicemix.bundles").artifactId("org.apache.servicemix.bundles.spring-web")
+                        .versionAsInProject(),
+                mavenBundle().groupId("org.apache.servicemix.bundles")
+                        .artifactId("org.apache.servicemix.bundles.spring-expression")
+                        .versionAsInProject(),
+                mavenBundle().groupId("org.glassfish.jersey.ext").artifactId("jersey-spring4").versionAsInProject(),
+                mavenBundle().groupId("org.glassfish.hk2").artifactId("spring-bridge").versionAsInProject(),
+
                 // JAX-RS API
                 mavenBundle().groupId("javax.ws.rs").artifactId("javax.ws.rs-api").versionAsInProject(),
 
@@ -147,9 +175,9 @@ public List<Option> genericOsgiOptions() {
                 mavenBundle().groupId("org.glassfish.jersey.core").artifactId("jersey-server").versionAsInProject(),
                 mavenBundle().groupId("org.glassfish.jersey.core").artifactId("jersey-client").versionAsInProject(),
                 mavenBundle().groupId("org.glassfish.jersey.containers").artifactId("jersey-container-servlet-core")
-                .versionAsInProject(),
+                        .versionAsInProject(),
                 mavenBundle().groupId("org.glassfish.jersey.inject").artifactId("jersey-hk2").versionAsInProject()
-                ));
+        ));
 
         final String localRepository = AccessController.doPrivileged(PropertiesHelper.getSystemProperty("localRepository"));
         if (localRepository != null) {
@@ -162,14 +190,17 @@ public List<Option> genericOsgiOptions() {
 
     public List<Option> grizzlyOptions() {
         return Arrays.asList(options(
-                mavenBundle().groupId("com.sun.grizzly.osgi").artifactId("grizzly-httpservice-bundle").versionAsInProject()
+                mavenBundle().groupId("com.sun.grizzly.osgi").artifactId("grizzly-httpservice-bundle").versionAsInProject(),
+                mavenBundle().groupId("javax.servlet").artifactId("javax.servlet-api").versionAsInProject()
         ));
     }
 
     public List<Option> jettyOptions() {
         return Arrays.asList(options(
                 mavenBundle().groupId("org.ops4j.pax.web").artifactId("pax-web-jetty-bundle").versionAsInProject(),
-                mavenBundle().groupId("org.ops4j.pax.web").artifactId("pax-web-extender-war").versionAsInProject()));
+                mavenBundle().groupId("org.ops4j.pax.web").artifactId("pax-web-spi").versionAsInProject(),
+                mavenBundle().groupId("org.ops4j.pax.web").artifactId("pax-web-api").versionAsInProject()
+        ));
     }
 
     @SuppressWarnings("UnusedDeclaration")
@@ -243,10 +274,10 @@ public void defaultHttpServiceTestMethod() throws Exception {
         Client c = ClientBuilder.newClient();
         final WebTarget target = c.target(baseUri);
 
-        String result = target.path("/status").request().build("GET").invoke().readEntity(String.class);
+        String result = target.path("/status2").request().build("GET").invoke().readEntity(String.class);
 
         LOGGER.info("JERSEY RESULT = " + result);
-        assertEquals("active", result);
+        assertEquals("status from generator", result);
     }
 
     public static int getProperty(final String varName, int defaultValue) {
diff --git a/ext/spring4/pom.xml b/ext/spring4/pom.xml
index def7b32a2e..fea060048a 100644
--- a/ext/spring4/pom.xml
+++ b/ext/spring4/pom.xml
@@ -51,10 +51,10 @@
         <version>2.27-SNAPSHOT</version>
     </parent>
 
-    <artifactId>jersey-spring4</artifactId>
-    <name>jersey-spring4</name>
+	<artifactId>jersey-spring4</artifactId>
+	<name>jersey-spring4</name>
 
-    <packaging>jar</packaging>
+    <packaging>bundle</packaging>
 
     <description>
         Jersey extension module providing support for Spring 4 integration.
@@ -116,32 +116,26 @@
         </dependency>
 
         <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-beans</artifactId>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.spring-beans</artifactId>
             <version>${spring4.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-core</artifactId>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.spring-core</artifactId>
             <version>${spring4.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-logging</groupId>
-                    <artifactId>commons-logging</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.spring-web</artifactId>
             <version>${spring4.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-aop</artifactId>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.spring-aop</artifactId>
             <version>${spring4.version}</version>
         </dependency>
 
@@ -175,7 +169,7 @@
     </dependencies>
 
     <properties>
-        <spring4.version>4.3.4.RELEASE</spring4.version>
+        <spring4.version>4.3.5.RELEASE_1</spring4.version>
     </properties>
 
     <build>
@@ -190,6 +184,31 @@
                 <artifactId>build-helper-maven-plugin</artifactId>
                 <inherited>true</inherited>
             </plugin>
+
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Bundle-Name>${project.name}</Bundle-Name>
+                        <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
+                        <Import-Package>
+                            *
+                        </Import-Package>
+                    </instructions>
+                    <unpackBundle>true</unpackBundle>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>manifestAfterCompile</id>
+                        <phase>process-classes</phase>
+                        <goals>
+                            <goal>manifest</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/ext/spring4/src/main/java/org/glassfish/jersey/server/spring/SpringComponentProvider.java b/ext/spring4/src/main/java/org/glassfish/jersey/server/spring/SpringComponentProvider.java
index ac3954455e..4bf45595be 100644
--- a/ext/spring4/src/main/java/org/glassfish/jersey/server/spring/SpringComponentProvider.java
+++ b/ext/spring4/src/main/java/org/glassfish/jersey/server/spring/SpringComponentProvider.java
@@ -40,23 +40,14 @@
 
 package org.glassfish.jersey.server.spring;
 
-import java.util.Set;
-import java.util.function.Supplier;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.servlet.ServletContext;
-
 import org.glassfish.jersey.inject.hk2.ImmediateHk2InjectionManager;
 import org.glassfish.jersey.internal.inject.Binding;
 import org.glassfish.jersey.internal.inject.Bindings;
 import org.glassfish.jersey.internal.inject.InjectionManager;
 import org.glassfish.jersey.server.ApplicationHandler;
 import org.glassfish.jersey.server.spi.ComponentProvider;
-
 import org.jvnet.hk2.spring.bridge.api.SpringBridge;
 import org.jvnet.hk2.spring.bridge.api.SpringIntoHK2Bridge;
-
 import org.springframework.aop.framework.Advised;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -64,6 +55,12 @@
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
+import javax.servlet.ServletContext;
+import java.util.Set;
+import java.util.function.Supplier;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
 /**
  * Custom ComponentProvider class.
  * Responsible for 1) bootstrapping Jersey 2 Spring integration and
@@ -94,11 +91,15 @@ public void initialize(InjectionManager injectionManager) {
         if (sc != null) {
             // servlet container
             ctx = WebApplicationContextUtils.getWebApplicationContext(sc);
-        } else {
-            // non-servlet container
+        }
+
+        if (ctx == null) {
+            // still null, try to create one
             ctx = createSpringContext();
         }
+
         if (ctx == null) {
+            // still null, bail
             LOGGER.severe(LocalizationMessages.CTX_LOOKUP_FAILED());
             return;
         }
@@ -149,6 +150,7 @@ public void done() {
     }
 
     private ApplicationContext createSpringContext() {
+        LOGGER.info("create spring context");
         ApplicationHandler applicationHandler = injectionManager.getInstance(ApplicationHandler.class);
         ApplicationContext springContext = (ApplicationContext) applicationHandler.getConfiguration()
                 .getProperty(PARAM_SPRING_CONTEXT);