From cf994c39f2c109b3de085307a4bcac5532a482d2 Mon Sep 17 00:00:00 2001
From: Zhe Sun <zhe@vaadin.com>
Date: Wed, 24 Jan 2024 11:33:16 +0200
Subject: [PATCH 1/4] draft: add/move hilla dependencies

---
 .../generator/templates/template-vaadin-spring-bom.xml    | 8 ++++++++
 vaadin-core-internal/pom.xml                              | 5 +++++
 vaadin-dev/pom.xml                                        | 5 +++++
 versions.json                                             | 3 +++
 4 files changed, 21 insertions(+)

diff --git a/scripts/generator/templates/template-vaadin-spring-bom.xml b/scripts/generator/templates/template-vaadin-spring-bom.xml
index fda03624c..651071c62 100644
--- a/scripts/generator/templates/template-vaadin-spring-bom.xml
+++ b/scripts/generator/templates/template-vaadin-spring-bom.xml
@@ -25,6 +25,14 @@
 
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>com.vaadin.hilla</groupId>
+                <artifactId>hilla-bom</artifactId>
+                <version>${hilla.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
             <dependency>
                 <groupId>com.vaadin</groupId>
                 <artifactId>vaadin</artifactId>
diff --git a/vaadin-core-internal/pom.xml b/vaadin-core-internal/pom.xml
index 452fa5fe9..873873e9b 100644
--- a/vaadin-core-internal/pom.xml
+++ b/vaadin-core-internal/pom.xml
@@ -209,6 +209,11 @@
             <artifactId>vaadin-menu-bar-flow</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.vaadin.hilla</groupId>
+            <artifactId>hilla</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
diff --git a/vaadin-dev/pom.xml b/vaadin-dev/pom.xml
index c64f94931..0aea38c22 100644
--- a/vaadin-dev/pom.xml
+++ b/vaadin-dev/pom.xml
@@ -44,6 +44,11 @@
             <artifactId>vaadin-dev-bundle</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.vaadin.hilla</groupId>
+            <artifactId>hilla-dev-mode</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>com.vaadin</groupId>
             <artifactId>copilot</artifactId>
diff --git a/versions.json b/versions.json
index affe14508..767367df3 100644
--- a/versions.json
+++ b/versions.json
@@ -104,6 +104,9 @@
         "flow": {
             "javaVersion": "24.4.0.alpha3"
         },
+        "hilla": {
+            "javaVersion": "24.4.0.alpha2"
+        },
         "flow-cdi": {
             "javaVersion": "15.0.1"
         },

From 40abbdb00e3a3c6b471d912f7dbe4cb888a2d198 Mon Sep 17 00:00:00 2001
From: Tomi Virtanen <tltv@vaadin.com>
Date: Thu, 25 Jan 2024 15:27:32 +0200
Subject: [PATCH 2/4] chore: move hilla to vaadin-spring-boot-starter

From vaadin-core-internal.
---
 vaadin-core-internal/pom.xml       | 5 -----
 vaadin-spring-boot-starter/pom.xml | 4 ++++
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/vaadin-core-internal/pom.xml b/vaadin-core-internal/pom.xml
index 873873e9b..452fa5fe9 100644
--- a/vaadin-core-internal/pom.xml
+++ b/vaadin-core-internal/pom.xml
@@ -209,11 +209,6 @@
             <artifactId>vaadin-menu-bar-flow</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.vaadin.hilla</groupId>
-            <artifactId>hilla</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
diff --git a/vaadin-spring-boot-starter/pom.xml b/vaadin-spring-boot-starter/pom.xml
index 1c7c38a48..88337db83 100644
--- a/vaadin-spring-boot-starter/pom.xml
+++ b/vaadin-spring-boot-starter/pom.xml
@@ -53,6 +53,10 @@
             <groupId>com.vaadin</groupId>
             <artifactId>vaadin-core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.vaadin.hilla</groupId>
+            <artifactId>hilla</artifactId>
+        </dependency>
 
         <!-- Spring -->
         <dependency>

From 46be5b910d4f528f3a56ff3bf3f6333b7ca9710d Mon Sep 17 00:00:00 2001
From: Zhe Sun <zhe@vaadin.com>
Date: Fri, 26 Jan 2024 09:19:53 +0200
Subject: [PATCH 3/4] workaround: add the hilla-dev-mode to vaadin-bom

---
 scripts/generator/templates/template-vaadin-bom.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/scripts/generator/templates/template-vaadin-bom.xml b/scripts/generator/templates/template-vaadin-bom.xml
index 5b5fa7280..6b40500a8 100644
--- a/scripts/generator/templates/template-vaadin-bom.xml
+++ b/scripts/generator/templates/template-vaadin-bom.xml
@@ -115,6 +115,13 @@
                 <artifactId>jna-platform</artifactId>
                 <version>${jna.version}</version>
             </dependency>
+
+            <!-- workaround,should be removed after this module has been added to hilla-bom -->
+            <dependency>
+                <groupId>com.vaadin.hilla</groupId>
+                <artifactId>hilla-dev-mode</artifactId>
+                <version>${hilla.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 </project>

From 9969c778b92084875a997c36c0436168d3c7c809 Mon Sep 17 00:00:00 2001
From: Tomi Virtanen <tltv@vaadin.com>
Date: Fri, 26 Jan 2024 15:45:12 +0200
Subject: [PATCH 4/4] chore: removed hilla-dev-mode

---
 vaadin-dev/pom.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/vaadin-dev/pom.xml b/vaadin-dev/pom.xml
index 0aea38c22..c64f94931 100644
--- a/vaadin-dev/pom.xml
+++ b/vaadin-dev/pom.xml
@@ -44,11 +44,6 @@
             <artifactId>vaadin-dev-bundle</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.vaadin.hilla</groupId>
-            <artifactId>hilla-dev-mode</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>com.vaadin</groupId>
             <artifactId>copilot</artifactId>