Bump minor for 14.4 (#76)

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

Hide file tree

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

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

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

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

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

diff --git a/vaadin-progress-bar-flow/pom.xml b/vaadin-progress-bar-flow/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.vaadin</groupId>
         <artifactId>vaadin-progress-bar-flow-parent</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>vaadin-progress-bar-flow</artifactId>
@@ -19,13 +19,13 @@
         <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>
             <artifactId>vaadin-themable-mixin</artifactId>
-            <version>1.5.2</version>
+            <version>1.6.1</version>
         </dependency>
         <dependency>
             <groupId>org.webjars.bowergithub.vaadin</groupId>

diff --git a/...in-progress-bar-flow/src/main/java/com/vaadin/flow/component/progressbar/ProgressBar.java b/...in-progress-bar-flow/src/main/java/com/vaadin/flow/component/progressbar/ProgressBar.java
@@ -25,7 +25,7 @@
  *
  * @author Vaadin Ltd.
  */
-@NpmPackage(value = "@vaadin/vaadin-progress-bar", version = "1.2.0")
+@NpmPackage(value = "@vaadin/vaadin-progress-bar", version = "1.3.0")
 public class ProgressBar extends GeneratedVaadinProgressBar<ProgressBar>
         implements HasSize {