Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use webjars bom. #2715

Merged
merged 5 commits into from
Oct 19, 2017
Merged

Use webjars bom. #2715

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ee04eb6
Use webjars bom.
Oct 18, 2017
a431522
Move Transport class to com.vaadin.shared.ui (#2716)
Oct 18, 2017
88b2d7c
Move AttachEvent and DetachEvent to com.vaadin.ui.event (#2717)
Oct 18, 2017
3355be8
Update documentation.
Oct 18, 2017
eb0fbe5
Merge branch 'master' into kb/use-webjars-bom
Oct 19, 2017
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
50 changes: 36 additions & 14 deletions flow-components-parent/demo-flow-components/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,60 +37,82 @@
<dependency>
<groupId>org.webjars.bower</groupId>
<artifactId>paper-styles</artifactId>
</dependency>

<dependency>
<groupId>org.webjars.bower</groupId>
<artifactId>paper-button</artifactId>
<version>2.0.0</version>
</dependency>

<dependency>
<groupId>org.webjars.bower</groupId>
<artifactId>paper-item</artifactId>
<artifactId>paper-input</artifactId>
</dependency>

<dependency>
<groupId>org.webjars.bower</groupId>
<artifactId>paper-spinner</artifactId>
<version>2.0.0</version>
</dependency>

<dependency>
<groupId>org.webjars.bower</groupId>
<artifactId>github-com-polymerelements-paper-ripple</artifactId>
<artifactId>github-com-polymerelements-paper-card</artifactId>
<version>2.0.0</version>
</dependency>

<dependency>
<groupId>org.webjars.bower</groupId>
<artifactId>iron-collapse</artifactId>
<artifactId>paper-progress</artifactId>
</dependency>

<dependency>
<groupId>org.webjars.bower</groupId>
<artifactId>paper-dialog</artifactId>
<version>2.0.0</version>
</dependency>

<dependency>
<groupId>org.webjars.bower</groupId>
<artifactId>iron-icon</artifactId>
<version>2.0.1</version>
<artifactId>web-animations-js</artifactId>
<version>2.2.5</version>
</dependency>

<dependency>
<groupId>org.webjars.bower</groupId>
<artifactId>iron-icons</artifactId>
<artifactId>paper-swatch-picker</artifactId>
<version>2.0.1</version>
</dependency>

<dependency>
<groupId>org.webjars.bower</groupId>
<artifactId>vaadin-split-layout</artifactId>
<version>3.0.0-beta1</version>
<artifactId>app-layout</artifactId>
<version>2.0.2</version>
</dependency>

<dependency>
<groupId>org.webjars.bower</groupId>
<artifactId>vaadin-dialog</artifactId>
<version>1.0.0-beta1</version>
<artifactId>paper-item</artifactId>
<version>2.0.0</version>
</dependency>

<dependency>
<groupId>org.webjars.bower</groupId>
<artifactId>vaadin-icons</artifactId>
<version>4.1.2</version>
<artifactId>github-com-polymerelements-paper-ripple</artifactId>
<version>2.0.1</version>
</dependency>

<dependency>
<groupId>org.webjars.bower</groupId>
<artifactId>vaadin-valo-theme</artifactId>
<version>0.3.2</version>
<artifactId>iron-collapse</artifactId>
<version>2.0.0</version>
</dependency>

<dependency>
<groupId>org.webjars.bower</groupId>
<artifactId>iron-icons</artifactId>
<version>2.0.1</version>
</dependency>
</dependencies>

Expand Down
285 changes: 99 additions & 186 deletions flow-components-parent/flow-components/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,186 +1,99 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.vaadin</groupId>
<artifactId>flow-components-parent</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
<artifactId>flow-components</artifactId>
<name>Flow server side components</name>
<packaging>jar</packaging>

<dependencies>
<!-- Project dependencies -->
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>flow-generated-components</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>flow-html-components</artifactId>
</dependency>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>flow-data</artifactId>
<scope>test</scope>
<type>test-jar</type>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
<version>2.0.0.Final</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId>
<version>${hibernate.validator.version}</version>
<scope>test</scope>
</dependency>

<!-- webJars -->
<dependency>
<groupId>org.webjars.bower</groupId>
<artifactId>polymer</artifactId>
</dependency>

<dependency>
<groupId>org.webjars.bower</groupId>
<artifactId>paper-button</artifactId>
<version>2.0.0</version>
</dependency>

<dependency>
<groupId>org.webjars.bower</groupId>
<artifactId>paper-input</artifactId>
<version>2.0.2</version>
</dependency>

<dependency>
<groupId>org.webjars.bower</groupId>
<artifactId>paper-spinner</artifactId>
<version>2.0.0</version>
</dependency>

<dependency>
<groupId>org.webjars.bower</groupId>
<artifactId>github-com-polymerelements-paper-card</artifactId>
<version>2.0.0</version>
</dependency>

<dependency>
<groupId>org.webjars.bower</groupId>
<artifactId>paper-progress</artifactId>
<version>2.0.1</version>
</dependency>

<dependency>
<groupId>org.webjars.bower</groupId>
<artifactId>paper-dialog</artifactId>
<version>2.0.0</version>
</dependency>

<dependency>
<groupId>org.webjars.bower</groupId>
<artifactId>neon-animation</artifactId>
<version>2.0.1</version>
</dependency>

<dependency>
<groupId>org.webjars.bower</groupId>
<artifactId>web-animations-js</artifactId>
<version>2.2.5</version>
</dependency>

<dependency>
<groupId>org.webjars.bower</groupId>
<artifactId>paper-swatch-picker</artifactId>
<version>2.0.1</version>
</dependency>

<dependency>
<groupId>org.webjars.bower</groupId>
<artifactId>app-layout</artifactId>
<version>2.0.2</version>
</dependency>

<dependency>
<groupId>org.webjars.bower</groupId>
<artifactId>iron-flex-layout</artifactId>
<version>2.0.0</version>
</dependency>

<dependency>
<groupId>org.webjars.bower</groupId>
<artifactId>iron-iconset-svg</artifactId>
<version>2.1.0</version>
</dependency>

<dependency>
<groupId>org.webjars.bower</groupId>
<artifactId>iron-media-query</artifactId>
<version>2.0.0</version>
</dependency>

<dependency>
<groupId>org.webjars.bower</groupId>
<artifactId>iron-selector</artifactId>
<version>2.0.0</version>
</dependency>

<dependency>
<groupId>org.webjars.bower</groupId>
<artifactId>vaadin-grid</artifactId>
<version>4.0.0-alpha4</version>
</dependency>

<dependency>
<groupId>org.webjars.bower</groupId>
<artifactId>vaadin-text-field</artifactId>
<version>1.1.0-beta1</version>
</dependency>

<dependency>
<groupId>org.webjars.bower</groupId>
<artifactId>vaadin-date-picker</artifactId>
<version>2.0.5</version>
</dependency>

<dependency>
<groupId>org.webjars.bower</groupId>
<artifactId>vaadin-button</artifactId>
<version>1.0.4</version>
</dependency>

<dependency>
<groupId>org.webjars.bower</groupId>
<artifactId>vaadin-checkbox</artifactId>
</dependency>

<dependency>
<groupId>org.webjars.bower</groupId>
<artifactId>vaadin-combo-box</artifactId>
<version>3.0.0-beta1</version>
</dependency>

<dependency>
<groupId>org.webjars.bower</groupId>
<artifactId>vaadin-form-layout</artifactId>
<version>1.0.3</version>
</dependency>

<dependency>
<groupId>org.webjars.bower</groupId>
<artifactId>vaadin-ordered-layout</artifactId>
<version>1.0.0-alpha1</version>
</dependency>
</dependencies>
</project>
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.vaadin</groupId>
<artifactId>flow-components-parent</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
<artifactId>flow-components</artifactId>
<name>Flow server side components</name>
<packaging>jar</packaging>

<dependencies>
<!-- Project dependencies -->
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>flow-generated-components</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>flow-html-components</artifactId>
</dependency>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>flow-data</artifactId>
<scope>test</scope>
<type>test-jar</type>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
<version>2.0.0.Final</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId>
<version>${hibernate.validator.version}</version>
<scope>test</scope>
</dependency>

<!-- webJars -->
<dependency>
<groupId>org.webjars.bower</groupId>
<artifactId>vaadin-grid</artifactId>
</dependency>
<dependency>
<groupId>org.webjars.bower</groupId>
<artifactId>vaadin-icons</artifactId>
</dependency>
<dependency>
<groupId>org.webjars.bower</groupId>
<artifactId>vaadin-text-field</artifactId>
</dependency>
<dependency>
<groupId>org.webjars.bower</groupId>
<artifactId>vaadin-date-picker</artifactId>
</dependency>
<dependency>
<groupId>org.webjars.bower</groupId>
<artifactId>vaadin-button</artifactId>
</dependency>
<dependency>
<groupId>org.webjars.bower</groupId>
<artifactId>vaadin-dialog</artifactId>
</dependency>
<dependency>
<groupId>org.webjars.bower</groupId>
<artifactId>vaadin-combo-box</artifactId>
</dependency>
<dependency>
<groupId>org.webjars.bower</groupId>
<artifactId>vaadin-form-layout</artifactId>
</dependency>
<dependency>
<groupId>org.webjars.bower</groupId>
<artifactId>vaadin-checkbox</artifactId>
</dependency>
<dependency>
<groupId>org.webjars.bower</groupId>
<artifactId>vaadin-split-layout</artifactId>
</dependency>
<dependency>
<groupId>org.webjars.bower</groupId>
<artifactId>vaadin-ordered-layout</artifactId>
</dependency>
<dependency>
<groupId>org.webjars.bower</groupId>
<artifactId>vaadin-valo-theme</artifactId>
</dependency>
</dependencies>
</project>
Loading