From e4d68f1404b84e6b768b13b5ca5476ccb4f0da1b Mon Sep 17 00:00:00 2001
From: web-padawan <iamkulykov@gmail.com>
Date: Fri, 22 May 2026 11:28:00 +0300
Subject: [PATCH 1/3] chore: remove badge and master-detail-layout feature
 flags

---
 .../src/main/resources/vaadin-featureflags.properties       | 4 ----
 .../src/main/resources/vaadin-featureflags.properties       | 6 ------
 .../src/main/resources/vaadin-featureflags.properties       | 6 ------
 3 files changed, 16 deletions(-)

diff --git a/vaadin-dev-bundle/src/main/resources/vaadin-featureflags.properties b/vaadin-dev-bundle/src/main/resources/vaadin-featureflags.properties
index 47e92fc40..8cb075fc0 100644
--- a/vaadin-dev-bundle/src/main/resources/vaadin-featureflags.properties
+++ b/vaadin-dev-bundle/src/main/resources/vaadin-featureflags.properties
@@ -1,8 +1,4 @@
-# Master Detail Layout Component (Experimental)
-com.vaadin.experimental.masterDetailLayoutComponent=true
 
 # Slider Component (Experimental)
 com.vaadin.experimental.sliderComponent=true
 
-# Badge Component (Experimental)
-com.vaadin.experimental.badgeComponent=true
diff --git a/vaadin-platform-test/src/main/resources/vaadin-featureflags.properties b/vaadin-platform-test/src/main/resources/vaadin-featureflags.properties
index 47e92fc40..8994dbc0e 100644
--- a/vaadin-platform-test/src/main/resources/vaadin-featureflags.properties
+++ b/vaadin-platform-test/src/main/resources/vaadin-featureflags.properties
@@ -1,8 +1,2 @@
-# Master Detail Layout Component (Experimental)
-com.vaadin.experimental.masterDetailLayoutComponent=true
-
 # Slider Component (Experimental)
 com.vaadin.experimental.sliderComponent=true
-
-# Badge Component (Experimental)
-com.vaadin.experimental.badgeComponent=true
diff --git a/vaadin-prod-bundle/src/main/resources/vaadin-featureflags.properties b/vaadin-prod-bundle/src/main/resources/vaadin-featureflags.properties
index 47e92fc40..8994dbc0e 100644
--- a/vaadin-prod-bundle/src/main/resources/vaadin-featureflags.properties
+++ b/vaadin-prod-bundle/src/main/resources/vaadin-featureflags.properties
@@ -1,8 +1,2 @@
-# Master Detail Layout Component (Experimental)
-com.vaadin.experimental.masterDetailLayoutComponent=true
-
 # Slider Component (Experimental)
 com.vaadin.experimental.sliderComponent=true
-
-# Badge Component (Experimental)
-com.vaadin.experimental.badgeComponent=true

From 39373a166c8bcf34a104fc36b939552d4e6685ce Mon Sep 17 00:00:00 2001
From: Zhe Sun <zhe@vaadin.com>
Date: Mon, 25 May 2026 13:53:54 +0300
Subject: [PATCH 2/3] update the dependency scope

---
 scripts/generator/templates/template-dev-bundle-pom.xml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/scripts/generator/templates/template-dev-bundle-pom.xml b/scripts/generator/templates/template-dev-bundle-pom.xml
index 5460dfe10..c642461f1 100644
--- a/scripts/generator/templates/template-dev-bundle-pom.xml
+++ b/scripts/generator/templates/template-dev-bundle-pom.xml
@@ -54,14 +54,16 @@
         <!--
             vaadin-hybrid-dev-bundle must be a project dependency otherwise it will be built
             after vaadin-dev-bundle because of modules configuration in root pom.
-            Configuring the dependency with provided scope will prevent it to be scanned by
-            flow-dev-bundle-plugin.
+             Configuring the dependency with test scope keeps the reactor ordering but prevents
+            flow-dev-bundle-plugin from finding the embedded reference dev-bundle on its
+            classpath (the plugin scans compile/runtime/system/provided scopes, not test),
+            so the local dev-bundle build is always performed instead of being skipped.
         -->
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>vaadin-hybrid-dev-bundle</artifactId>
             <version>${project.version}</version>
-            <scope>provided</scope>
+            <scope>test</scope>
             <optional>true</optional>
         </dependency>
         <dependency>

From 77677169c717db594a22c2b7fb96d788a1178a8a Mon Sep 17 00:00:00 2001
From: Zhe Sun <31067185+ZheSun88@users.noreply.github.com>
Date: Mon, 25 May 2026 15:30:02 +0300
Subject: [PATCH 3/3] chore: update flow/hilla to use snapshot

---
 versions.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/versions.json b/versions.json
index 2f622c011..a2c795691 100644
--- a/versions.json
+++ b/versions.json
@@ -119,7 +119,7 @@
             "npmName": "@vaadin/field-highlighter"
         },
         "flow": {
-            "javaVersion": "25.2.0-alpha13"
+            "javaVersion": "25.2-SNAPSHOT"
         },
         "flow-cdi": {
             "javaVersion": "16.0.1"
@@ -138,7 +138,7 @@
             "npmName": "@vaadin/grid"
         },
         "hilla": {
-            "javaVersion": "25.2.0-alpha9"
+            "javaVersion": "25.2-SNAPSHOT"
         },
         "horizontal-layout": {
             "jsVersion": "25.2.0-alpha13",