Skip to content
This repository has been archived by the owner on Dec 12, 2022. It is now read-only.

Commit

Permalink
Merge branch 'master' into 122-click-button-by-keyboard
Browse files Browse the repository at this point in the history
  • Loading branch information
SomeoneToIgnore authored Jun 25, 2018
2 parents 2bbf895 + 98a1a4f commit 1f2ebee
Showing 1 changed file with 36 additions and 0 deletions.
36 changes: 36 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,17 @@
<groupId>org.webjars.bowergithub.vaadin</groupId>
<artifactId>vaadin-grid</artifactId>
<version>5.0.4</version>
<exclusions>
<exclusion>
<groupId>org.webjars.bowergithub.polymerelements</groupId>
<artifactId>iron-flex-layout</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.webjars.bowergithub.polymerelements</groupId>
<artifactId>iron-flex-layout</artifactId>
<version>2.0.3</version>
</dependency>

<dependency>
Expand All @@ -49,6 +60,7 @@
<groupId>com.vaadin</groupId>
<artifactId>flow</artifactId>
<version>${flow.version}</version>
<type>pom</type>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -84,24 +96,48 @@
<artifactId>vaadin-ordered-layout-flow</artifactId>
<version>1.0-SNAPSHOT</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.webjars.bowergithub.polymerelements</groupId>
<artifactId>iron-flex-layout</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-button-flow</artifactId>
<version>1.0-SNAPSHOT</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.webjars.bowergithub.polymerelements</groupId>
<artifactId>iron-flex-layout</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-text-field-flow</artifactId>
<version>1.0-SNAPSHOT</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.webjars.bowergithub.polymerelements</groupId>
<artifactId>iron-flex-layout</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-checkbox-flow</artifactId>
<version>1.0-SNAPSHOT</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.webjars.bowergithub.polymerelements</groupId>
<artifactId>iron-flex-layout</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
Expand Down

0 comments on commit 1f2ebee

Please sign in to comment.