chore: resolve circular dependency

vaadin · Sep 28, 2022 · fb91ddb · fb91ddb
1 parent 3cbb70c
commit fb91ddb
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 27 deletions.
diff --git a/packages/java/engine-runtime/pom.xml b/packages/java/engine-runtime/pom.xml
@@ -15,7 +15,6 @@
   <name>Hilla Engine Runtime</name>
 
   <properties>
-    <flow.version>23.3-SNAPSHOT</flow.version>
     <formatter.basedir>${project.parent.basedir}</formatter.basedir>
   </properties>
 

diff --git a/packages/java/tests/spring/pom.xml b/packages/java/tests/spring/pom.xml
@@ -17,8 +17,8 @@
   <properties>
     <maven.deploy.skip>true</maven.deploy.skip>
     <maven.javadoc.skip>true</maven.javadoc.skip>
-    <vaadin.version>23.3-SNAPSHOT</vaadin.version>
     <formatter.basedir>${project.parent.parent.basedir}</formatter.basedir>
+    <vaadin.component.version>23.3-SNAPSHOT</vaadin.component.version>
   </properties>
 
   <dependencyManagement>
@@ -52,6 +52,11 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      <dependency>
+        <groupId>com.vaadin</groupId>
+        <artifactId>vaadin-lumo-theme</artifactId>
+        <version>${vaadin.component.version}</version>
+      </dependency>
 
       <dependency>
         <groupId>com.vaadin</groupId>

diff --git a/packages/java/tests/spring/security-contextpath/pom.xml b/packages/java/tests/spring/security-contextpath/pom.xml
@@ -17,19 +17,13 @@
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>dev.hilla</groupId>
-            <artifactId>hilla</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>com.vaadin</groupId>
             <artifactId>vaadin-spring</artifactId>
         </dependency>
         <dependency>
             <groupId>com.vaadin</groupId>
-            <artifactId>vaadin-testbench</artifactId>
-            <version>${vaadin.version}</version>
+            <artifactId>vaadin-testbench-core</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

diff --git a/packages/java/tests/spring/security-jwt/pom.xml b/packages/java/tests/spring/security-jwt/pom.xml
@@ -18,18 +18,16 @@
 
     <dependencies>
         <dependency>
-            <groupId>dev.hilla</groupId>
-            <artifactId>hilla</artifactId>
-            <version>${project.version}</version>
+            <groupId>com.vaadin</groupId>
+            <artifactId>vaadin-spring</artifactId>
         </dependency>
         <dependency>
             <groupId>com.vaadin</groupId>
-            <artifactId>vaadin-spring</artifactId>
+            <artifactId>vaadin-lumo-theme</artifactId>
         </dependency>
         <dependency>
             <groupId>com.vaadin</groupId>
-            <artifactId>vaadin-testbench</artifactId>
-            <version>${vaadin.version}</version>
+            <artifactId>vaadin-testbench-core</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

diff --git a/packages/java/tests/spring/security-urlmapping/pom.xml b/packages/java/tests/spring/security-urlmapping/pom.xml
@@ -18,18 +18,16 @@
 
     <dependencies>
         <dependency>
-            <groupId>dev.hilla</groupId>
-            <artifactId>hilla</artifactId>
-            <version>${project.version}</version>
+            <groupId>com.vaadin</groupId>
+            <artifactId>vaadin-spring</artifactId>
         </dependency>
         <dependency>
             <groupId>com.vaadin</groupId>
-            <artifactId>vaadin-spring</artifactId>
+            <artifactId>vaadin-lumo-theme</artifactId>
         </dependency>
         <dependency>
             <groupId>com.vaadin</groupId>
-            <artifactId>vaadin-testbench</artifactId>
-            <version>${vaadin.version}</version>
+            <artifactId>vaadin-testbench-core</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

diff --git a/packages/java/tests/spring/security/pom.xml b/packages/java/tests/spring/security/pom.xml
@@ -18,18 +18,36 @@
 
     <dependencies>
         <dependency>
-            <groupId>dev.hilla</groupId>
-            <artifactId>hilla</artifactId>
-            <version>${project.version}</version>
+            <groupId>com.vaadin</groupId>
+            <artifactId>vaadin-spring</artifactId>
         </dependency>
         <dependency>
             <groupId>com.vaadin</groupId>
-            <artifactId>vaadin-spring</artifactId>
+            <artifactId>vaadin-testbench-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.vaadin</groupId>
+            <artifactId>vaadin-lumo-theme</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.vaadin</groupId>
+            <artifactId>vaadin-button-testbench</artifactId>
+            <version>${vaadin.component.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.vaadin</groupId>
+            <artifactId>vaadin-login-testbench</artifactId>
+            <version>${vaadin.component.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.vaadin</groupId>
+            <artifactId>vaadin-notification-testbench</artifactId>
+            <version>${vaadin.component.version}</version>
         </dependency>
         <dependency>
             <groupId>com.vaadin</groupId>
-            <artifactId>vaadin-testbench</artifactId>
-            <version>${vaadin.version}</version>
+            <artifactId>vaadin-text-field-testbench</artifactId>
+            <version>${vaadin.component.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>