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 (#107)
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 63b840c commit c6ca900
Show file tree
Hide file tree
Showing 9 changed files with 36 additions and 36 deletions.
9 changes: 6 additions & 3 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ vaadin-grid-pro-flow-integration-tests/error-screenshots/
.settings/
.vscode/*

node_modules
package*json
webpack.config.js
package*.json
pnpm-lock.yaml
webpack.*.js
tsconfig.json
types.d.ts
node_modules/
6 changes: 3 additions & 3 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-grid-pro-flow-parent</artifactId>
<version>2.1-SNAPSHOT</version>
<version>2.2-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Vaadin GridPro Parent</name>
<inceptionYear>2018</inceptionYear>
Expand All @@ -33,7 +33,7 @@
<maven.compiler.target>1.8</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<grid.version>4.2-SNAPSHOT</grid.version>
<grid.version>4.3-SNAPSHOT</grid.version>
</properties>


Expand Down
8 changes: 4 additions & 4 deletions vaadin-grid-pro-flow-demo/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-grid-pro-flow-parent</artifactId>
<version>2.1-SNAPSHOT</version>
<version>2.2-SNAPSHOT</version>
</parent>

<artifactId>vaadin-grid-pro-flow-demo</artifactId>
Expand Down Expand Up @@ -46,17 +46,17 @@
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-button-flow</artifactId>
<version>2.1-SNAPSHOT</version>
<version>2.2-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>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-form-layout-flow</artifactId>
<version>2.1-SNAPSHOT</version>
<version>2.2-SNAPSHOT</version>
</dependency>
</dependencies>

Expand Down
10 changes: 5 additions & 5 deletions vaadin-grid-pro-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-grid-pro-flow-parent</artifactId>
<version>2.1-SNAPSHOT</version>
<version>2.2-SNAPSHOT</version>
</parent>

<artifactId>vaadin-grid-pro-integration-tests-bower-mode</artifactId>
Expand Down Expand Up @@ -41,12 +41,12 @@
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-button-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>

<!--System under test-->
Expand All @@ -59,13 +59,13 @@
<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-text-field-flow</artifactId>
<version>2.2-SNAPSHOT</version>
<version>2.3-SNAPSHOT</version>
</dependency>

<!--Flow-->
Expand Down
10 changes: 5 additions & 5 deletions vaadin-grid-pro-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-grid-pro-flow-parent</artifactId>
<version>2.1-SNAPSHOT</version>
<version>2.2-SNAPSHOT</version>
</parent>

<artifactId>vaadin-grid-pro-integration-tests</artifactId>
Expand Down Expand Up @@ -35,12 +35,12 @@
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-button-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>

<!--System under test-->
Expand All @@ -53,13 +53,13 @@
<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-text-field-flow</artifactId>
<version>2.2-SNAPSHOT</version>
<version>2.3-SNAPSHOT</version>
</dependency>

<!--Flow-->
Expand Down
3 changes: 0 additions & 3 deletions ...-integration-tests/src/main/java/com/vaadin/flow/component/gridpro/examples/MainView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

import com.vaadin.flow.component.button.Button;
import com.vaadin.flow.component.combobox.ComboBox;
import com.vaadin.flow.component.dependency.NpmPackage;
import com.vaadin.flow.component.gridpro.GridPro;
import com.vaadin.flow.component.html.Div;
import com.vaadin.flow.component.html.Input;
Expand All @@ -20,8 +19,6 @@
import com.vaadin.flow.router.Route;

@Route
// TODO remove this line after we can use latest minor (V14.4)
@NpmPackage(value = "@vaadin/vaadin-select", version = "2.2.0")
public class MainView extends VerticalLayout {

public MainView() {
Expand Down
2 changes: 1 addition & 1 deletion vaadin-grid-pro-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-grid-pro-flow-parent</artifactId>
<groupId>com.vaadin</groupId>
<version>2.1-SNAPSHOT</version>
<version>2.2-SNAPSHOT</version>
</parent>

<artifactId>vaadin-grid-pro-testbench</artifactId>
Expand Down
22 changes: 11 additions & 11 deletions vaadin-grid-pro-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-grid-pro-flow-parent</artifactId>
<version>2.1-SNAPSHOT</version>
<version>2.2-SNAPSHOT</version>
</parent>

<artifactId>vaadin-grid-pro-flow</artifactId>
Expand Down Expand Up @@ -65,44 +65,44 @@
<dependency>
<groupId>com.vaadin.webjar</groupId>
<artifactId>vaadin-grid-pro</artifactId>
<version>2.1.2</version>
<version>2.2.1</version>
</dependency>

<!--Pinned transitive webjars-->
<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-list-box</artifactId>
<version>1.3.0</version>
<version>1.4.0</version>
</dependency>
<dependency>
<groupId>org.webjars.bowergithub.vaadin</groupId>
<artifactId>vaadin-text-field</artifactId>
<version>2.6.0</version>
<version>2.8.0-alpha1</version>
</dependency>
<dependency>
<groupId>org.webjars.bowergithub.vaadin</groupId>
<artifactId>vaadin-select</artifactId>
<version>2.2.0</version>
<version>2.4.0-alpha1</version>
</dependency>
<dependency>
<groupId>org.webjars.bowergithub.vaadin</groupId>
<artifactId>vaadin-item</artifactId>
<version>2.2.0</version>
<version>2.3.0</version>
</dependency>
<dependency>
<groupId>org.webjars.bowergithub.vaadin</groupId>
<artifactId>vaadin-list-mixin</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.polymerelements</groupId>
Expand All @@ -112,7 +112,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.vaadin</groupId>
Expand All @@ -127,7 +127,7 @@
<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.vaadin</groupId>
Expand Down
2 changes: 1 addition & 1 deletion vaadin-grid-pro-flow/src/main/java/com/vaadin/flow/component/gridpro/GridPro.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
import elemental.json.JsonObject;

@Tag("vaadin-grid-pro")
@NpmPackage(value = "@vaadin/vaadin-grid-pro", version = "2.1.2")
@NpmPackage(value = "@vaadin/vaadin-grid-pro", version = "2.2.1")
@JsModule("@vaadin/vaadin-grid-pro/src/vaadin-grid-pro.js")
@JsModule("@vaadin/vaadin-grid-pro/src/vaadin-grid-pro-edit-column.js")
@JsModule("@vaadin/flow-frontend/gridProConnector.js")
Expand Down

0 comments on commit c6ca900

Please sign in to comment.