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

Bump minor for 14.4 #159

Merged
merged 4 commits into from
Sep 3, 2020
Merged

Bump minor for 14.4 #159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1e49775
Bump parent version
alvarezguille Sep 3, 2020
507b5bd
Bump to next minor
alvarezguille Sep 3, 2020
70da077
Bump WebJars and NpmPackage for 14.4
alvarezguille Sep 3, 2020
8847865
Update gitignore for easier branch switching
alvarezguille Sep 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,8 @@ reference-screenshots

# The following files are generated/updated by flow-maven-plugin
package*.json
pnpm-lock.yaml
webpack.*.js
tsconfig.json
types.d.ts
node_modules/
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-ordered-layout-flow-parent</artifactId>
<version>2.2-SNAPSHOT</version>
<version>2.3-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Vaadin Ordered Layout Flow Parent</name>

Expand Down
2 changes: 1 addition & 1 deletion vaadin-ordered-layout-flow-demo/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-ordered-layout-flow-parent</artifactId>
<version>2.2-SNAPSHOT</version>
<version>2.3-SNAPSHOT</version>
</parent>

<artifactId>vaadin-ordered-layout-flow-demo</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion vaadin-ordered-layout-flow-integration-tests/pom-bower-mode.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-ordered-layout-flow-parent</artifactId>
<version>2.2-SNAPSHOT</version>
<version>2.3-SNAPSHOT</version>
</parent>

<groupId>com.vaadin</groupId>
Expand Down
2 changes: 1 addition & 1 deletion vaadin-ordered-layout-flow-integration-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-ordered-layout-flow-parent</artifactId>
<version>2.2-SNAPSHOT</version>
<version>2.3-SNAPSHOT</version>
</parent>

<artifactId>vaadin-ordered-layout-flow-integration-tests</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion vaadin-ordered-layout-flow-testbench/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-ordered-layout-flow-parent</artifactId>
<version>2.2-SNAPSHOT</version>
<version>2.3-SNAPSHOT</version>
</parent>

<artifactId>vaadin-ordered-layout-testbench</artifactId>
Expand Down
6 changes: 3 additions & 3 deletions vaadin-ordered-layout-flow/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-ordered-layout-flow-parent</artifactId>
<version>2.2-SNAPSHOT</version>
<version>2.3-SNAPSHOT</version>
</parent>

<artifactId>vaadin-ordered-layout-flow</artifactId>
Expand All @@ -19,13 +19,13 @@
<dependency>
<groupId>org.webjars.bowergithub.vaadin</groupId>
<artifactId>vaadin-ordered-layout</artifactId>
<version>1.3.0</version>
<version>1.4.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>
Expand Down
2 changes: 1 addition & 1 deletion ...d-layout-flow/src/main/java/com/vaadin/flow/component/orderedlayout/HorizontalLayout.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
* have a predefined size - its size is defined by the components inside it.
*/
@Tag("vaadin-horizontal-layout")
@NpmPackage(value = "@vaadin/vaadin-ordered-layout", version = "1.3.0")
@NpmPackage(value = "@vaadin/vaadin-ordered-layout", version = "1.4.0")
@JsModule("@vaadin/vaadin-ordered-layout/src/vaadin-horizontal-layout.js")
@HtmlImport("frontend://bower_components/vaadin-ordered-layout/src/vaadin-horizontal-layout.html")
public class HorizontalLayout extends Component implements ThemableLayout,
Expand Down
2 changes: 1 addition & 1 deletion ...n-ordered-layout-flow/src/main/java/com/vaadin/flow/component/orderedlayout/Scroller.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
* {@link #setScrollDirection(ScrollDirection)}
*/
@Tag("vaadin-scroller")
@NpmPackage(value = "@vaadin/vaadin-ordered-layout", version = "1.3.0")
@NpmPackage(value = "@vaadin/vaadin-ordered-layout", version = "1.4.0")
@JsModule("@vaadin/vaadin-ordered-layout/vaadin-scroller.js")
@HtmlImport("frontend://bower_components/vaadin-ordered-layout/src/vaadin-scroller.html")
public class Scroller extends Component implements HasSize, HasStyle {
Expand Down
2 changes: 1 addition & 1 deletion ...red-layout-flow/src/main/java/com/vaadin/flow/component/orderedlayout/VerticalLayout.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
* wide.
*/
@Tag("vaadin-vertical-layout")
@NpmPackage(value = "@vaadin/vaadin-ordered-layout", version = "1.3.0")
@NpmPackage(value = "@vaadin/vaadin-ordered-layout", version = "1.4.0")
@JsModule("@vaadin/vaadin-ordered-layout/src/vaadin-vertical-layout.js")
@HtmlImport("frontend://bower_components/vaadin-ordered-layout/src/vaadin-vertical-layout.html")
public class VerticalLayout extends Component implements ThemableLayout,
Expand Down