keycloak-uncached

diff --git a/adapters/oidc/fuse7/jetty94/pom.xml b/adapters/oidc/fuse7/jetty94/pom.xml
index cdf0fc0..5b8bfe0 100644
--- a/adapters/oidc/fuse7/jetty94/pom.xml
+++ b/adapters/oidc/fuse7/jetty94/pom.xml
@@ -36,6 +36,7 @@
         </keycloak.osgi.export>
         <keycloak.osgi.import>
             !org.keycloak.adapters.osgi.jetty94,
+            org.ops4j.pax.web.*;version="[7.1,9)",
             org.keycloak.*;version="${project.version}",
             *;resolution:=optional
         </keycloak.osgi.import>

diff --git a/adapters/oidc/fuse7/tomcat8/pom.xml b/adapters/oidc/fuse7/tomcat8/pom.xml
index e38125c..4f859c2 100644
--- a/adapters/oidc/fuse7/tomcat8/pom.xml
+++ b/adapters/oidc/fuse7/tomcat8/pom.xml
@@ -36,6 +36,7 @@
         </keycloak.osgi.export>
         <keycloak.osgi.import>
             !org.keycloak.adapters.osgi.tomcat,
+            org.ops4j.pax.web.*;version="[7.1,9)",
             org.keycloak.*;version="${project.version}",
             *;resolution:=optional
         </keycloak.osgi.import>

diff --git a/adapters/oidc/fuse7/undertow/pom.xml b/adapters/oidc/fuse7/undertow/pom.xml
index e730427..caa8e63 100644
--- a/adapters/oidc/fuse7/undertow/pom.xml
+++ b/adapters/oidc/fuse7/undertow/pom.xml
@@ -38,7 +38,7 @@
             !org.keycloak.adapters.osgi.undertow,
             org.keycloak.*;version="${project.version}",
             org.keycloak.adapters.osgi.*;version="${project.version}",
-            org.ops4j.pax.web.*;version="[3.0,8)",
+            org.ops4j.pax.web.*;version="[7.1,9)",
             javax.servlet.*;version="[2.5,4)";resolution:=optional,
             org.apache.cxf.transport.http;resolution:=optional;version="[3,4)",
             org.apache.cxf.transport.http_undertow;resolution:=optional;version="[3,4)",
@@ -67,11 +67,6 @@
         </dependency>
         <dependency>
             <groupId>org.ops4j.pax.web</groupId>
-            <artifactId>pax-web-runtime</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.ops4j.pax.web</groupId>
             <artifactId>pax-web-spi</artifactId>
             <scope>provided</scope>
         </dependency>

diff --git a/adapters/oidc/osgi-adapter/pom.xml b/adapters/oidc/osgi-adapter/pom.xml
index 91c32f1..c811211 100755
--- a/adapters/oidc/osgi-adapter/pom.xml
+++ b/adapters/oidc/osgi-adapter/pom.xml
@@ -79,11 +79,6 @@
         </dependency>
         <dependency>
             <groupId>org.ops4j.pax.web</groupId>
-            <artifactId>pax-web-runtime</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.ops4j.pax.web</groupId>
             <artifactId>pax-web-api</artifactId>
             <scope>provided</scope>
         </dependency>

diff --git a/distribution/adapters/osgi/features/src/main/resources/features.xml b/distribution/adapters/osgi/features/src/main/resources/features.xml
index 42058ea..5261140 100755
--- a/distribution/adapters/osgi/features/src/main/resources/features.xml
+++ b/distribution/adapters/osgi/features/src/main/resources/features.xml
@@ -68,7 +68,8 @@
     <feature name="keycloak-pax-http-jetty" version="${project.version}">
         <details>Keycloak Pax-Web adapter for Jetty 9.4</details>
         <feature>keycloak-adapter-core</feature>
-        <feature>keycloak-osgi-adapter</feature>
+        <feature version="[7.1,9)">pax-web-core</feature>
+        <bundle>mvn:org.keycloak/keycloak-osgi-adapter/${project.version}</bundle>
         <bundle>mvn:org.keycloak/keycloak-jetty-adapter-spi/${project.version}</bundle>
         <bundle>mvn:org.keycloak/keycloak-jetty-core/${project.version}</bundle>
         <bundle>mvn:org.keycloak/keycloak-jetty94-adapter/${project.version}</bundle>
@@ -79,8 +80,9 @@
     <!-- Keycloak adapter for PaxWeb undertow provider -->
     <feature name="keycloak-pax-http-undertow" version="${project.version}">
         <details>Keycloak Pax-Web adapter for Undertow</details>
-        <feature>keycloak-osgi-adapter</feature>
         <feature>keycloak-adapter-core</feature>
+        <feature version="[7.1,9)">pax-web-core</feature>
+        <bundle>mvn:org.keycloak/keycloak-osgi-adapter/${project.version}</bundle>
         <bundle>mvn:org.keycloak/keycloak-undertow-adapter/${project.version}</bundle>
         <bundle>mvn:org.keycloak/keycloak-undertow-adapter-spi/${project.version}</bundle>
         <bundle>mvn:org.keycloak/keycloak-pax-web-undertow/${project.version}</bundle>
@@ -92,7 +94,8 @@
     <feature name="keycloak-pax-http-tomcat" version="${project.version}">
         <details>Keycloak Pax-Web adapter for Tomcat 8</details>
         <feature>keycloak-adapter-core</feature>
-        <feature>keycloak-osgi-adapter</feature>
+        <feature version="[7.1,9)">pax-web-core</feature>
+        <bundle>mvn:org.keycloak/keycloak-osgi-adapter/${project.version}</bundle>
         <bundle>mvn:org.keycloak/keycloak-tomcat-core-adapter/${project.version}</bundle>
         <bundle>mvn:org.keycloak/keycloak-tomcat-adapter-spi/${project.version}</bundle>
         <bundle>mvn:org.keycloak/keycloak-tomcat8-adapter/${project.version}</bundle>