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
2 changes: 1 addition & 1 deletion .github/workflows/validation.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Flow Validation
on:
push:
branches: [main, '24.9', '24.8', '24.7', '23.6']
branches: [main, '25.0', '24.9', '24.8', '23.6']
workflow_dispatch:
pull_request_target:
types: [opened, synchronize, reopened]
Expand Down
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,6 @@ Since [Vaadin platform 23.0](https://github.com/vaadin/platform), Flow major and
| 2.12 | 14.13 (LATEST commercial with Java 8+ support and Servlet 3) | 2.12 |
| 23.6 | 23.6 (LATEST commercial with Java 11+ support and Servlet 3) | 23.6 |
| 24.8 | 24.8 (maintained minor release, Java 17+, Jakarta EE 10, Spring-boot 3) | 24.8 |
| 24.9 | 24.9 (LATEST release, Java 17+, Jakarta EE 10, Spring-boot 3) | 24.9 |
| main | 25.0 (Vaadin 25.0 preparations, Java 21+, Jakarta EE 11, Spring-boot 4) | 25.0 |
| 24.9 | 24.9 (LATEST 24 minor release, Java 17+, Jakarta EE 10, Spring-boot 3) | 24.9 |
| 25.0 | 25.0 (LATEST release, Java 21+, Jakarta EE 11, Spring-boot 4) | 25.0 |
| main | 25.1 (Vaadin 25.1 preparations, Java 21+, Jakarta EE 11, Spring-boot 4) | 25.1 |
2 changes: 1 addition & 1 deletion flow-bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.vaadin</groupId>
<artifactId>flow-project</artifactId>
<version>25.0-SNAPSHOT</version>
<version>25.1-SNAPSHOT</version>
</parent>
<artifactId>flow-bom</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion flow-build-tools/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.vaadin</groupId>
<artifactId>flow-project</artifactId>
<version>25.0-SNAPSHOT</version>
<version>25.1-SNAPSHOT</version>
</parent>
<artifactId>flow-build-tools</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion flow-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.vaadin</groupId>
<artifactId>flow-project</artifactId>
<version>25.0-SNAPSHOT</version>
<version>25.1-SNAPSHOT</version>
</parent>
<artifactId>flow-client</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion flow-data/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.vaadin</groupId>
<artifactId>flow-project</artifactId>
<version>25.0-SNAPSHOT</version>
<version>25.1-SNAPSHOT</version>
</parent>
<artifactId>flow-data</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion flow-dnd/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.vaadin</groupId>
<artifactId>flow-project</artifactId>
<version>25.0-SNAPSHOT</version>
<version>25.1-SNAPSHOT</version>
</parent>

<artifactId>flow-dnd</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion flow-html-components-testbench/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.vaadin</groupId>
<artifactId>flow-project</artifactId>
<version>25.0-SNAPSHOT</version>
<version>25.1-SNAPSHOT</version>
</parent>
<artifactId>flow-html-components-testbench</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion flow-html-components/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.vaadin</groupId>
<artifactId>flow-project</artifactId>
<version>25.0-SNAPSHOT</version>
<version>25.1-SNAPSHOT</version>
</parent>
<artifactId>flow-html-components</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion flow-jandex/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>com.vaadin</groupId>
<artifactId>flow-project</artifactId>
<version>25.0-SNAPSHOT</version>
<version>25.1-SNAPSHOT</version>
</parent>

<artifactId>flow-jandex</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion flow-lit-template/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.vaadin</groupId>
<artifactId>flow-project</artifactId>
<version>25.0-SNAPSHOT</version>
<version>25.1-SNAPSHOT</version>
</parent>
<artifactId>flow-lit-template</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion flow-plugins/flow-dev-bundle-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.vaadin</groupId>
<artifactId>flow-plugins</artifactId>
<version>25.0-SNAPSHOT</version>
<version>25.1-SNAPSHOT</version>
</parent>
<artifactId>flow-dev-bundle-plugin</artifactId>
<packaging>maven-plugin</packaging>
Expand Down
2 changes: 1 addition & 1 deletion flow-plugins/flow-gradle-plugin/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ Alternatively, you can build and publish the Flow Gradle plugin into the local M

1. Clone the Base Starter Gradle project.
2. Add `mavenLocal()` to `buildscript.repositories` as the first place to look up.
3. Add `dependencies { classpath 'com.vaadin:flow-gradle-plugin:25.0-SNAPSHOT' }` to `buildscript.repositories`.
3. Add `dependencies { classpath 'com.vaadin:flow-gradle-plugin:25.1-SNAPSHOT' }` to `buildscript.repositories`.
4. Run `./gradlew clean build publishToMavenLocal` in the `flow-plugins/flow-gradle-plugin` repo folder.
5. Run the previous command with `-x functionalTest` to skip functional tests.
6. If you now run `./gradlew vaadinPrepareFrontend` in the Starter project folder, Gradle will use the local version of the Flow plugin. You can verify that by adding `println()` statements into the `VaadinPrepareFrontendTask` class.
Expand Down
2 changes: 1 addition & 1 deletion flow-plugins/flow-gradle-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.vaadin</groupId>
<artifactId>flow-plugins</artifactId>
<version>25.0-SNAPSHOT</version>
<version>25.1-SNAPSHOT</version>
</parent>

<artifactId>flow-gradle-plugin</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import java.io.File
*/
abstract class AbstractGradleTest {

val flowVersion = System.getenv("vaadin.version").takeUnless { it.isNullOrEmpty() } ?: "25.0-SNAPSHOT"
val flowVersion = System.getenv("vaadin.version").takeUnless { it.isNullOrEmpty() } ?: "25.1-SNAPSHOT"
val slf4jVersion = "2.0.3"

/**
Expand Down
2 changes: 1 addition & 1 deletion flow-plugins/flow-maven-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.vaadin</groupId>
<artifactId>flow-plugins</artifactId>
<version>25.0-SNAPSHOT</version>
<version>25.1-SNAPSHOT</version>
</parent>
<artifactId>flow-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public void setArtifactId_wildcard_throwIfInInvalidPosition() {
@Test
public void matches_matchEverything_returnsTrue() {
Artifact artifact = fromString(
"com.vaadin:vaadin:jar:25.0-SNAPSHOT:compile");
"com.vaadin:vaadin:jar:25.1-SNAPSHOT:compile");
Assert.assertTrue("Unspecified groups and artifacts",
new FrontendScannerConfig.ArtifactMatcher().matches(artifact));
Assert.assertTrue("Empty groups and artifacts",
Expand Down Expand Up @@ -112,131 +112,131 @@ public void matches_exactGroup() {
FrontendScannerConfig.ArtifactMatcher matcher = new FrontendScannerConfig.ArtifactMatcher(
"com.vaadin", null);
Assert.assertTrue(matcher.matches(
fromString("com.vaadin:vaadin:jar:25.0-SNAPSHOT:compile")));
fromString("com.vaadin:vaadin:jar:25.1-SNAPSHOT:compile")));
Assert.assertTrue(matcher.matches(fromString(
"com.vaadin:flow-server:jar:25.0-SNAPSHOT:compile")));
"com.vaadin:flow-server:jar:25.1-SNAPSHOT:compile")));
Assert.assertFalse(matcher.matches(fromString(
"com.vaadin.demo:vaadin:jar:25.0-SNAPSHOT:compile")));
"com.vaadin.demo:vaadin:jar:25.1-SNAPSHOT:compile")));
Assert.assertFalse(matcher.matches(fromString(
"org.com.vaadin.demo:vaadin:jar:25.0-SNAPSHOT:compile")));
"org.com.vaadin.demo:vaadin:jar:25.1-SNAPSHOT:compile")));
Assert.assertFalse(matcher.matches(
fromString("com.vaadindemo:vaadin:jar:25.0-SNAPSHOT:compile")));
fromString("com.vaadindemo:vaadin:jar:25.1-SNAPSHOT:compile")));
Assert.assertFalse(matcher.matches(
fromString("org.example:vaadin:jar:25.0-SNAPSHOT:compile")));
fromString("org.example:vaadin:jar:25.1-SNAPSHOT:compile")));
}

@Test
public void matches_wildcardGroup() {
FrontendScannerConfig.ArtifactMatcher matcher = new FrontendScannerConfig.ArtifactMatcher(
"com.vaadin.*", null);
Assert.assertTrue(matcher.matches(fromString(
"com.vaadin.example:vaadin:jar:25.0-SNAPSHOT:compile")));
"com.vaadin.example:vaadin:jar:25.1-SNAPSHOT:compile")));
Assert.assertTrue(matcher.matches(fromString(
"com.vaadin.demo:vaadin:jar:25.0-SNAPSHOT:compile")));
"com.vaadin.demo:vaadin:jar:25.1-SNAPSHOT:compile")));
Assert.assertTrue(matcher.matches(fromString(
"com.vaadin.demo.a:vaadin:jar:25.0-SNAPSHOT:compile")));
"com.vaadin.demo.a:vaadin:jar:25.1-SNAPSHOT:compile")));
Assert.assertFalse(matcher.matches(
fromString("com.vaadin:vaadin:jar:25.0-SNAPSHOT:compile")));
fromString("com.vaadin:vaadin:jar:25.1-SNAPSHOT:compile")));

matcher.setGroupId("*.vaadin");
Assert.assertTrue(matcher.matches(
fromString("com.vaadin:vaadin:jar:25.0-SNAPSHOT:compile")));
fromString("com.vaadin:vaadin:jar:25.1-SNAPSHOT:compile")));
Assert.assertTrue(matcher.matches(fromString(
"com.example.vaadin:vaadin:jar:25.0-SNAPSHOT:compile")));
"com.example.vaadin:vaadin:jar:25.1-SNAPSHOT:compile")));
Assert.assertTrue(matcher.matches(
fromString(".vaadin:vaadin:jar:25.0-SNAPSHOT:compile")));
fromString(".vaadin:vaadin:jar:25.1-SNAPSHOT:compile")));
Assert.assertFalse(matcher.matches(
fromString("vaadin:vaadin:jar:25.0-SNAPSHOT:compile")));
fromString("vaadin:vaadin:jar:25.1-SNAPSHOT:compile")));
Assert.assertFalse(matcher.matches(
fromString("com.vaadindemo:vaadin:jar:25.0-SNAPSHOT:compile")));
fromString("com.vaadindemo:vaadin:jar:25.1-SNAPSHOT:compile")));
Assert.assertFalse(matcher.matches(fromString(
"com.vaadin.example:vaadin:jar:25.0-SNAPSHOT:compile")));
"com.vaadin.example:vaadin:jar:25.1-SNAPSHOT:compile")));

matcher.setGroupId("*vaadin*");
Assert.assertTrue(matcher.matches(fromString(
"com.vaadin.example:vaadin:jar:25.0-SNAPSHOT:compile")));
"com.vaadin.example:vaadin:jar:25.1-SNAPSHOT:compile")));
Assert.assertTrue(matcher.matches(fromString(
"com.vaadin.demo:vaadin:jar:25.0-SNAPSHOT:compile")));
"com.vaadin.demo:vaadin:jar:25.1-SNAPSHOT:compile")));
Assert.assertTrue(matcher.matches(fromString(
"com.vaadin.demo.a:vaadin:jar:25.0-SNAPSHOT:compile")));
"com.vaadin.demo.a:vaadin:jar:25.1-SNAPSHOT:compile")));
Assert.assertTrue(matcher.matches(
fromString("com.vaadin:vaadin:jar:25.0-SNAPSHOT:compile")));
fromString("com.vaadin:vaadin:jar:25.1-SNAPSHOT:compile")));
Assert.assertTrue(matcher.matches(
fromString("com.vaadin:vaadin:jar:25.0-SNAPSHOT:compile")));
fromString("com.vaadin:vaadin:jar:25.1-SNAPSHOT:compile")));
Assert.assertTrue(matcher.matches(fromString(
"com.example.vaadin:vaadin:jar:25.0-SNAPSHOT:compile")));
"com.example.vaadin:vaadin:jar:25.1-SNAPSHOT:compile")));
Assert.assertTrue(matcher.matches(
fromString(".vaadin:vaadin:jar:25.0-SNAPSHOT:compile")));
fromString(".vaadin:vaadin:jar:25.1-SNAPSHOT:compile")));
Assert.assertTrue(matcher.matches(
fromString("vaadin:vaadin:jar:25.0-SNAPSHOT:compile")));
fromString("vaadin:vaadin:jar:25.1-SNAPSHOT:compile")));
Assert.assertTrue(matcher.matches(
fromString("com.vaadindemo:vaadin:jar:25.0-SNAPSHOT:compile")));
fromString("com.vaadindemo:vaadin:jar:25.1-SNAPSHOT:compile")));
Assert.assertTrue(matcher.matches(fromString(
"com.vaadin.example:vaadin:jar:25.0-SNAPSHOT:compile")));
"com.vaadin.example:vaadin:jar:25.1-SNAPSHOT:compile")));
Assert.assertFalse(matcher.matches(
fromString("com.example:vaadin:jar:25.0-SNAPSHOT:compile")));
fromString("com.example:vaadin:jar:25.1-SNAPSHOT:compile")));
}

@Test
public void matches_wildcardArtifact() {
FrontendScannerConfig.ArtifactMatcher matcher = new FrontendScannerConfig.ArtifactMatcher(
null, "vaadin*");
Assert.assertTrue(matcher.matches(fromString(
"com.vaadin.example:vaadin:jar:25.0-SNAPSHOT:compile")));
"com.vaadin.example:vaadin:jar:25.1-SNAPSHOT:compile")));
Assert.assertTrue(matcher.matches(fromString(
"com.vaadin.demo:vaadin-demo:jar:25.0-SNAPSHOT:compile")));
"com.vaadin.demo:vaadin-demo:jar:25.1-SNAPSHOT:compile")));
Assert.assertTrue(matcher.matches(fromString(
"com.vaadin.demo.a:vaadindemo:jar:25.0-SNAPSHOT:compile")));
"com.vaadin.demo.a:vaadindemo:jar:25.1-SNAPSHOT:compile")));
Assert.assertFalse(matcher.matches(
fromString("com.vaadin:demovaadin:jar:25.0-SNAPSHOT:compile")));
fromString("com.vaadin:demovaadin:jar:25.1-SNAPSHOT:compile")));
Assert.assertFalse(matcher.matches(
fromString("com.vaadin:example:jar:25.0-SNAPSHOT:compile")));
fromString("com.vaadin:example:jar:25.1-SNAPSHOT:compile")));

matcher.setArtifactId("*vaadin");
Assert.assertTrue(matcher.matches(fromString(
"com.vaadin.example:vaadin:jar:25.0-SNAPSHOT:compile")));
"com.vaadin.example:vaadin:jar:25.1-SNAPSHOT:compile")));
Assert.assertTrue(matcher.matches(fromString(
"com.vaadin.demo:demo-vaadin:jar:25.0-SNAPSHOT:compile")));
"com.vaadin.demo:demo-vaadin:jar:25.1-SNAPSHOT:compile")));
Assert.assertTrue(matcher.matches(fromString(
"com.vaadin.demo.a:demovaadin:jar:25.0-SNAPSHOT:compile")));
"com.vaadin.demo.a:demovaadin:jar:25.1-SNAPSHOT:compile")));
Assert.assertFalse(matcher.matches(
fromString("com.vaadin:vaadindemo:jar:25.0-SNAPSHOT:compile")));
fromString("com.vaadin:vaadindemo:jar:25.1-SNAPSHOT:compile")));
Assert.assertFalse(matcher.matches(fromString(
"com.vaadin:vaadin-demo:jar:25.0-SNAPSHOT:compile")));
"com.vaadin:vaadin-demo:jar:25.1-SNAPSHOT:compile")));
Assert.assertFalse(matcher.matches(
fromString("com.vaadin:example:jar:25.0-SNAPSHOT:compile")));
fromString("com.vaadin:example:jar:25.1-SNAPSHOT:compile")));

matcher.setArtifactId("*vaadin*");
Assert.assertTrue(matcher.matches(fromString(
"com.vaadin.example:vaadin:jar:25.0-SNAPSHOT:compile")));
"com.vaadin.example:vaadin:jar:25.1-SNAPSHOT:compile")));
Assert.assertTrue(matcher.matches(fromString(
"com.vaadin.demo:vaadin-demo:jar:25.0-SNAPSHOT:compile")));
"com.vaadin.demo:vaadin-demo:jar:25.1-SNAPSHOT:compile")));
Assert.assertTrue(matcher.matches(fromString(
"com.vaadin.demo.a:vaadindemo:jar:25.0-SNAPSHOT:compile")));
"com.vaadin.demo.a:vaadindemo:jar:25.1-SNAPSHOT:compile")));
Assert.assertTrue(matcher.matches(fromString(
"com.vaadin.demo:demo-vaadin:jar:25.0-SNAPSHOT:compile")));
"com.vaadin.demo:demo-vaadin:jar:25.1-SNAPSHOT:compile")));
Assert.assertTrue(matcher.matches(fromString(
"com.vaadin.demo.a:demovaadin:jar:25.0-SNAPSHOT:compile")));
"com.vaadin.demo.a:demovaadin:jar:25.1-SNAPSHOT:compile")));
Assert.assertFalse(matcher.matches(
fromString("com.vaadin:example:jar:25.0-SNAPSHOT:compile")));
fromString("com.vaadin:example:jar:25.1-SNAPSHOT:compile")));
}

@Test
public void matches_exactArtifact() {
FrontendScannerConfig.ArtifactMatcher matcher = new FrontendScannerConfig.ArtifactMatcher(
null, "vaadin");
Assert.assertTrue(matcher.matches(
fromString("com.vaadin:vaadin:jar:25.0-SNAPSHOT:compile")));
fromString("com.vaadin:vaadin:jar:25.1-SNAPSHOT:compile")));
Assert.assertTrue(matcher.matches(
fromString("org.example:vaadin:jar:25.0-SNAPSHOT:compile")));
fromString("org.example:vaadin:jar:25.1-SNAPSHOT:compile")));
Assert.assertFalse(matcher.matches(
fromString("com.vaadin:vaadindemo:jar:25.0-SNAPSHOT:compile")));
fromString("com.vaadin:vaadindemo:jar:25.1-SNAPSHOT:compile")));
Assert.assertFalse(matcher.matches(
fromString("com.vaadin:demovaadin:jar:25.0-SNAPSHOT:compile")));
fromString("com.vaadin:demovaadin:jar:25.1-SNAPSHOT:compile")));
Assert.assertFalse(matcher.matches(fromString(
"com.vaadin:demovaadindemo:jar:25.0-SNAPSHOT:compile")));
"com.vaadin:demovaadindemo:jar:25.1-SNAPSHOT:compile")));
Assert.assertFalse(matcher.matches(
fromString("com.vaadin:example:jar:25.0-SNAPSHOT:compile")));
fromString("com.vaadin:example:jar:25.1-SNAPSHOT:compile")));

}

Expand All @@ -245,25 +245,25 @@ public void matches_exactGroupAndArtifact() {
FrontendScannerConfig.ArtifactMatcher matcher = new FrontendScannerConfig.ArtifactMatcher(
"com.vaadin", "vaadin");
Assert.assertTrue(matcher.matches(
fromString("com.vaadin:vaadin:jar:25.0-SNAPSHOT:compile")));
fromString("com.vaadin:vaadin:jar:25.1-SNAPSHOT:compile")));
Assert.assertFalse(matcher.matches(fromString(
"com.vaadin:flow-server:jar:25.0-SNAPSHOT:compile")));
"com.vaadin:flow-server:jar:25.1-SNAPSHOT:compile")));
Assert.assertFalse(matcher.matches(fromString(
"com.vaadin.demo:vaadin:jar:25.0-SNAPSHOT:compile")));
"com.vaadin.demo:vaadin:jar:25.1-SNAPSHOT:compile")));
Assert.assertFalse(matcher.matches(fromString(
"org.com.vaadin.demo:vaadin:jar:25.0-SNAPSHOT:compile")));
"org.com.vaadin.demo:vaadin:jar:25.1-SNAPSHOT:compile")));
Assert.assertFalse(matcher.matches(
fromString("com.vaadindemo:vaadin:jar:25.0-SNAPSHOT:compile")));
fromString("com.vaadindemo:vaadin:jar:25.1-SNAPSHOT:compile")));
Assert.assertFalse(matcher.matches(
fromString("org.example:vaadin:jar:25.0-SNAPSHOT:compile")));
fromString("org.example:vaadin:jar:25.1-SNAPSHOT:compile")));
Assert.assertFalse(matcher.matches(
fromString("com.vaadin:vaadindemo:jar:25.0-SNAPSHOT:compile")));
fromString("com.vaadin:vaadindemo:jar:25.1-SNAPSHOT:compile")));
Assert.assertFalse(matcher.matches(
fromString("com.vaadin:demovaadin:jar:25.0-SNAPSHOT:compile")));
fromString("com.vaadin:demovaadin:jar:25.1-SNAPSHOT:compile")));
Assert.assertFalse(matcher.matches(fromString(
"com.vaadin:demovaadindemo:jar:25.0-SNAPSHOT:compile")));
"com.vaadin:demovaadindemo:jar:25.1-SNAPSHOT:compile")));
Assert.assertFalse(matcher.matches(
fromString("com.vaadin:example:jar:25.0-SNAPSHOT:compile")));
fromString("com.vaadin:example:jar:25.1-SNAPSHOT:compile")));
}

@Test
Expand Down
Loading
Loading