chore: resolve circular dependency (#570) (CP: 1.3) (#623)

* chore: resolve circular dependency (#570) * chore: resolve circular dependency * chore: add lumo dependency * chore: component view dependency * chore: move component dependency to test root * chore:add custom-field dependency * chore: Make project work with latest Flow (#627) * chore: update TB to latest Co-authored-by: Artur <[email protected]>
vaadin · Nov 9, 2022 · 05bfc9d · 05bfc9d
1 parent a8d43e3
commit 05bfc9d
Showing 7 changed files with 132 additions and 22 deletions.
diff --git a/packages/java/tests/pom.xml b/packages/java/tests/pom.xml
@@ -16,6 +16,7 @@
 
   <properties>
     <jetty.version>9.4.37.v20210219</jetty.version>
+    <vaadin.component.version>23.3-SNAPSHOT</vaadin.component.version>
     <jetty.scantrigger></jetty.scantrigger>
 
     <license.skipDownloadLicenses>true</license.skipDownloadLicenses>
@@ -66,6 +67,113 @@
       <artifactId>engine-runtime</artifactId>
       <version>${project.version}</version>
     </dependency>
+
+    <dependency>
+      <groupId>com.vaadin</groupId>
+      <artifactId>vaadin-app-layout-flow</artifactId>
+      <version>${vaadin.component.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.vaadin</groupId>
+      <artifactId>vaadin-avatar-flow</artifactId>
+      <version>${vaadin.component.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.vaadin</groupId>
+      <artifactId>vaadin-checkbox-flow</artifactId>
+      <version>${vaadin.component.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.vaadin</groupId>
+      <artifactId>vaadin-combo-box-flow</artifactId>
+      <version>${vaadin.component.version}</version>
+    </dependency>
+      <dependency>
+          <groupId>com.vaadin</groupId>
+          <artifactId>vaadin-custom-field-flow</artifactId>
+          <version>${vaadin.component.version}</version>
+      </dependency>
+    <dependency>
+      <groupId>com.vaadin</groupId>
+      <artifactId>vaadin-date-picker-flow</artifactId>
+      <version>${vaadin.component.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.vaadin</groupId>
+      <artifactId>vaadin-date-time-picker-flow</artifactId>
+      <version>${vaadin.component.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.vaadin</groupId>
+      <artifactId>vaadin-form-layout-flow</artifactId>
+      <version>${vaadin.component.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.vaadin</groupId>
+      <artifactId>vaadin-list-box-flow</artifactId>
+      <version>${vaadin.component.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.vaadin</groupId>
+      <artifactId>vaadin-login-flow</artifactId>
+      <version>${vaadin.component.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.vaadin</groupId>
+      <artifactId>vaadin-notification-flow</artifactId>
+      <version>${vaadin.component.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.vaadin</groupId>
+      <artifactId>vaadin-radio-button-flow</artifactId>
+      <version>${vaadin.component.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.vaadin</groupId>
+      <artifactId>vaadin-rich-text-editor-flow</artifactId>
+      <version>${vaadin.component.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.vaadin</groupId>
+      <artifactId>vaadin-select-flow</artifactId>
+      <version>${vaadin.component.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.vaadin</groupId>
+      <artifactId>vaadin-tabs-flow</artifactId>
+      <version>${vaadin.component.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.vaadin</groupId>
+      <artifactId>vaadin-text-field-flow</artifactId>
+      <version>${vaadin.component.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.vaadin</groupId>
+      <artifactId>vaadin-time-picker-flow</artifactId>
+      <version>${vaadin.component.version}</version>
+    </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-text-field-testbench</artifactId>
+      <version>${vaadin.component.version}</version>
+    </dependency>
   </dependencies>
 
   <build>

diff --git a/packages/java/tests/spring/pom.xml b/packages/java/tests/spring/pom.xml
@@ -17,7 +17,6 @@
   <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>
   </properties>
 
@@ -53,6 +52,12 @@
         <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>
         <artifactId>flow-bom</artifactId>

diff --git a/packages/java/tests/spring/security-contextpath/pom.xml b/packages/java/tests/spring/security-contextpath/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-lumo-theme</artifactId>
         </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,18 @@
 
     <dependencies>
         <dependency>
-            <groupId>dev.hilla</groupId>
-            <artifactId>hilla</artifactId>
-            <version>${project.version}</version>
+            <groupId>com.vaadin</groupId>
+            <artifactId>vaadin-lumo-theme</artifactId>
         </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-urlmapping/pom.xml b/packages/java/tests/spring/security-urlmapping/pom.xml
@@ -18,18 +18,18 @@
 
     <dependencies>
         <dependency>
-            <groupId>dev.hilla</groupId>
-            <artifactId>hilla</artifactId>
-            <version>${project.version}</version>
+            <groupId>com.vaadin</groupId>
+            <artifactId>vaadin-lumo-theme</artifactId>
         </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/pom.xml b/packages/java/tests/spring/security/pom.xml
@@ -18,19 +18,18 @@
 
     <dependencies>
         <dependency>
-            <groupId>dev.hilla</groupId>
-            <artifactId>hilla</artifactId>
-            <version>${project.version}</version>
+            <groupId>com.vaadin</groupId>
+            <artifactId>vaadin-lumo-theme</artifactId>
         </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>
             <artifactId>spring-boot-starter-web</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -65,7 +65,7 @@
     <spring.boot.version>2.7.4</spring.boot.version>
     <spring.data.version>2.7.3</spring.data.version>
     <spring.security.version>5.7.3</spring.security.version>
-    <testbench.version>8.0.0</testbench.version>
+    <testbench.version>8.1.3</testbench.version>
     <javax.validation.version>2.0.1.Final</javax.validation.version>
     <hibernate.validator.version>6.2.3.Final</hibernate.validator.version>
   </properties>