Bump minor for 14.4 (#134)

* Bump parent version * Bump to next minor * Bump WebJars and NpmPackage for 14.4 * Update gitignore for easier branch switching
vaadin · Sep 3, 2020 · c603bc5 · c603bc5
1 parent 526aa9b
commit c603bc5
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 12 deletions.
diff --git a/.gitignore b/.gitignore
@@ -20,5 +20,8 @@ reference-screenshots
 
 # The following files are generated/updated by flow-maven-plugin
 package*.json
-webpack.config.js
+pnpm-lock.yaml
+webpack.*.js
+tsconfig.json
+types.d.ts
 node_modules/
diff --git a/pom.xml b/pom.xml
@@ -7,11 +7,11 @@
     <parent>
         <groupId>com.vaadin</groupId>
         <artifactId>flow-component-base</artifactId>
-        <version>2.3-SNAPSHOT</version>
+        <version>2.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>vaadin-form-layout-flow-parent</artifactId>
-    <version>2.1-SNAPSHOT</version>
+    <version>2.2-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Vaadin Form Layout Flow Parent</name>
 

diff --git a/vaadin-form-layout-flow-demo/pom.xml b/vaadin-form-layout-flow-demo/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.vaadin</groupId>
         <artifactId>vaadin-form-layout-flow-parent</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>vaadin-form-layout-flow-demo</artifactId>

diff --git a/vaadin-form-layout-flow-integration-tests/pom-bower-mode.xml b/vaadin-form-layout-flow-integration-tests/pom-bower-mode.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.vaadin</groupId>
         <artifactId>vaadin-form-layout-flow-parent</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
 
     <groupId>com.vaadin</groupId>

diff --git a/vaadin-form-layout-flow-integration-tests/pom.xml b/vaadin-form-layout-flow-integration-tests/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.vaadin</groupId>
         <artifactId>vaadin-form-layout-flow-parent</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
 
     <groupId>com.vaadin</groupId>

diff --git a/vaadin-form-layout-flow-testbench/pom.xml b/vaadin-form-layout-flow-testbench/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.vaadin</groupId>
         <artifactId>vaadin-form-layout-flow-parent</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>vaadin-form-layout-testbench</artifactId>

diff --git a/vaadin-form-layout-flow/pom.xml b/vaadin-form-layout-flow/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.vaadin</groupId>
         <artifactId>vaadin-form-layout-flow-parent</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>vaadin-form-layout-flow</artifactId>
@@ -19,12 +19,12 @@
         <dependency>
             <groupId>org.webjars.bowergithub.vaadin</groupId>
             <artifactId>vaadin-form-layout</artifactId>
-            <version>2.2.0</version>
+            <version>2.3.0</version>
         </dependency>
         <dependency>
             <groupId>org.webjars.bowergithub.vaadin</groupId>
             <artifactId>vaadin-themable-mixin</artifactId>
-            <version>1.5.2</version>
+            <version>1.6.1</version>
         </dependency>
         <dependency>
             <groupId>org.webjars.bowergithub.polymerelements</groupId>

diff --git a/...yout-flow/src/main/java/com/vaadin/flow/component/formlayout/GeneratedVaadinFormItem.java b/...yout-flow/src/main/java/com/vaadin/flow/component/formlayout/GeneratedVaadinFormItem.java
@@ -169,7 +169,7 @@
 @Generated({ "Generator: com.vaadin.generator.ComponentGenerator#1.1-SNAPSHOT",
         "WebComponent: Vaadin.FormItemElement#2.1.0", "Flow#1.1-SNAPSHOT" })
 @Tag("vaadin-form-item")
-@NpmPackage(value = "@vaadin/vaadin-form-layout", version = "2.2.0")
+@NpmPackage(value = "@vaadin/vaadin-form-layout", version = "2.3.0")
 @JsModule("@vaadin/vaadin-form-layout/src/vaadin-form-item.js")
 @HtmlImport("frontend://bower_components/vaadin-form-layout/src/vaadin-form-item.html")
 public abstract class GeneratedVaadinFormItem<R extends GeneratedVaadinFormItem<R>>

diff --git a/...ut-flow/src/main/java/com/vaadin/flow/component/formlayout/GeneratedVaadinFormLayout.java b/...ut-flow/src/main/java/com/vaadin/flow/component/formlayout/GeneratedVaadinFormLayout.java
@@ -141,7 +141,7 @@
 @Generated({ "Generator: com.vaadin.generator.ComponentGenerator#1.1-SNAPSHOT",
         "WebComponent: Vaadin.FormLayoutElement#2.1.0", "Flow#1.1-SNAPSHOT" })
 @Tag("vaadin-form-layout")
-@NpmPackage(value = "@vaadin/vaadin-form-layout", version = "2.2.0")
+@NpmPackage(value = "@vaadin/vaadin-form-layout", version = "2.3.0")
 @JsModule("@vaadin/vaadin-form-layout/src/vaadin-form-layout.js")
 @HtmlImport("frontend://bower_components/vaadin-form-layout/src/vaadin-form-layout.html")
 public abstract class GeneratedVaadinFormLayout<R extends GeneratedVaadinFormLayout<R>>