Skip to content
This repository has been archived by the owner on Oct 8, 2020. It is now read-only.

Commit

Permalink
Bump minor for 14.4 (#233)
Browse files Browse the repository at this point in the history 
* Bump parent version

* Bump to next minor

* Bump WebJars and NpmPackage for 14.4

* Update gitignore for easier branch switching

* Bump other snapshots for ITs and demo
  • Loading branch information
@alvarezguille
alvarezguille committed Sep 7, 2020
1 parent 6fc7f5b commit fa24979
Show file tree
Hide file tree
Showing 8 changed files with 41 additions and 39 deletions.
8 changes: 5 additions & 3 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ vaadin-crud-flow-integration-tests/error-screenshots/
chromedriver*

# The following files are generated/updated by flow-maven-plugin
package.json
webpack.config.js
webpack.generated.js
package*.json
pnpm-lock.yaml
webpack.*.js
tsconfig.json
types.d.ts
node_modules/
10 changes: 5 additions & 5 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,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-crud-flow-root</artifactId>
<version>2.2-SNAPSHOT</version>
<version>2.3-SNAPSHOT</version>
<packaging>pom</packaging>

<name>Vaadin Crud Root</name>
Expand All @@ -31,9 +31,9 @@
</licenses>

<properties>
<textfield.version>2.2-SNAPSHOT</textfield.version>
<grid.version>4.2-SNAPSHOT</grid.version>
<button.version>2.1-SNAPSHOT</button.version>
<textfield.version>2.3-SNAPSHOT</textfield.version>
<grid.version>4.3-SNAPSHOT</grid.version>
<button.version>2.2-SNAPSHOT</button.version>

<jetty.plugin.version>9.4.11.v20180605</jetty.plugin.version>
<maven.compiler.source>1.8</maven.compiler.source>
Expand Down
8 changes: 4 additions & 4 deletions vaadin-crud-flow-demo/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-crud-flow-root</artifactId>
<version>2.2-SNAPSHOT</version>
<version>2.3-SNAPSHOT</version>
</parent>

<artifactId>vaadin-crud-flow-demo</artifactId>
Expand Down Expand Up @@ -47,17 +47,17 @@
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-button-flow</artifactId>
<version>2.1-SNAPSHOT</version>
<version>${button.version}</version>
</dependency>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-icons-flow</artifactId>
<version>2.0-SNAPSHOT</version>
<version>2.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-form-layout-flow</artifactId>
<version>2.1-SNAPSHOT</version>
<version>2.2-SNAPSHOT</version>
</dependency>
</dependencies>

Expand Down
14 changes: 7 additions & 7 deletions vaadin-crud-flow-integration-tests/pom-bower-mode.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-crud-flow-root</artifactId>
<version>2.2-SNAPSHOT</version>
<version>2.3-SNAPSHOT</version>
</parent>
<artifactId>vaadin-crud-flow-integration-tests-bower-mode</artifactId>

Expand Down Expand Up @@ -90,32 +90,32 @@
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-button-flow</artifactId>
<version>2.1-SNAPSHOT</version>
<version>${button.version}</version>
</dependency>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-combo-box-flow</artifactId>
<version>3.1-SNAPSHOT</version>
<version>3.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-dialog-flow</artifactId>
<version>2.2-SNAPSHOT</version>
<version>2.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-form-layout-flow</artifactId>
<version>2.1-SNAPSHOT</version>
<version>2.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-ordered-layout-flow</artifactId>
<version>2.2-SNAPSHOT</version>
<version>2.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-icons-flow</artifactId>
<version>2.0-SNAPSHOT</version>
<version>2.1-SNAPSHOT</version>
</dependency>

<dependency>
Expand Down
14 changes: 7 additions & 7 deletions vaadin-crud-flow-integration-tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-crud-flow-root</artifactId>
<version>2.2-SNAPSHOT</version>
<version>2.3-SNAPSHOT</version>
</parent>

<artifactId>vaadin-crud-flow-integration-tests</artifactId>
Expand Down Expand Up @@ -92,32 +92,32 @@
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-button-flow</artifactId>
<version>2.1-SNAPSHOT</version>
<version>${button.version}</version>
</dependency>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-combo-box-flow</artifactId>
<version>3.1-SNAPSHOT</version>
<version>3.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-dialog-flow</artifactId>
<version>2.2-SNAPSHOT</version>
<version>2.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-form-layout-flow</artifactId>
<version>2.1-SNAPSHOT</version>
<version>2.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-ordered-layout-flow</artifactId>
<version>2.2-SNAPSHOT</version>
<version>2.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-icons-flow</artifactId>
<version>2.0-SNAPSHOT</version>
<version>2.1-SNAPSHOT</version>
</dependency>

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion vaadin-crud-flow-testbench/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<artifactId>vaadin-crud-flow-root</artifactId>
<groupId>com.vaadin</groupId>
<version>2.2-SNAPSHOT</version>
<version>2.3-SNAPSHOT</version>
</parent>

<artifactId>vaadin-crud-testbench</artifactId>
Expand Down
22 changes: 11 additions & 11 deletions vaadin-crud-flow/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-crud-flow-root</artifactId>
<version>2.2-SNAPSHOT</version>
<version>2.3-SNAPSHOT</version>
</parent>

<artifactId>vaadin-crud-flow</artifactId>
Expand Down Expand Up @@ -54,24 +54,24 @@
<dependency>
<groupId>com.vaadin.webjar</groupId>
<artifactId>vaadin-crud</artifactId>
<version>1.2.1</version>
<version>1.3.0</version>
</dependency>

<!--Pinned transitive webjars-->
<dependency>
<groupId>org.webjars.bowergithub.vaadin</groupId>
<artifactId>vaadin-grid</artifactId>
<version>5.6.1</version>
<version>5.7.1</version>
</dependency>
<dependency>
<groupId>org.webjars.bowergithub.vaadin</groupId>
<artifactId>vaadin-control-state-mixin</artifactId>
<version>2.1.1</version>
<version>2.2.3</version>
</dependency>
<dependency>
<groupId>org.webjars.bowergithub.vaadin</groupId>
<artifactId>vaadin-checkbox</artifactId>
<version>2.3.0</version>
<version>2.5.0-alpha1</version>
</dependency>
<dependency>
<groupId>org.webjars.bowergithub.polymerelements</groupId>
Expand All @@ -81,7 +81,7 @@
<dependency>
<groupId>com.vaadin.webjar</groupId>
<artifactId>vaadin-confirm-dialog</artifactId>
<version>1.2.0</version>
<version>1.3.0</version>
</dependency>
<dependency>
<groupId>org.webjars.bowergithub.vaadin</groupId>
Expand All @@ -96,12 +96,12 @@
<dependency>
<groupId>org.webjars.bowergithub.vaadin</groupId>
<artifactId>vaadin-dialog</artifactId>
<version>2.4.0</version>
<version>2.5.0</version>
</dependency>
<dependency>
<groupId>org.webjars.bowergithub.vaadin</groupId>
<artifactId>vaadin-overlay</artifactId>
<version>3.4.0</version>
<version>3.5.1</version>
</dependency>
<dependency>
<groupId>org.webjars.bowergithub.vaadin</groupId>
Expand All @@ -111,17 +111,17 @@
<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>
<artifactId>vaadin-button</artifactId>
<version>2.3.0</version>
<version>2.4.0</version>
</dependency>
<dependency>
<groupId>org.webjars.bowergithub.vaadin</groupId>
<artifactId>vaadin-form-layout</artifactId>
<version>2.2.0</version>
<version>2.3.0</version>
</dependency>


Expand Down
2 changes: 1 addition & 1 deletion vaadin-crud-flow/src/main/java/com/vaadin/flow/component/crud/Crud.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
* @param <E> the bean type
*/
@Tag("vaadin-crud")
@NpmPackage(value = "@vaadin/vaadin-crud", version="1.2.1")
@NpmPackage(value = "@vaadin/vaadin-crud", version="1.3.0")
@JsModule("@vaadin/vaadin-crud/src/vaadin-crud.js")
@JsModule("@vaadin/vaadin-crud/src/vaadin-crud-edit-column.js")
@HtmlImport("frontend://bower_components/vaadin-crud/src/vaadin-crud.html")
Expand Down

0 comments on commit fa24979

Please sign in to comment.