From 1565d13018f3d2367c8616b2a96696aa318dfd5e Mon Sep 17 00:00:00 2001
From: Javier Godoy <11554739+javier-godoy@users.noreply.github.com>
Date: Wed, 29 Oct 2025 15:43:31 -0300
Subject: [PATCH 1/7] build: upgrade Vaadin to 14.11.13

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 3d79bba..3364fe6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     <description>Integration of paper-chip for Vaadin 14 as a field</description>
 
     <properties>
-        <vaadin.version>14.8.11</vaadin.version>
+        <vaadin.version>14.11.13</vaadin.version>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

From ff5bfd0c2b60c92a2c2d66a532ef4235b6b22439 Mon Sep 17 00:00:00 2001
From: Javier Godoy <11554739+javier-godoy@users.noreply.github.com>
Date: Wed, 29 Oct 2025 15:44:08 -0300
Subject: [PATCH 2/7] build(demo): upgrade commons-demo to 3.10.0

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 3364fe6..aaaba31 100644
--- a/pom.xml
+++ b/pom.xml
@@ -163,7 +163,7 @@
 		<dependency>
 			<groupId>com.flowingcode.vaadin.addons.demo</groupId>
 			<artifactId>commons-demo</artifactId>
-			<version>3.5.1</version>
+			<version>3.10.0</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

From 3c36b3b62e8ba5e9b895de496d9ced8a0b9c8b5a Mon Sep 17 00:00:00 2001
From: Javier Godoy <11554739+javier-godoy@users.noreply.github.com>
Date: Wed, 29 Oct 2025 16:54:20 -0300
Subject: [PATCH 3/7] ci: upgrade jetty.version to 11.0.26 for vaadin 24

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index aaaba31..154f548 100644
--- a/pom.xml
+++ b/pom.xml
@@ -472,7 +472,7 @@
 				<maven.compiler.source>17</maven.compiler.source>
 				<maven.compiler.target>17</maven.compiler.target>
 				<vaadin.version>24.4.12</vaadin.version>
-				<jetty.version>11.0.12</jetty.version>
+				<jetty.version>11.0.26</jetty.version>
 			</properties>
 			<repositories>
 					<repository>

From 3d7ab40d8ce710d883f5285a0a21243b907776dc Mon Sep 17 00:00:00 2001
From: Javier Godoy <11554739+javier-godoy@users.noreply.github.com>
Date: Thu, 30 Oct 2025 13:45:26 -0300
Subject: [PATCH 4/7] chore: update .gitignore

---
 .gitignore | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index d972be1..1063874 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,4 +17,6 @@ types.d.ts
 /frontend/index.html
 vite.generated.ts
 vite.config.ts
-/src/main/bundles
\ No newline at end of file
+/src/main/bundles
+/src/main/frontend/generated
+/src/main/frontend/index.html
\ No newline at end of file

From 925a82cd0be901fed30cffbb30ad188380e4c0ad Mon Sep 17 00:00:00 2001
From: Javier Godoy <11554739+javier-godoy@users.noreply.github.com>
Date: Mon, 3 Nov 2025 12:23:35 -0300
Subject: [PATCH 5/7] feat: add json-migration-helper

---
 pom.xml                                                    | 5 +++++
 .../com/flowingcode/vaadin/addons/chipfield/ChipField.java | 7 ++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 154f548..7076e38 100644
--- a/pom.xml
+++ b/pom.xml
@@ -125,6 +125,11 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>com.flowingcode.vaadin</groupId>
+            <artifactId>json-migration-helper</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
diff --git a/src/main/java/com/flowingcode/vaadin/addons/chipfield/ChipField.java b/src/main/java/com/flowingcode/vaadin/addons/chipfield/ChipField.java
index c216b08..4665646 100644
--- a/src/main/java/com/flowingcode/vaadin/addons/chipfield/ChipField.java
+++ b/src/main/java/com/flowingcode/vaadin/addons/chipfield/ChipField.java
@@ -27,6 +27,7 @@
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Stream;
+import com.flowingcode.vaadin.jsonmigration.JsonMigration;
 import com.vaadin.flow.component.AbstractField;
 import com.vaadin.flow.component.AttachEvent;
 import com.vaadin.flow.component.ComponentEvent;
@@ -151,7 +152,7 @@ private void configure() {
         .addEventListener(
             "chip-created",
             e -> {
-              JsonObject eventData = e.getEventData();
+              JsonObject eventData = JsonMigration.getEventData(e);
               String chipLabel = eventData.get(CHIP_LABEL).asString();
               T newItem =
                   findItemByLabel(chipLabel)
@@ -178,7 +179,7 @@ private void configure() {
         .addEventListener(
             "chip-removed",
             e -> {
-              JsonObject eventData = e.getEventData();
+              JsonObject eventData = JsonMigration.getEventData(e);
               String chipLabel = eventData.get(CHIP_LABEL).asString();
               findItemByLabel(chipLabel).ifPresent(item -> removeSelectedItem(item, true));
             })
@@ -197,7 +198,7 @@ private void configureItems() {
           object.put("value", itemLabelGenerator.apply(item));
           array.set(index.getAndIncrement(), object);
         });
-    getElement().setPropertyJson("source", array);
+    JsonMigration.setPropertyJson(getElement(), "source", array);
   }
 
   @Override

From b30a368325e1d4e15ba9a34e034cc86535970173 Mon Sep 17 00:00:00 2001
From: Javier Godoy <11554739+javier-godoy@users.noreply.github.com>
Date: Mon, 3 Nov 2025 12:24:02 -0300
Subject: [PATCH 6/7] build: set version to 2.7.0-SNAPSHOT

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 7076e38..da35d65 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>com.flowingcode.vaadin.addons.chipfield</groupId>
     <artifactId>chipfield-addon</artifactId>
-    <version>2.6.2-SNAPSHOT</version>
+    <version>2.7.0-SNAPSHOT</version>
     <name>ChipField Addon</name>
     <description>Integration of paper-chip for Vaadin 14 as a field</description>
 

From 9e5068d7c98f12126606bb747e810294809355fa Mon Sep 17 00:00:00 2001
From: Javier Godoy <11554739+javier-godoy@users.noreply.github.com>
Date: Thu, 30 Oct 2025 13:44:34 -0300
Subject: [PATCH 7/7] ci: upgrade webdrivermanager to 6.3.2

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index da35d65..9532c4d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -155,7 +155,7 @@
 		<dependency>
 	        <groupId>io.github.bonigarcia</groupId>
 	        <artifactId>webdrivermanager</artifactId>
-	        <version>4.3.1</version>
+	        <version>6.3.2</version>
 	    	<scope>test</scope>
     	</dependency>
     	<dependency>