From 25c00e664919a0418a93e9d3d51746b40fa4fabc Mon Sep 17 00:00:00 2001 From: Denis Date: Mon, 25 Jun 2018 15:47:13 +0300 Subject: [PATCH] Update version to 1.1-SNAPSHOT (#4323) --- CONTRIBUTING.md | 5 +++++ build-tools/pom.xml | 2 +- flow-client/pom.xml | 2 +- flow-components-parent/flow-code-generator-api/pom.xml | 2 +- flow-components-parent/flow-code-generator/pom.xml | 2 +- flow-components-parent/flow-component-demo-helpers/pom.xml | 2 +- flow-components-parent/flow-generated-components/pom.xml | 2 +- .../flow-webcomponent-api-analyzer/pom.xml | 2 +- flow-components-parent/pom.xml | 2 +- flow-data/pom.xml | 2 +- flow-html-components-testbench/pom.xml | 2 +- flow-html-components/pom.xml | 2 +- flow-maven-plugin/pom.xml | 2 +- flow-push/pom.xml | 2 +- flow-server-production-mode/pom.xml | 2 +- flow-server/pom.xml | 2 +- flow-test-generic/pom.xml | 2 +- flow-test-util/pom.xml | 2 +- flow-tests/pom.xml | 2 +- flow-tests/servlet-containers/pom.xml | 2 +- flow-tests/servlet-containers/tomcat85/pom.xml | 2 +- flow-tests/servlet-containers/tomcat9/pom.xml | 2 +- flow-tests/test-common/pom.xml | 2 +- flow-tests/test-dev-mode/pom.xml | 2 +- flow-tests/test-memory-leaks/pom.xml | 2 +- flow-tests/test-resources/pom.xml | 2 +- flow-tests/test-root-context/pom.xml | 6 +++--- flow-tests/test-root-ui-context/pom.xml | 2 +- flow-tests/test-scalability/pom.xml | 2 +- flow-tests/test-servlet/pom.xml | 2 +- flow-tests/test-subcontext/pom.xml | 2 +- flow-tests/test-themes/pom.xml | 2 +- flow-theme-integrations/lumo/pom.xml | 2 +- flow-theme-integrations/pom.xml | 2 +- flow/pom.xml | 2 +- pom.xml | 2 +- 36 files changed, 42 insertions(+), 37 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 732ebf96cb9..f0764fdbe5b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -4,6 +4,9 @@ # Summary +All fixes should always target the `master` branch. We will pick the bugfixes +to correct branches from the `master`. + We like quality patches that solve problems. A quality patch follows good coding practices - it’s easy to read and understand. For more complicated fixes or features, the change should be broken down into several smaller easy to understand patches. Most of this is really just what we consider to be common sense and best development practices. In other words: @@ -145,4 +148,6 @@ All our projects accept contributions as GitHub pull requests. The first time yo https://yangsu.github.io/pull-request-tutorial/ has instructions on how to create a pull request. +Please note that PR should target the `master` branch. + **Remember to check the "Allow edits from maintainers" so we can rebase the PR or make small changes if necessary**. diff --git a/build-tools/pom.xml b/build-tools/pom.xml index c844a989454..1f630b076de 100644 --- a/build-tools/pom.xml +++ b/build-tools/pom.xml @@ -5,7 +5,7 @@ com.vaadin flow-project - 1.0-SNAPSHOT + 1.1-SNAPSHOT flow-buildtools vaadin-buildhelpers diff --git a/flow-client/pom.xml b/flow-client/pom.xml index 5ee9bcaecc3..94b330ab063 100644 --- a/flow-client/pom.xml +++ b/flow-client/pom.xml @@ -5,7 +5,7 @@ com.vaadin flow-project - 1.0-SNAPSHOT + 1.1-SNAPSHOT flow-client Flow Client diff --git a/flow-components-parent/flow-code-generator-api/pom.xml b/flow-components-parent/flow-code-generator-api/pom.xml index be94e09c1db..b49333fb0d0 100644 --- a/flow-components-parent/flow-code-generator-api/pom.xml +++ b/flow-components-parent/flow-code-generator-api/pom.xml @@ -5,7 +5,7 @@ com.vaadin flow-components-parent - 1.0-SNAPSHOT + 1.1-SNAPSHOT flow-code-generator-api Flow code generator API diff --git a/flow-components-parent/flow-code-generator/pom.xml b/flow-components-parent/flow-code-generator/pom.xml index 252f917794d..878d6432987 100644 --- a/flow-components-parent/flow-code-generator/pom.xml +++ b/flow-components-parent/flow-code-generator/pom.xml @@ -5,7 +5,7 @@ com.vaadin flow-components-parent - 1.0-SNAPSHOT + 1.1-SNAPSHOT flow-code-generator Flow code generator diff --git a/flow-components-parent/flow-component-demo-helpers/pom.xml b/flow-components-parent/flow-component-demo-helpers/pom.xml index 77a2e97e2e9..d79a8d6d1eb 100644 --- a/flow-components-parent/flow-component-demo-helpers/pom.xml +++ b/flow-components-parent/flow-component-demo-helpers/pom.xml @@ -7,7 +7,7 @@ com.vaadin flow-components-parent - 1.0-SNAPSHOT + 1.1-SNAPSHOT flow-component-demo-helpers diff --git a/flow-components-parent/flow-generated-components/pom.xml b/flow-components-parent/flow-generated-components/pom.xml index e13f986d03b..276ee72830a 100644 --- a/flow-components-parent/flow-generated-components/pom.xml +++ b/flow-components-parent/flow-generated-components/pom.xml @@ -5,7 +5,7 @@ com.vaadin flow-components-parent - 1.0-SNAPSHOT + 1.1-SNAPSHOT flow-generated-components Flow Generated Component diff --git a/flow-components-parent/flow-webcomponent-api-analyzer/pom.xml b/flow-components-parent/flow-webcomponent-api-analyzer/pom.xml index 75531e0d978..3cefe4858b1 100644 --- a/flow-components-parent/flow-webcomponent-api-analyzer/pom.xml +++ b/flow-components-parent/flow-webcomponent-api-analyzer/pom.xml @@ -6,7 +6,7 @@ com.vaadin flow-components-parent - 1.0-SNAPSHOT + 1.1-SNAPSHOT flow-webcomponent-api-analyzer Flow WebComponent API Analyzer diff --git a/flow-components-parent/pom.xml b/flow-components-parent/pom.xml index 751173377ed..08e2b310b38 100644 --- a/flow-components-parent/pom.xml +++ b/flow-components-parent/pom.xml @@ -5,7 +5,7 @@ com.vaadin flow-project - 1.0-SNAPSHOT + 1.1-SNAPSHOT flow-components-parent Flow components parent project diff --git a/flow-data/pom.xml b/flow-data/pom.xml index 04629a17076..459b35ee5bf 100644 --- a/flow-data/pom.xml +++ b/flow-data/pom.xml @@ -5,7 +5,7 @@ com.vaadin flow-project - 1.0-SNAPSHOT + 1.1-SNAPSHOT flow-data Flow Data diff --git a/flow-html-components-testbench/pom.xml b/flow-html-components-testbench/pom.xml index bc66e1fbe91..0c63aac1ee7 100644 --- a/flow-html-components-testbench/pom.xml +++ b/flow-html-components-testbench/pom.xml @@ -5,7 +5,7 @@ com.vaadin flow-project - 1.0-SNAPSHOT + 1.1-SNAPSHOT flow-html-components-testbench TestBench elements for Flow HTML Components diff --git a/flow-html-components/pom.xml b/flow-html-components/pom.xml index 14438a6f014..9342074ea35 100644 --- a/flow-html-components/pom.xml +++ b/flow-html-components/pom.xml @@ -5,7 +5,7 @@ com.vaadin flow-project - 1.0-SNAPSHOT + 1.1-SNAPSHOT flow-html-components Flow HTML Components diff --git a/flow-maven-plugin/pom.xml b/flow-maven-plugin/pom.xml index ecad42104da..9583c7cd256 100644 --- a/flow-maven-plugin/pom.xml +++ b/flow-maven-plugin/pom.xml @@ -4,7 +4,7 @@ com.vaadin flow-project - 1.0-SNAPSHOT + 1.1-SNAPSHOT flow-maven-plugin maven-plugin diff --git a/flow-push/pom.xml b/flow-push/pom.xml index cc20d92a8d8..91afd177b18 100644 --- a/flow-push/pom.xml +++ b/flow-push/pom.xml @@ -5,7 +5,7 @@ com.vaadin flow-project - 1.0-SNAPSHOT + 1.1-SNAPSHOT flow-push Flow Push diff --git a/flow-server-production-mode/pom.xml b/flow-server-production-mode/pom.xml index d79978fcd77..52647f551df 100644 --- a/flow-server-production-mode/pom.xml +++ b/flow-server-production-mode/pom.xml @@ -5,7 +5,7 @@ com.vaadin flow-project - 1.0-SNAPSHOT + 1.1-SNAPSHOT flow-server-production-mode Flow Server Production Mode diff --git a/flow-server/pom.xml b/flow-server/pom.xml index 98b645f2379..96690901f60 100644 --- a/flow-server/pom.xml +++ b/flow-server/pom.xml @@ -5,7 +5,7 @@ com.vaadin flow-project - 1.0-SNAPSHOT + 1.1-SNAPSHOT flow-server Flow Server diff --git a/flow-test-generic/pom.xml b/flow-test-generic/pom.xml index e44b852a0a2..99ba99793ea 100644 --- a/flow-test-generic/pom.xml +++ b/flow-test-generic/pom.xml @@ -5,7 +5,7 @@ flow-project com.vaadin - 1.0-SNAPSHOT + 1.1-SNAPSHOT 4.0.0 diff --git a/flow-test-util/pom.xml b/flow-test-util/pom.xml index 110dbb862ca..8c01dc04b6a 100644 --- a/flow-test-util/pom.xml +++ b/flow-test-util/pom.xml @@ -5,7 +5,7 @@ com.vaadin flow-project - 1.0-SNAPSHOT + 1.1-SNAPSHOT flow-test-util diff --git a/flow-tests/pom.xml b/flow-tests/pom.xml index 7e4410025a2..a058de30794 100644 --- a/flow-tests/pom.xml +++ b/flow-tests/pom.xml @@ -5,7 +5,7 @@ com.vaadin flow-project - 1.0-SNAPSHOT + 1.1-SNAPSHOT flow-tests Flow tests diff --git a/flow-tests/servlet-containers/pom.xml b/flow-tests/servlet-containers/pom.xml index e942919c7d0..7e983a7294d 100644 --- a/flow-tests/servlet-containers/pom.xml +++ b/flow-tests/servlet-containers/pom.xml @@ -5,7 +5,7 @@ com.vaadin flow-tests - 1.0-SNAPSHOT + 1.1-SNAPSHOT flow-servlet-containers-test flow-servlet-containers-test diff --git a/flow-tests/servlet-containers/tomcat85/pom.xml b/flow-tests/servlet-containers/tomcat85/pom.xml index bca50387562..2f58baf89a4 100644 --- a/flow-tests/servlet-containers/tomcat85/pom.xml +++ b/flow-tests/servlet-containers/tomcat85/pom.xml @@ -5,7 +5,7 @@ com.vaadin flow-servlet-containers-test - 1.0-SNAPSHOT + 1.1-SNAPSHOT flow-test-tomcat85-server Flow Tomcat 8.5 Test diff --git a/flow-tests/servlet-containers/tomcat9/pom.xml b/flow-tests/servlet-containers/tomcat9/pom.xml index ed56fec54aa..0302eab0efd 100644 --- a/flow-tests/servlet-containers/tomcat9/pom.xml +++ b/flow-tests/servlet-containers/tomcat9/pom.xml @@ -5,7 +5,7 @@ com.vaadin flow-servlet-containers-test - 1.0-SNAPSHOT + 1.1-SNAPSHOT flow-test-tomcat9-server Flow Tomcat 9 Test diff --git a/flow-tests/test-common/pom.xml b/flow-tests/test-common/pom.xml index 73005a6ecf9..903bf6cdabf 100644 --- a/flow-tests/test-common/pom.xml +++ b/flow-tests/test-common/pom.xml @@ -6,7 +6,7 @@ com.vaadin flow-tests - 1.0-SNAPSHOT + 1.1-SNAPSHOT flow-test-common Flow common test UI classes diff --git a/flow-tests/test-dev-mode/pom.xml b/flow-tests/test-dev-mode/pom.xml index 8290b353b2a..1df9db3d222 100644 --- a/flow-tests/test-dev-mode/pom.xml +++ b/flow-tests/test-dev-mode/pom.xml @@ -5,7 +5,7 @@ com.vaadin flow-tests - 1.0-SNAPSHOT + 1.1-SNAPSHOT flow-test-dev-mode Flow tests for dev mode diff --git a/flow-tests/test-memory-leaks/pom.xml b/flow-tests/test-memory-leaks/pom.xml index 7bf65680210..c6458c5149a 100644 --- a/flow-tests/test-memory-leaks/pom.xml +++ b/flow-tests/test-memory-leaks/pom.xml @@ -5,7 +5,7 @@ com.vaadin flow-tests - 1.0-SNAPSHOT + 1.1-SNAPSHOT flow-test-memory-leaks Flow memory leak tests diff --git a/flow-tests/test-resources/pom.xml b/flow-tests/test-resources/pom.xml index 14278e7f9d3..0f38865337b 100644 --- a/flow-tests/test-resources/pom.xml +++ b/flow-tests/test-resources/pom.xml @@ -5,7 +5,7 @@ com.vaadin flow-tests - 1.0-SNAPSHOT + 1.1-SNAPSHOT flow-test-resources Flow Test Resources diff --git a/flow-tests/test-root-context/pom.xml b/flow-tests/test-root-context/pom.xml index da06a0c885b..89041451854 100644 --- a/flow-tests/test-root-context/pom.xml +++ b/flow-tests/test-root-context/pom.xml @@ -6,7 +6,7 @@ com.vaadin flow-tests - 1.0-SNAPSHOT + 1.1-SNAPSHOT flow-test-root-context Flow root context tests @@ -176,7 +176,7 @@ com.vaadin flow-server-production-mode - 1.0-SNAPSHOT + 1.1-SNAPSHOT @@ -185,7 +185,7 @@ com.vaadin flow-maven-plugin - 1.0-SNAPSHOT + 1.1-SNAPSHOT diff --git a/flow-tests/test-root-ui-context/pom.xml b/flow-tests/test-root-ui-context/pom.xml index 4d406783a9e..44dfc1a10db 100644 --- a/flow-tests/test-root-ui-context/pom.xml +++ b/flow-tests/test-root-ui-context/pom.xml @@ -5,7 +5,7 @@ com.vaadin flow-tests - 1.0-SNAPSHOT + 1.1-SNAPSHOT flow-test-root-ui-context Flow root ui context tests diff --git a/flow-tests/test-scalability/pom.xml b/flow-tests/test-scalability/pom.xml index 445bf200660..1ab301e201b 100644 --- a/flow-tests/test-scalability/pom.xml +++ b/flow-tests/test-scalability/pom.xml @@ -5,7 +5,7 @@ com.vaadin flow-tests - 1.0-SNAPSHOT + 1.1-SNAPSHOT flow-test-scalability Flow scalability tests diff --git a/flow-tests/test-servlet/pom.xml b/flow-tests/test-servlet/pom.xml index 4d06138b4f0..5697802bed7 100644 --- a/flow-tests/test-servlet/pom.xml +++ b/flow-tests/test-servlet/pom.xml @@ -5,7 +5,7 @@ com.vaadin flow-tests - 1.0-SNAPSHOT + 1.1-SNAPSHOT flow-test-servlet Flow servlet registration test diff --git a/flow-tests/test-subcontext/pom.xml b/flow-tests/test-subcontext/pom.xml index 44f98737cc1..bb25c6024dc 100644 --- a/flow-tests/test-subcontext/pom.xml +++ b/flow-tests/test-subcontext/pom.xml @@ -5,7 +5,7 @@ com.vaadin flow-tests - 1.0-SNAPSHOT + 1.1-SNAPSHOT flow-test-subcontext Flow tests mapped for /context diff --git a/flow-tests/test-themes/pom.xml b/flow-tests/test-themes/pom.xml index 392bfbe5f15..ee80316c2c0 100644 --- a/flow-tests/test-themes/pom.xml +++ b/flow-tests/test-themes/pom.xml @@ -5,7 +5,7 @@ com.vaadin flow-tests - 1.0-SNAPSHOT + 1.1-SNAPSHOT flow-test-themes Flow themes tests diff --git a/flow-theme-integrations/lumo/pom.xml b/flow-theme-integrations/lumo/pom.xml index 2100b6809e8..5e136c47162 100644 --- a/flow-theme-integrations/lumo/pom.xml +++ b/flow-theme-integrations/lumo/pom.xml @@ -5,7 +5,7 @@ com.vaadin flow-theme-integrations - 1.0-SNAPSHOT + 1.1-SNAPSHOT vaadin-lumo-theme diff --git a/flow-theme-integrations/pom.xml b/flow-theme-integrations/pom.xml index 2f073981c4c..8b5f2d4ffdb 100644 --- a/flow-theme-integrations/pom.xml +++ b/flow-theme-integrations/pom.xml @@ -5,7 +5,7 @@ com.vaadin flow-project - 1.0-SNAPSHOT + 1.1-SNAPSHOT flow-theme-integrations Flow components parent project diff --git a/flow/pom.xml b/flow/pom.xml index 2c976f59447..b095cac7b34 100644 --- a/flow/pom.xml +++ b/flow/pom.xml @@ -4,7 +4,7 @@ com.vaadin flow-project - 1.0-SNAPSHOT + 1.1-SNAPSHOT flow pom diff --git a/pom.xml b/pom.xml index 41cb33ff8c1..acc74d83545 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ flow-project Flow pom - 1.0-SNAPSHOT + 1.1-SNAPSHOT com.vaadin