Drop dependency to flow-push from flow-server

vaadin · Oct 20, 2020 · b99fccc · b99fccc
1 parent 94fb121
commit b99fccc
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 11 deletions.
diff --git a/flow-osgi/src/main/java/com/vaadin/flow/osgi/support/OSGiResourceProvider.java b/flow-osgi/src/main/java/com/vaadin/flow/osgi/support/OSGiResourceProvider.java
@@ -32,7 +32,7 @@
  * @since
  *
  */
-@Component(immediate = true, service = OsgiVaadinStaticResource.class)
+@Component(immediate = true, service = ResourceProvider.class)
 public class OSGiResourceProvider implements ResourceProvider {
 
     @Override

diff --git a/flow-push/pom.xml b/flow-push/pom.xml
@@ -13,12 +13,6 @@
     <packaging>jar</packaging>
 
     <dependencies>
-        <!-- Atmosphere -->
-        <dependency>
-            <groupId>com.vaadin.external.atmosphere</groupId>
-            <artifactId>atmosphere-runtime</artifactId>
-            <version>${atmosphere.runtime.version}</version>
-        </dependency>
         <dependency>
             <groupId>com.vaadin</groupId>
             <artifactId>flow-osgi</artifactId>

diff --git a/flow-server/pom.xml b/flow-server/pom.xml
@@ -15,11 +15,12 @@
     <dependencies>
 
         <!-- Project dependencies -->
-
+
+        <!-- Atmosphere -->
         <dependency>
-            <groupId>com.vaadin</groupId>
-            <artifactId>flow-push</artifactId>
-            <version>${project.version}</version>
+            <groupId>com.vaadin.external.atmosphere</groupId>
+            <artifactId>atmosphere-runtime</artifactId>
+            <version>${atmosphere.runtime.version}</version>
         </dependency>
 
         <dependency>