Skip to content

Commit

Permalink
chore: Update branch to version 2.6 (#10015)
Browse files Browse the repository at this point in the history
  • Loading branch information
caalador authored Feb 11, 2021
1 parent 7df84a5 commit 9d24be5
Show file tree
Hide file tree
Showing 77 changed files with 81 additions and 86 deletions.
15 changes: 5 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,11 @@ The `master` branch is the latest version (5.0) that will at some point be relea
| Branch | [Platform Version](https://github.com/vaadin/platform/releases) | [Flow Version](https://github.com/vaadin/flow/releases) |
|--------|-----------------------------------------------------------------|---------------------------------------------------------|
| 1.0 | 10 (LTS) | 1.0 |
| 1.4 | 13.0.x (end of line) | 1.4 |
| 2.0 | 14.0.x | 2.0.x |
| 2.1 | 14.1.x | 2.1.x |
| 2.2 | 14.2.x | 2.2.x |
| 2.3 | 14.3.x | 2.3.x |
| 2.4 | 14.4.x | 2.4.x |
| 2.5 | 14.5.x (upcoming) | 2.5.x |
| 3.0 | 15.0.x | 3.0.x |
| 3.1 | 16.0.x | 3.1.x |
| 4.0 | 17.0.x | 4.x |
| 2.4 | 14.4.x (LTS) | 2.4.x |
| 2.5 | 14.5.x (PRERELEASE) | 2.5.x |
| 2.6 | 14.6.x (PREPRERELEASE) | 2.6.x |
| 5.0 | 18.0.x (LATEST) | 5.x |
| 6.0 | 19.0.x (PRERELEASE until 3/3/21) | 6.x |


Setting up Eclipse to Develop Flow
Expand Down
2 changes: 1 addition & 1 deletion build-tools/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.vaadin</groupId>
<artifactId>flow-project</artifactId>
<version>2.5-SNAPSHOT</version>
<version>2.6-SNAPSHOT</version>
</parent>
<artifactId>flow-buildtools</artifactId>
<name>vaadin-buildhelpers</name>
Expand Down
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>2.5-SNAPSHOT</version>
<version>2.6-SNAPSHOT</version>
</parent>
<artifactId>flow-bom</artifactId>
<packaging>pom</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 @@ -6,7 +6,7 @@
<parent>
<groupId>com.vaadin</groupId>
<artifactId>flow-project</artifactId>
<version>2.5-SNAPSHOT</version>
<version>2.6-SNAPSHOT</version>
</parent>
<artifactId>flow-client</artifactId>
<name>Flow Client</name>
Expand Down
2 changes: 1 addition & 1 deletion flow-component-demo-helpers/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.vaadin</groupId>
<artifactId>flow-project</artifactId>
<version>2.5-SNAPSHOT</version>
<version>2.6-SNAPSHOT</version>
</parent>

<artifactId>flow-component-demo-helpers</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion flow-data/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.vaadin</groupId>
<artifactId>flow-project</artifactId>
<version>2.5-SNAPSHOT</version>
<version>2.6-SNAPSHOT</version>
</parent>
<artifactId>flow-data</artifactId>
<name>Flow Data</name>
Expand Down
2 changes: 1 addition & 1 deletion flow-dev-deps/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.vaadin</groupId>
<artifactId>flow-project</artifactId>
<version>2.5-SNAPSHOT</version>
<version>2.6-SNAPSHOT</version>
</parent>
<artifactId>flow-dev-deps</artifactId>
<name>Flow Development Dependencies</name>
Expand Down
2 changes: 1 addition & 1 deletion flow-dnd/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<artifactId>flow-project</artifactId>
<groupId>com.vaadin</groupId>
<version>2.5-SNAPSHOT</version>
<version>2.6-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 @@ -5,7 +5,7 @@
<parent>
<groupId>com.vaadin</groupId>
<artifactId>flow-project</artifactId>
<version>2.5-SNAPSHOT</version>
<version>2.6-SNAPSHOT</version>
</parent>
<artifactId>flow-html-components-testbench</artifactId>
<name>TestBench elements for Flow HTML Components</name>
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 @@ -6,7 +6,7 @@
<parent>
<groupId>com.vaadin</groupId>
<artifactId>flow-project</artifactId>
<version>2.5-SNAPSHOT</version>
<version>2.6-SNAPSHOT</version>
</parent>
<artifactId>flow-html-components</artifactId>
<name>Flow HTML Components</name>
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 @@ -6,7 +6,7 @@
<parent>
<groupId>com.vaadin</groupId>
<artifactId>flow-project</artifactId>
<version>2.5-SNAPSHOT</version>
<version>2.6-SNAPSHOT</version>
</parent>
<artifactId>flow-lit-template</artifactId>
<name>Flow Lit Templates Support</name>
Expand Down
2 changes: 1 addition & 1 deletion flow-maven-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.vaadin</groupId>
<artifactId>flow-project</artifactId>
<version>2.5-SNAPSHOT</version>
<version>2.6-SNAPSHOT</version>
</parent>
<artifactId>flow-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>
Expand Down
2 changes: 1 addition & 1 deletion flow-migration/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.vaadin</groupId>
<artifactId>flow-project</artifactId>
<version>2.5-SNAPSHOT</version>
<version>2.6-SNAPSHOT</version>
</parent>
<artifactId>flow-migration</artifactId>
<name>Flow Migration Tool</name>
Expand Down
2 changes: 1 addition & 1 deletion flow-osgi/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.vaadin</groupId>
<artifactId>flow-project</artifactId>
<version>2.5-SNAPSHOT</version>
<version>2.6-SNAPSHOT</version>
</parent>
<artifactId>flow-osgi</artifactId>
<name>Flow OSGi Support</name>
Expand Down
2 changes: 1 addition & 1 deletion flow-push/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.vaadin</groupId>
<artifactId>flow-project</artifactId>
<version>2.5-SNAPSHOT</version>
<version>2.6-SNAPSHOT</version>
</parent>
<artifactId>flow-push</artifactId>
<name>Flow Push</name>
Expand Down
2 changes: 1 addition & 1 deletion flow-server-compatibility-mode/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.vaadin</groupId>
<artifactId>flow-project</artifactId>
<version>2.5-SNAPSHOT</version>
<version>2.6-SNAPSHOT</version>
</parent>
<artifactId>flow-server-compatibility-mode</artifactId>
<name>Flow Server Compatibility Mode</name>
Expand Down
2 changes: 1 addition & 1 deletion flow-server-production-mode/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.vaadin</groupId>
<artifactId>flow-project</artifactId>
<version>2.5-SNAPSHOT</version>
<version>2.6-SNAPSHOT</version>
</parent>
<artifactId>flow-server-production-mode</artifactId>
<name>Flow Server Production Mode</name>
Expand Down
2 changes: 1 addition & 1 deletion flow-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.vaadin</groupId>
<artifactId>flow-project</artifactId>
<version>2.5-SNAPSHOT</version>
<version>2.6-SNAPSHOT</version>
</parent>
<artifactId>flow-server</artifactId>
<name>Flow Server</name>
Expand Down
2 changes: 1 addition & 1 deletion flow-test-generic/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>flow-project</artifactId>
<groupId>com.vaadin</groupId>
<version>2.5-SNAPSHOT</version>
<version>2.6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion flow-test-util/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.vaadin</groupId>
<artifactId>flow-project</artifactId>
<version>2.5-SNAPSHOT</version>
<version>2.6-SNAPSHOT</version>
</parent>

<artifactId>flow-test-util</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion flow-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.vaadin</groupId>
<artifactId>flow-project</artifactId>
<version>2.5-SNAPSHOT</version>
<version>2.6-SNAPSHOT</version>
</parent>
<artifactId>flow-tests</artifactId>
<name>Flow tests</name>
Expand Down
2 changes: 1 addition & 1 deletion flow-tests/servlet-containers/felix-jetty/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.vaadin</groupId>
<artifactId>flow-servlet-containers-test</artifactId>
<version>2.5-SNAPSHOT</version>
<version>2.6-SNAPSHOT</version>
</parent>

<artifactId>flow-test-felix-jetty-server</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion flow-tests/servlet-containers/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.vaadin</groupId>
<artifactId>flow-tests</artifactId>
<version>2.5-SNAPSHOT</version>
<version>2.6-SNAPSHOT</version>
</parent>
<artifactId>flow-servlet-containers-test</artifactId>
<name>flow-servlet-containers-test</name>
Expand Down
2 changes: 1 addition & 1 deletion flow-tests/servlet-containers/tomcat85/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.vaadin</groupId>
<artifactId>flow-servlet-containers-test</artifactId>
<version>2.5-SNAPSHOT</version>
<version>2.6-SNAPSHOT</version>
</parent>
<artifactId>flow-test-tomcat85-server</artifactId>
<name>Flow Tomcat 8.5 Test</name>
Expand Down
2 changes: 1 addition & 1 deletion flow-tests/servlet-containers/tomcat9/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.vaadin</groupId>
<artifactId>flow-servlet-containers-test</artifactId>
<version>2.5-SNAPSHOT</version>
<version>2.6-SNAPSHOT</version>
</parent>
<artifactId>flow-test-tomcat9-server</artifactId>
<name>Flow Tomcat 9 Test</name>
Expand Down
2 changes: 1 addition & 1 deletion flow-tests/test-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.vaadin</groupId>
<artifactId>flow-tests</artifactId>
<version>2.5-SNAPSHOT</version>
<version>2.6-SNAPSHOT</version>
</parent>
<artifactId>flow-test-common</artifactId>
<name>Flow common test UI classes</name>
Expand Down
2 changes: 1 addition & 1 deletion flow-tests/test-dev-mode/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.vaadin</groupId>
<artifactId>flow-tests</artifactId>
<version>2.5-SNAPSHOT</version>
<version>2.6-SNAPSHOT</version>
</parent>
<artifactId>flow-test-dev-mode</artifactId>
<name>Flow tests for dev mode</name>
Expand Down
2 changes: 1 addition & 1 deletion flow-tests/test-embedding/embedding-test-assets/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<artifactId>test-embedding</artifactId>
<groupId>com.vaadin</groupId>
<version>2.5-SNAPSHOT</version>
<version>2.6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion flow-tests/test-embedding/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<artifactId>flow-tests</artifactId>
<groupId>com.vaadin</groupId>
<version>2.5-SNAPSHOT</version>
<version>2.6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.vaadin</groupId>
<artifactId>test-embedding</artifactId>
<version>2.5-SNAPSHOT</version>
<version>2.6-SNAPSHOT</version>
</parent>
<artifactId>flow-test-embedding-generic-compatibility</artifactId>
<name>Flow Embedding, generic tests, compatibility</name>
Expand Down
2 changes: 1 addition & 1 deletion flow-tests/test-embedding/test-embedding-generic/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.vaadin</groupId>
<artifactId>test-embedding</artifactId>
<version>2.5-SNAPSHOT</version>
<version>2.6-SNAPSHOT</version>
</parent>
<artifactId>flow-test-embedding-generic</artifactId>
<name>Flow Embedding, generic tests</name>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>com.vaadin</groupId>
<artifactId>test-embedding</artifactId>
<version>2.5-SNAPSHOT</version>
<version>2.6-SNAPSHOT</version>
</parent>
<artifactId>flow-test-embedding-production-compatibility</artifactId>
<name>Flow Embedding, production tests, compatibility</name>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.vaadin</groupId>
<artifactId>test-embedding</artifactId>
<version>2.5-SNAPSHOT</version>
<version>2.6-SNAPSHOT</version>
</parent>
<artifactId>flow-test-embedding-production</artifactId>
<name>Flow Embedding, production tests</name>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.vaadin</groupId>
<artifactId>test-embedding</artifactId>
<version>2.5-SNAPSHOT</version>
<version>2.6-SNAPSHOT</version>
</parent>
<artifactId>flow-test-embedding-theme-variant-compatibility</artifactId>
<name>Flow Embedding, theme variant, compatibility</name>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>com.vaadin</groupId>
<artifactId>test-embedding</artifactId>
<version>2.5-SNAPSHOT</version>
<version>2.6-SNAPSHOT</version>
</parent>
<artifactId>flow-test-embedding-theme-variant</artifactId>
<name>Flow Embedding, theme variant</name>
Expand Down
2 changes: 1 addition & 1 deletion flow-tests/test-frontend-production-custom-context/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.vaadin</groupId>
<artifactId>flow-tests</artifactId>
<version>2.5-SNAPSHOT</version>
<version>2.6-SNAPSHOT</version>
</parent>
<artifactId>test-frontend-custom-context</artifactId>
<name>Flow Frontend Resources on custom context test under Production Mode</name>
Expand Down
2 changes: 1 addition & 1 deletion flow-tests/test-live-reload/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<artifactId>flow-tests</artifactId>
<groupId>com.vaadin</groupId>
<version>2.5-SNAPSHOT</version>
<version>2.6-SNAPSHOT</version>
</parent>
<artifactId>flow-test-live-reload-mode</artifactId>
<name>Flow tests for live reload in dev mode</name>
Expand Down
2 changes: 1 addition & 1 deletion flow-tests/test-lumo-theme/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.vaadin</groupId>
<artifactId>flow-tests</artifactId>
<version>2.5-SNAPSHOT</version>
<version>2.6-SNAPSHOT</version>
</parent>
<artifactId>flow-test-lumo-theme</artifactId>
<name>Flow Lumo theme tests</name>
Expand Down
2 changes: 1 addition & 1 deletion flow-tests/test-material-theme/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.vaadin</groupId>
<artifactId>flow-tests</artifactId>
<version>2.5-SNAPSHOT</version>
<version>2.6-SNAPSHOT</version>
</parent>
<artifactId>flow-test-material-theme</artifactId>
<name>Flow Material theme tests</name>
Expand Down
2 changes: 1 addition & 1 deletion flow-tests/test-memory-leaks/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.vaadin</groupId>
<artifactId>flow-tests</artifactId>
<version>2.5-SNAPSHOT</version>
<version>2.6-SNAPSHOT</version>
</parent>
<artifactId>flow-test-memory-leaks</artifactId>
<name>Flow memory leak tests</name>
Expand Down
2 changes: 1 addition & 1 deletion flow-tests/test-misc/pom-bower.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<artifactId>flow-tests</artifactId>
<groupId>com.vaadin</groupId>
<version>2.5-SNAPSHOT</version>
<version>2.6-SNAPSHOT</version>
</parent>
<artifactId>flow-misc-test-bower</artifactId>
<name>Flow Miscelaneous tests in bower</name>
Expand Down
2 changes: 1 addition & 1 deletion flow-tests/test-misc/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<artifactId>flow-tests</artifactId>
<groupId>com.vaadin</groupId>
<version>2.5-SNAPSHOT</version>
<version>2.6-SNAPSHOT</version>
</parent>
<artifactId>flow-misc-test</artifactId>
<name>Flow Miscelaneous tests in npm</name>
Expand Down
2 changes: 1 addition & 1 deletion flow-tests/test-mixed/pom-bower-devmode.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<artifactId>flow-tests</artifactId>
<groupId>com.vaadin</groupId>
<version>2.5-SNAPSHOT</version>
<version>2.6-SNAPSHOT</version>
</parent>
<artifactId>flow-test-bower-dev-mode</artifactId>
<name>Flow tests in bower and development mode</name>
Expand Down
Loading

0 comments on commit 9d24be5

Please sign in to comment.