Bump minor for 14.4 (#179)

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

Hide file tree

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

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

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

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

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

diff --git a/vaadin-upload-flow/pom.xml b/vaadin-upload-flow/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.vaadin</groupId>
         <artifactId>vaadin-upload-flow-parent</artifactId>
-        <version>2.2-SNAPSHOT</version>
+        <version>2.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>vaadin-upload-flow</artifactId>
@@ -19,7 +19,7 @@
         <dependency>
             <groupId>org.webjars.bowergithub.vaadin</groupId>
             <artifactId>vaadin-upload</artifactId>
-            <version>4.3.0</version>
+            <version>4.4.0</version>
         </dependency>
 
 
@@ -33,12 +33,12 @@
         <dependency>
             <groupId>org.webjars.bowergithub.vaadin</groupId>
             <artifactId>vaadin-button</artifactId>
-            <version>2.3.0</version>
+            <version>2.4.0</version>
         </dependency>
         <dependency>
             <groupId>org.webjars.bowergithub.vaadin</groupId>
             <artifactId>vaadin-control-state-mixin</artifactId>
-            <version>2.1.3</version>
+            <version>2.2.3</version>
         </dependency>
         <dependency>
             <groupId>org.webjars.bowergithub.vaadin</groupId>
@@ -48,7 +48,7 @@
         <dependency>
             <groupId>org.webjars.bowergithub.vaadin</groupId>
             <artifactId>vaadin-progress-bar</artifactId>
-            <version>1.2.0</version>
+            <version>1.3.0</version>
         </dependency>
         <dependency>
             <groupId>org.webjars.bowergithub.vaadin</groupId>
@@ -58,7 +58,7 @@
         <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/vaadin-upload-flow/src/main/java/com/vaadin/flow/component/upload/GeneratedVaadinUpload.java b/vaadin-upload-flow/src/main/java/com/vaadin/flow/component/upload/GeneratedVaadinUpload.java
@@ -119,7 +119,7 @@
 @Generated({ "Generator: com.vaadin.generator.ComponentGenerator#1.1-SNAPSHOT",
         "WebComponent: Vaadin.UploadElement#4.2.1", "Flow#1.1-SNAPSHOT" })
 @Tag("vaadin-upload")
-@NpmPackage(value = "@vaadin/vaadin-upload", version = "4.3.0")
+@NpmPackage(value = "@vaadin/vaadin-upload", version = "4.4.0")
 @JsModule("@vaadin/vaadin-upload/src/vaadin-upload.js")
 @HtmlImport("frontend://bower_components/vaadin-upload/src/vaadin-upload.html")
 public abstract class GeneratedVaadinUpload<R extends GeneratedVaadinUpload<R>>