refactor: get rid of cmpn osgi dependency (#9307)

Not needed for flow-server.
vaadin · Nov 4, 2020 · d6cf4ea · d6cf4ea
1 parent 92c0dee
commit d6cf4ea
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git a/flow-server/pom.xml b/flow-server/pom.xml
@@ -164,13 +164,6 @@
             <version>${osgi.core.version}</version>
             <scope>provided</scope>
         </dependency>
-        <!-- There is a registered  OSGi service in the module -->
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>osgi.cmpn</artifactId>
-            <version>${osgi.compendium.version}</version>
-            <scope>provided</scope>
-        </dependency>
 
     </dependencies>
 

diff --git a/flow-server/src/main/java/com/vaadin/flow/server/osgi/VaadinBundleTracker.java b/flow-server/src/main/java/com/vaadin/flow/server/osgi/VaadinBundleTracker.java
@@ -45,7 +45,6 @@
 import org.osgi.framework.BundleEvent;
 import org.osgi.framework.ServiceRegistration;
 import org.osgi.framework.wiring.BundleWiring;
-import org.osgi.service.http.whiteboard.HttpWhiteboardConstants;
 import org.osgi.util.tracker.BundleTracker;
 import org.slf4j.LoggerFactory;
 
@@ -140,7 +139,7 @@ public Bundle addingBundle(Bundle bundle, BundleEvent event) {
 
     private void registerPushResources(Bundle pushBundle) {
         Hashtable<String, Object> properties = new Hashtable<>();
-        properties.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN,
+        properties.put("osgi.http.whiteboard.servlet.pattern",
                 "/VAADIN/static/push/*");
         servletRegistration.compareAndSet(null,
                 pushBundle.getBundleContext().registerService(Servlet.class,