Merge branch 'main' into vite6

vaadin · Oct 1, 2024 · 1a82bd2 · 1a82bd2
2 parents f3262f2 + 8c6a51e
commit 1a82bd2
Show file tree

Hide file tree

Showing 251 changed files with 5,698 additions and 2,394 deletions.
diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml
@@ -1,7 +1,7 @@
 name: Flow Validation
 on:
   push:
-    branches: [main, '24.4', '24.3', '24.2', '24.1', '24.0', '23.3', '9.1']
+    branches: [main, '24.5', '24.4', '24.3', '23.5', '9.1']
   workflow_dispatch:
   pull_request_target:
     types: [opened, synchronize, reopened, edited]

diff --git a/README.md b/README.md
@@ -15,8 +15,9 @@ Since [Vaadin platform 23.0](https://github.com/vaadin/platform), Flow major and
 | Branch | [Platform Version](https://github.com/vaadin/platform/releases) | [Flow Version](https://github.com/vaadin/flow/releases) |
 |--------|-----------------------------------------------------------------|---------------------------------------------------------|
 | 1.0    | 10 (LTS)                                                        | 1.0                                                     |
-| 2.10   | 14.11.x (LTS)                                                   | 2.10.x                                                  |
+| 2.10   | 14.11 (LATEST free with Java 8+ support and Servlet)            | 2.10                                                    |
+| 2.11   | 14.12 (LATEST commercial with Java 8+ support and Servlet 3)    | 2.11                                                    |
 | 23.4   | 23.4 (LATEST free with Java 11+ support and Servlet 3)          | 23.4                                                    |
 | 23.5   | 23.5 (LATEST commercial with Java 11+ support and Servlet 3)    | 23.5                                                    |
-| 24.4   | 24.4 (LATEST release, Java 17+, Jakarta EE 10, Spring-boot 3)   | 24.4                                                    |
-| main   | 24.5 (Vaadin 24.5 preparations)                                 | 24.5                                                    |
+| 24.5   | 24.5 (LATEST release, Java 17+, Jakarta EE 10, Spring-boot 3)   | 24.5                                                    |
+| main   | 24.6 (Vaadin 24.6 preparations)                                 | 24.6                                                    |
diff --git a/flow-bom/pom.xml b/flow-bom/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.vaadin</groupId>
         <artifactId>flow-project</artifactId>
-        <version>24.5-SNAPSHOT</version>
+        <version>24.6-SNAPSHOT</version>
     </parent>
     <artifactId>flow-bom</artifactId>
     <packaging>pom</packaging>