diff --git a/pom.xml b/pom.xml
index 97f5b6c..ea302d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,13 +4,13 @@
 
 	<groupId>org.vaadin.addons.flowingcode</groupId>
 	<artifactId>grid-exporter-addon</artifactId>
-	<version>2.5.3-SNAPSHOT</version>
+	<version>3.0.0-SNAPSHOT</version>
 	<name>Grid Exporter Add-on</name>
 	<description>Grid Exporter Add-on for Vaadin Flow</description>
 	<url>https://www.flowingcode.com/en/open-source/</url>
 
 	<properties>
-        <vaadin.version>24.3.9</vaadin.version>
+        <vaadin.version>24.8.14</vaadin.version>
         <selenium.version>4.1.2</selenium.version>
 		<maven.compiler.source>17</maven.compiler.source>
 		<maven.compiler.target>17</maven.compiler.target>
@@ -62,7 +62,7 @@
             <dependency>
             	<groupId>com.flowingcode.vaadin.addons.demo</groupId>
             	<artifactId>commons-demo</artifactId>
-            	<version>4.1.0</version>
+            	<version>5.0.0</version>
             </dependency>
 		</dependencies>
 	</dependencyManagement>
@@ -177,7 +177,7 @@
 		<dependency>
 			<groupId>org.vaadin.addons.flowingcode</groupId>
 			<artifactId>grid-helpers</artifactId>
-			<version>1.3.2</version>
+			<version>2.0.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
@@ -197,7 +197,7 @@
 		<dependency>
 			<groupId>com.flowingcode.vaadin.addons</groupId>
 			<artifactId>error-window-vaadin</artifactId>
-			<version>3.4.0</version>
+			<version>4.2.0</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -593,6 +593,21 @@
 	            </build>
 	        </profile>
 
+		<profile>
+			<id>v25</id>
+			<properties>
+				<maven.compiler.source>21</maven.compiler.source>
+				<maven.compiler.target>21</maven.compiler.target>
+				<vaadin.version>25.0.3</vaadin.version>
+			</properties>
+			<dependencies>
+				<dependency>
+					<groupId>com.vaadin</groupId>
+					<artifactId>vaadin-dev</artifactId>
+				</dependency>
+			</dependencies>
+		</profile>
+		
 	</profiles>
 
 </project>
diff --git a/src/test/java/com/flowingcode/vaadin/addons/gridexporter/test/ConcurrentExportTests.java b/src/test/java/com/flowingcode/vaadin/addons/gridexporter/test/ConcurrentExportTests.java
index 011c086..46137fe 100644
--- a/src/test/java/com/flowingcode/vaadin/addons/gridexporter/test/ConcurrentExportTests.java
+++ b/src/test/java/com/flowingcode/vaadin/addons/gridexporter/test/ConcurrentExportTests.java
@@ -2,7 +2,7 @@
  * #%L
  * Grid Exporter Add-on
  * %%
- * Copyright (C) 2022 - 2024 Flowing Code
+ * Copyright (C) 2022 - 2026 Flowing Code
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -53,7 +53,6 @@
 import org.junit.Test;
 
 @SuppressWarnings("serial")
-@net.jcip.annotations.NotThreadSafe
 public class ConcurrentExportTests {
 
   private static final int TEST_TIMEOUT = 10000;