Merge branch 'main' into fix/2244/file-router-the-view-for-the-root-p…

…ath-is-never-found-in-Java-view-registry
vaadin · Mar 27, 2024 · 230bdd0 · 230bdd0
2 parents bb170c8 + a4d3dfb
commit 230bdd0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/packages/java/endpoint/pom.xml b/packages/java/endpoint/pom.xml
@@ -114,7 +114,7 @@
         <dependency>
             <groupId>com.vaadin.external.atmosphere</groupId>
             <artifactId>atmosphere-runtime</artifactId>
-            <version>3.0.4.slf4jvaadin1</version>
+            <version>${atmosphere.version}</version>
         </dependency>
         <dependency>
             <groupId>com.vaadin.external.google</groupId>

diff --git a/packages/java/hilla-bom/pom.xml b/packages/java/hilla-bom/pom.xml
@@ -12,6 +12,10 @@
     <version>24.4-SNAPSHOT</version>
     <url>https://hilla.dev</url>
 
+    <properties>
+        <enforcer.skip>true</enforcer.skip>
+    </properties>
+
     <dependencyManagement>
         <dependencies>
             <dependency>

diff --git a/pom.xml b/pom.xml
@@ -86,6 +86,7 @@
     <jaxb.version>4.0.4</jaxb.version>
     <github.javaparser.core.version>3.25.9</github.javaparser.core.version>
     <jetty.version>12.0.3</jetty.version>
+    <atmosphere.version>3.0.5.slf4jvaadin1</atmosphere.version>
   </properties>
 
   <organization>