Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 20 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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>

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Regarding upgrade guide, this dependency should be optional.

<dependency>
    <groupId>com.vaadin</groupId>
    <artifactId>vaadin-dev</artifactId>
    <optional>true</optional>
</dependency>

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hello. Yes, we will fix this to align with idiomatic usage.

Please note that the upgrade guide's recommendation applies to applications (enabling automatic switching between local development mode and packaged production mode). In this specific case, however, the v25 profile is used solely to run the demo in dev mode for testing the add-on both with Vaadin 24 and 25.

Since add-ons themselves are not built in a specific "mode", we utilize a separate environment to test add-on integration within a production-built application.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed #193

</dependency>
</dependencies>
</profile>

</profiles>

</project>
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -53,7 +53,6 @@
import org.junit.Test;

@SuppressWarnings("serial")
@net.jcip.annotations.NotThreadSafe
public class ConcurrentExportTests {

private static final int TEST_TIMEOUT = 10000;
Expand Down