chore: bump project and Vaadin to 24.5 (#131)

mcollovati · Dec 22, 2024 · 6b83fca · 6b83fca
1 parent ba83677
commit 6b83fca
Show file tree

Hide file tree

Showing 35 changed files with 83 additions and 51 deletions.
diff --git a/.github/workflows/deploy-classifiers.yml b/.github/workflows/deploy-classifiers.yml
@@ -19,7 +19,7 @@ jobs:
       packages: write
     strategy:
       matrix:
-        branch: [ "development", "vaadin-24.3", "vaadin-23" ]
+        branch: [ "development", "vaadin-24.4", "vaadin-23" ]
 
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -10,7 +10,7 @@ on:
         default: 'development'
         options:
         - "development"
-        - "vaadin-24.3"
+        - "vaadin-24.4"
         - "vaadin-23"
       version:
         description: "Version to release (e.g. 1.1.0 or 1.2.0-alpha1)"

diff --git a/.github/workflows/validation-latest-versions.yml b/.github/workflows/validation-latest-versions.yml
@@ -18,7 +18,7 @@ jobs:
         id: matrix
         run: |
           set -x -e -o pipefail
-          branches="development vaadin-24.3"
+          branches="development vaadin-24.4"
           matrix=$(for branch in $branches; do \
             git fetch --depth=1 origin $branch:$branch;
             git show $branch:pom.xml | grep -E '<(vaadin\.(platform|flow)|vertx)\.version>' \

diff --git a/.github/workflows/validation-nightly.yml b/.github/workflows/validation-nightly.yml
@@ -12,7 +12,7 @@ jobs:
       fail-fast: false
       matrix:
         java: [21, 17]
-        branch: [ development, vaadin-24.3, vaadin-23 ]
+        branch: [ development, vaadin-24.4, vaadin-23 ]
         include:
           - branch: vaadin-23
             java: 11

diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml
@@ -1,7 +1,7 @@
 name: vertx-vaadin validation
 on:
   push:
-    branches: [development, vaadin-24.3, vaadin-23]
+    branches: [development, vaadin-24.4, vaadin-23]
   workflow_dispatch:
   pull_request_target:
     types: [opened, synchronize, reopened, edited]

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>com.github.mcollovati.vertx</groupId>
     <artifactId>vertx-vaadin-root</artifactId>
-    <version>24.4-SNAPSHOT</version>
+    <version>24.5-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <description>Vertx Vaadin root Pom</description>
@@ -109,9 +109,9 @@
         <spotless-maven-plugin.version>2.41.1</spotless-maven-plugin.version>
 
         <vertx.version>4.5.9</vertx.version>
-        <vaadin.platform.version>24.4.10</vaadin.platform.version>
-        <vaadin.flow.version>24.4.6</vaadin.flow.version>
-        <hilla.version>24.4.6</hilla.version>
+        <vaadin.platform.version>24.5.9</vaadin.platform.version>
+        <vaadin.flow.version>24.5.10</vaadin.flow.version>
+        <hilla.version>24.5.9</hilla.version>
 
         <jakarta.servlet.version>6.0.0</jakarta.servlet.version>
         <byte-buddy.version>1.14.11</byte-buddy.version>

diff --git a/vaadin-flow-sockjs/pom.xml b/vaadin-flow-sockjs/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.github.mcollovati.vertx</groupId>
         <artifactId>vertx-vaadin-root</artifactId>
-        <version>24.4-SNAPSHOT</version>
+        <version>24.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/vertx-vaadin-flow-jandex/pom.xml b/vertx-vaadin-flow-jandex/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.github.mcollovati.vertx</groupId>
         <artifactId>vertx-vaadin-root</artifactId>
-        <version>24.4-SNAPSHOT</version>
+        <version>24.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/vertx-vaadin-flow/pom.xml b/vertx-vaadin-flow/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.github.mcollovati.vertx</groupId>
         <artifactId>vertx-vaadin-root</artifactId>
-        <version>24.4-SNAPSHOT</version>
+        <version>24.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -19,7 +19,7 @@
         <checkstyle.skip>false</checkstyle.skip>
         <classgraph.version>4.8.157</classgraph.version>
         <vaadin-flow-sockjs.version>${project.version}</vaadin-flow-sockjs.version>
-        <jackson.version>2.14.2</jackson.version>
+        <jackson.version>2.17.2</jackson.version>
         <javax.annotation.api.version>1.3.2</javax.annotation.api.version>
         <jakarta.websocket.version>2.1.1</jakarta.websocket.version>
         <validation.api.version>3.0.2</validation.api.version>

diff --git a/...n-flow/src/main/java/com/github/mcollovati/vertx/vaadin/VertxVaadinBrowserLiveReload.java b/...n-flow/src/main/java/com/github/mcollovati/vertx/vaadin/VertxVaadinBrowserLiveReload.java
@@ -32,6 +32,8 @@
 import com.github.mcollovati.vertx.vaadin.communication.VertxDebugWindowConnection;
 import com.github.mcollovati.vertx.vaadin.sockjs.communication.VertxVaadinLiveReload;
 
+import elemental.json.JsonObject;
+
 class VertxVaadinBrowserLiveReload implements BrowserLiveReload {
 
     private final BrowserLiveReload delegate;
@@ -77,6 +79,11 @@ public void update(String path, String content) {
         reloader.update(path, content);
     }
 
+    @Override
+    public void sendHmrEvent(String event, JsonObject eventData) {
+        reloader.sendHmrEvent(event, eventData);
+    }
+
     @Override
     public void reload() {
         reloader.reload();

diff --git a/...ain/java/com/github/mcollovati/vertx/vaadin/communication/VertxDebugWindowConnection.java b/...ain/java/com/github/mcollovati/vertx/vaadin/communication/VertxDebugWindowConnection.java
@@ -47,7 +47,6 @@
 import com.vaadin.base.devserver.stats.DevModeUsageStatistics;
 import com.vaadin.experimental.FeatureFlags;
 import com.vaadin.flow.server.VaadinContext;
-import com.vaadin.flow.server.startup.ApplicationConfiguration;
 import com.vaadin.pro.licensechecker.BuildType;
 import com.vaadin.pro.licensechecker.LicenseChecker;
 import com.vaadin.pro.licensechecker.Product;
@@ -152,18 +151,32 @@ public void onMessage(String websocketId, String message) {
         }
     }
 
-    private void send(String websocketId, String command, Object data) {
+    public void sendHmrEvent(String event, JsonObject eventData) {
+        JsonObject msg = elemental.json.Json.createObject();
+        msg.put("command", "hmr");
+        JsonObject data = elemental.json.Json.createObject();
+        msg.put("data", data);
+        data.put("event", event);
+        data.put("eventData", eventData);
+        broadcast(msg);
+    }
+
+    private void send(String websocketId, String command,
+                      Object data) {
+        send(websocketId, Json.encode(new DebugWindowMessage(command, data)));
+    }
+
+    private void send(String websocketId, String json) {
         try {
             Optional.ofNullable(liveReload.get(websocketId))
-                    .ifPresent(producer -> producer.accept(Json.encode(new DebugWindowMessage(command, data))));
+                    .ifPresent(producer -> producer.accept(json));
         } catch (Exception e) {
             getLogger().error("Error sending message", e);
         }
     }
 
     public void onClose(String websocketId) {
         logger.debug("Live reload connection disconnected for {}", websocketId);
-        // Optional.ofNullable(liveReload.get(websocketId)).ifPresent(MessageProducer::close);
         for (DevToolsMessageHandler plugin : plugins) {
             plugin.handleDisconnect(getDevToolsInterface(websocketId));
         }
@@ -175,16 +188,16 @@ public void update(String path, String content) {
         msg.put("command", "update");
         msg.put("path", path);
         msg.put("content", content);
-        sendToAll(msg);
+        broadcast(msg);
     }
 
     public void reload() {
         JsonObject msg = elemental.json.Json.createObject();
         msg.put("command", "reload");
-        sendToAll(msg);
+        broadcast(msg);
     }
 
-    private void sendToAll(JsonObject message) {
+    private void broadcast(JsonObject message) {
         String json = message.toJson();
         liveReload.values().stream().filter(Objects::nonNull).forEach(socket -> socket.accept(json));
     }
@@ -223,7 +236,12 @@ public DevToolsInterfaceImpl(VertxDebugWindowConnection connection, String webso
 
         @Override
         public void send(String command, JsonObject data) {
-            connection.send(websocketId, command, data);
+            JsonObject msg = elemental.json.Json.createObject();
+            msg.put("command", command);
+            if (data != null) {
+                msg.put("data", data);
+            }
+            connection.send(websocketId, msg.toJson());
         }
 
         @Override

diff --git a/...n/java/com/github/mcollovati/vertx/vaadin/sockjs/communication/VertxVaadinLiveReload.java b/...n/java/com/github/mcollovati/vertx/vaadin/sockjs/communication/VertxVaadinLiveReload.java
@@ -22,6 +22,8 @@
  */
 package com.github.mcollovati.vertx.vaadin.sockjs.communication;
 
+import elemental.json.JsonObject;
+
 /**
  * Provides a way to reload browser tabs via web socket connection.
  */
@@ -42,4 +44,14 @@ public interface VertxVaadinLiveReload {
      */
     void update(String path, String content);
 
+    /**
+     * Send a client side HMR event.
+     *
+     * @param event
+     *            the event name
+     * @param eventData
+     *            the event data
+     */
+    void sendHmrEvent(String event, JsonObject eventData);
+
 }
diff --git a/vertx-vaadin-quarkus-extension/deployment/pom.xml b/vertx-vaadin-quarkus-extension/deployment/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.github.mcollovati.vertx</groupId>
         <artifactId>vertx-vaadin-quarkus-extension-parent</artifactId>
-        <version>24.4-SNAPSHOT</version>
+        <version>24.5-SNAPSHOT</version>
     </parent>
     <artifactId>vertx-vaadin-quarkus-extension-deployment</artifactId>
     <name>Vertx Vaadin Extension - Deployment</name>

diff --git a/vertx-vaadin-quarkus-extension/integration-tests/common-test-code/pom.xml b/vertx-vaadin-quarkus-extension/integration-tests/common-test-code/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.github.mcollovati.vertx</groupId>
         <artifactId>vertx-vaadin-quarkus-integration-tests</artifactId>
-        <version>24.4-SNAPSHOT</version>
+        <version>24.5-SNAPSHOT</version>
     </parent>
     <artifactId>vertx-vaadin-quarkus-extension-common-test-code</artifactId>
     <name>Vertx Vaadin Extension - Common code for dev and prod</name>

diff --git a/...mmon-test-code/src/test/java/com/github/mcollovati/vertx/vaadin/quarkus/it/ServiceIT.java b/...mmon-test-code/src/test/java/com/github/mcollovati/vertx/vaadin/quarkus/it/ServiceIT.java
@@ -120,7 +120,7 @@ public void uiInitEventObserved() throws IOException {
     }
 
     private void assertSystemMessageEquals(String expected) {
-        WebElement message = findElement(By.cssSelector("div.v-system-error div.message"));
+        WebElement message = waitUntil(d -> findElement(By.cssSelector("div.v-system-error div.message")));
         Assertions.assertEquals(expected, message.getText());
     }
 }
diff --git a/vertx-vaadin-quarkus-extension/integration-tests/development/pom.xml b/vertx-vaadin-quarkus-extension/integration-tests/development/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.github.mcollovati.vertx</groupId>
         <artifactId>vertx-vaadin-quarkus-integration-tests</artifactId>
-        <version>24.4-SNAPSHOT</version>
+        <version>24.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>vertx-vaadin-quarkus-development-tests</artifactId>

diff --git a/vertx-vaadin-quarkus-extension/integration-tests/pom.xml b/vertx-vaadin-quarkus-extension/integration-tests/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.github.mcollovati.vertx</groupId>
         <artifactId>vertx-vaadin-quarkus-extension-parent</artifactId>
-        <version>24.4-SNAPSHOT</version>
+        <version>24.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>vertx-vaadin-quarkus-integration-tests</artifactId>

diff --git a/vertx-vaadin-quarkus-extension/integration-tests/production/pom.xml b/vertx-vaadin-quarkus-extension/integration-tests/production/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.github.mcollovati.vertx</groupId>
         <artifactId>vertx-vaadin-quarkus-integration-tests</artifactId>
-        <version>24.4-SNAPSHOT</version>
+        <version>24.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>vertx-vaadin-quarkus-production-tests</artifactId>

diff --git a/vertx-vaadin-quarkus-extension/integration-tests/reusable-theme/pom.xml b/vertx-vaadin-quarkus-extension/integration-tests/reusable-theme/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.github.mcollovati.vertx</groupId>
         <artifactId>vertx-vaadin-quarkus-integration-tests</artifactId>
-        <version>24.4-SNAPSHOT</version>
+        <version>24.5-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/vertx-vaadin-quarkus-extension/integration-tests/test-addons/addon-with-jandex/pom.xml b/vertx-vaadin-quarkus-extension/integration-tests/test-addons/addon-with-jandex/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.github.mcollovati.vertx</groupId>
         <artifactId>vertx-vaadin-quarkus-integration-tests</artifactId>
-        <version>24.4-SNAPSHOT</version>
+        <version>24.5-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/vertx-vaadin-quarkus-extension/integration-tests/test-addons/addon-without-jandex/pom.xml b/vertx-vaadin-quarkus-extension/integration-tests/test-addons/addon-without-jandex/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.github.mcollovati.vertx</groupId>
         <artifactId>vertx-vaadin-quarkus-integration-tests</artifactId>
-        <version>24.4-SNAPSHOT</version>
+        <version>24.5-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/vertx-vaadin-quarkus-extension/pom.xml b/vertx-vaadin-quarkus-extension/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.github.mcollovati.vertx</groupId>
         <artifactId>vertx-vaadin-root</artifactId>
-        <version>24.4-SNAPSHOT</version>
+        <version>24.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -21,10 +21,10 @@
     <properties>
         <compiler-plugin.version>3.8.1</compiler-plugin.version>
         <failsafe.useModulePath>false</failsafe.useModulePath>
-        <maven.compiler.release>11</maven.compiler.release>
+        <maven.compiler.release>17</maven.compiler.release>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <quarkus.version>3.8.6</quarkus.version>
+        <quarkus.version>3.12.2</quarkus.version>
         <surefire-plugin.version>3.1.2</surefire-plugin.version>
         <failsafe-plugin.version>${surefire-plugin.version}</failsafe-plugin.version>
     </properties>

diff --git a/vertx-vaadin-quarkus-extension/runtime/pom.xml b/vertx-vaadin-quarkus-extension/runtime/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.github.mcollovati.vertx</groupId>
         <artifactId>vertx-vaadin-quarkus-extension-parent</artifactId>
-        <version>24.4-SNAPSHOT</version>
+        <version>24.5-SNAPSHOT</version>
     </parent>
     <artifactId>vertx-vaadin-quarkus-extension</artifactId>
     <name>Vertx Vaadin Extension - Runtime</name>

diff --git a/vertx-vaadin-tests/pom.xml b/vertx-vaadin-tests/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.github.mcollovati.vertx</groupId>
         <artifactId>vertx-vaadin-root</artifactId>
-        <version>24.4-SNAPSHOT</version>
+        <version>24.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <groupId>com.github.mcollovati.vertx.tests</groupId>

diff --git a/vertx-vaadin-tests/test-common/pom.xml b/vertx-vaadin-tests/test-common/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.github.mcollovati.vertx.tests</groupId>
         <artifactId>vertx-vaadin-test</artifactId>
-        <version>24.4-SNAPSHOT</version>
+        <version>24.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>vertx-vaadin-test-common</artifactId>

diff --git a/vertx-vaadin-tests/test-frontend/addon-with-templates/pom.xml b/vertx-vaadin-tests/test-frontend/addon-with-templates/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.github.mcollovati.vertx.tests</groupId>
         <artifactId>test-frontend</artifactId>
-        <version>24.4-SNAPSHOT</version>
+        <version>24.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>addon-with-templates</artifactId>

diff --git a/vertx-vaadin-tests/test-frontend/pom.xml b/vertx-vaadin-tests/test-frontend/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.github.mcollovati.vertx.tests</groupId>
         <artifactId>vertx-vaadin-test</artifactId>
-        <version>24.4-SNAPSHOT</version>
+        <version>24.5-SNAPSHOT</version>
     </parent>
     <artifactId>test-frontend</artifactId>
     <name>Frontend build (npm + Webpack + Vite)</name>

diff --git a/vertx-vaadin-tests/test-frontend/vite-basics/pom.xml b/vertx-vaadin-tests/test-frontend/vite-basics/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.github.mcollovati.vertx.tests</groupId>
         <artifactId>test-frontend</artifactId>
-        <version>24.4-SNAPSHOT</version>
+        <version>24.5-SNAPSHOT</version>
     </parent>
     <artifactId>vite-basics</artifactId>
     <name>Vite dev mode functionality</name>

diff --git a/vertx-vaadin-tests/test-frontend/vite-production/pom.xml b/vertx-vaadin-tests/test-frontend/vite-production/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.github.mcollovati.vertx.tests</groupId>
         <artifactId>test-frontend</artifactId>
-        <version>24.4-SNAPSHOT</version>
+        <version>24.5-SNAPSHOT</version>
     </parent>
     <artifactId>vite-production</artifactId>
     <name>Vite production mode functionality</name>