From ee04eb6c2df0e61d608af9df3f1e6d095c1a1d76 Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@vaadin.com>
Date: Wed, 18 Oct 2017 19:53:45 +0300
Subject: [PATCH 1/4] Use webjars bom.

---
 .../demo-flow-components/pom.xml              |  50 ++-
 .../flow-components/pom.xml                   | 285 +++++--------
 pom.xml                                       | 304 +++-----------
 webjars-bom/pom.xml                           | 379 ++++++++++++++++++
 4 files changed, 576 insertions(+), 442 deletions(-)
 create mode 100644 webjars-bom/pom.xml

diff --git a/flow-components-parent/demo-flow-components/pom.xml b/flow-components-parent/demo-flow-components/pom.xml
index 6944d318822..ab192adb76a 100644
--- a/flow-components-parent/demo-flow-components/pom.xml
+++ b/flow-components-parent/demo-flow-components/pom.xml
@@ -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>
 
diff --git a/flow-components-parent/flow-components/pom.xml b/flow-components-parent/flow-components/pom.xml
index 2327713048d..58bc449f7d4 100644
--- a/flow-components-parent/flow-components/pom.xml
+++ b/flow-components-parent/flow-components/pom.xml
@@ -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>
diff --git a/pom.xml b/pom.xml
index f7b8390f786..8916173e09e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,7 @@
 <?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">
+<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>
 
     <groupId>com.vaadin</groupId>
@@ -10,6 +11,7 @@
     <version>1.0-SNAPSHOT</version>
 
     <modules>
+        <module>webjars-bom</module>
         <module>flow</module>
         <module>flow-server</module>
         <module>flow-push</module>
@@ -40,24 +42,32 @@
     <inceptionYear>2000</inceptionYear>
     <scm>
         <connection>scm:https:https://github.com/vaadin/flow.git</connection>
-        <developerConnection>scm:git:git@github.com:vaadin/flow.git</developerConnection>
+        <developerConnection>scm:git:git@github.com:vaadin/flow.git
+        </developerConnection>
         <url>https://github.com/vaadin/flow</url>
     </scm>
 
     <properties>
         <flow.repo.id>hummingbird-snapshot</flow.repo.id>
-        <flow.snapshot.repo.url>https://repo.vaadin.com/nexus/content/repositories/flow-snapshots/</flow.snapshot.repo.url>
-        <flow.release.repo.url>https://repo.vaadin.com/nexus/content/repositories/flow/</flow.release.repo.url>
-        <flow.deployment.repo.url>${flow.snapshot.repo.url}</flow.deployment.repo.url>
+        <flow.snapshot.repo.url>
+            https://repo.vaadin.com/nexus/content/repositories/flow-snapshots/
+        </flow.snapshot.repo.url>
+        <flow.release.repo.url>
+            https://repo.vaadin.com/nexus/content/repositories/flow/
+        </flow.release.repo.url>
+        <flow.deployment.repo.url>${flow.snapshot.repo.url}
+        </flow.deployment.repo.url>
 
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <project.reporting.outputEncoding>UTF-8
+        </project.reporting.outputEncoding>
         <jsinterop.version>1.0.1</jsinterop.version>
         <sonar.java.source>8</sonar.java.source>
         <sonar.analysis.mode>preview</sonar.analysis.mode>
-        <sonar.issuesReport.console.enable>true</sonar.issuesReport.console.enable>
+        <sonar.issuesReport.console.enable>true
+        </sonar.issuesReport.console.enable>
         <sonar.issuesReport.html.enable>true</sonar.issuesReport.html.enable>
         <maven.javadoc.skip>true</maven.javadoc.skip>
         <failOnMissingWebXml>false</failOnMissingWebXml>
@@ -67,7 +77,8 @@
         <hibernate.validator.version>6.0.1.Final</hibernate.validator.version>
 
         <!-- Plugins -->
-        <driver.binary.downloader.maven.plugin.version>1.0.14</driver.binary.downloader.maven.plugin.version>
+        <driver.binary.downloader.maven.plugin.version>1.0.14
+        </driver.binary.downloader.maven.plugin.version>
         <frontend.maven.plugin.version>1.5</frontend.maven.plugin.version>
         <maven.surefire.plugin.version>2.20</maven.surefire.plugin.version>
         <maven.failsafe.plugin.version>2.20</maven.failsafe.plugin.version>
@@ -124,11 +135,6 @@
 
     <dependencyManagement>
         <dependencies>
-            <dependency>
-                <groupId>com.google.gwt</groupId>
-                <artifactId>gwt-elemental</artifactId>
-                <version>${gwt.version}</version>
-            </dependency>
             <dependency>
                 <groupId>com.google.jsinterop</groupId>
                 <artifactId>jsinterop</artifactId>
@@ -136,6 +142,19 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>com.vaadin</groupId>
+                <artifactId>vaadin-webjars-bom</artifactId>
+                <type>pom</type>
+                <scope>import</scope>
+                <version>${project.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.google.gwt</groupId>
+                <artifactId>gwt-elemental</artifactId>
+                <version>${gwt.version}</version>
+            </dependency>
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
@@ -179,113 +198,24 @@
                 <version>2.0</version>
             </dependency>
 
-            <!-- Fix all ambiguities in bower dependencies. Will be moved to bom file later. -->
-            <dependency>
-                <groupId>org.webjars.bower</groupId>
-                <artifactId>polymer</artifactId>
-                <version>2.0.2</version>
-            </dependency>
-            <dependency>
-                <groupId>org.webjars.bower</groupId>
-                <artifactId>github-com-polymer-polymer</artifactId>
-                <version>v2.0.2</version>
-            </dependency>
-
+            <!-- webjars that do not belong to flow-components -->
             <dependency>
                 <groupId>org.webjars.bower</groupId>
-                <artifactId>vaadin-checkbox</artifactId>
-                <version>1.0.0-beta1</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.webjars.bower</groupId>
-                <artifactId>github-com-polymerelements-paper-input</artifactId>
-                <version>2.0.2</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.webjars.bower</groupId>
-                <artifactId>github-com-polymerelements-paper-progress</artifactId>
-                <version>2.0.1</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.webjars.bower</groupId>
-                <artifactId>github-com-polymerelements-iron-meta</artifactId>
-                <version>2.0.2</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.webjars.bower</groupId>
-                <artifactId>github-com-vaadin-vaadin-control-state-mixin</artifactId>
-                <version>v1.1.4</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.webjars.bower</groupId>
-                <artifactId>github-com-webcomponents-shadycss</artifactId>
-                <version>v1.0.6</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.webjars.bower</groupId>
-                <artifactId>webcomponentsjs</artifactId>
-                <version>1.0.14</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.webjars.bower</groupId>
-                <artifactId>github-com-polymerelements-iron-checked-element-behavior</artifactId>
+                <artifactId>paper-styles</artifactId>
                 <version>2.0.0</version>
             </dependency>
-
             <dependency>
                 <groupId>org.webjars.bower</groupId>
                 <artifactId>github-com-polymerelements-paper-styles</artifactId>
                 <version>2.0.0</version>
             </dependency>
 
-            <dependency>
-                <groupId>org.webjars.bower</groupId>
-                <artifactId>github-com-polymerelements-paper-behaviors</artifactId>
-                <version>2.0.0</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.webjars.bower</groupId>
-                <artifactId>github-com-polymerelements-iron-flex-layout</artifactId>
-                <version>2.0.0</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.webjars.bower</groupId>
-                <artifactId>github-com-polymerelements-paper-ripple</artifactId>
-                <version>2.0.1</version>
-            </dependency>
-
             <dependency>
                 <groupId>org.webjars.bower</groupId>
                 <artifactId>github-com-polymerelements-font-roboto</artifactId>
                 <version>1.0.3</version>
             </dependency>
 
-            <dependency>
-                <groupId>org.webjars.bower</groupId>
-                <artifactId>github-com-polymerelements-iron-a11y-keys-behavior</artifactId>
-                <version>2.0.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.webjars.bower</groupId>
-                <artifactId>iron-a11y-keys-behavior</artifactId>
-                <version>2.0.1</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.webjars.bower</groupId>
-                <artifactId>github-com-polymerelements-iron-behaviors</artifactId>
-                <version>2.0.0</version>
-            </dependency>
-
             <dependency>
                 <groupId>org.webjars.bower</groupId>
                 <artifactId>github-com-polymerelements-iron-autogrow-textarea</artifactId>
@@ -295,7 +225,7 @@
             <dependency>
                 <groupId>org.webjars.bower</groupId>
                 <artifactId>github-com-polymerelements-iron-validatable-behavior</artifactId>
-                <version>2.0.0</version>
+                <version>1.1.1</version>
             </dependency>
 
             <dependency>
@@ -306,71 +236,47 @@
 
             <dependency>
                 <groupId>org.webjars.bower</groupId>
-                <artifactId>github-com-polymerelements-iron-a11y-announcer</artifactId>
-                <version>2.0.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.webjars.bower</groupId>
-                <artifactId>iron-a11y-announcer</artifactId>
-                <version>2.0.0</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.webjars.bower</groupId>
-                <artifactId>github-com-polymerelements-paper-dialog-behavior</artifactId>
-                <version>2.0.1</version>
+                <artifactId>github-com-polymerelements-iron-form-element-behavior</artifactId>
+                <version>1.0.6</version>
             </dependency>
 
             <dependency>
                 <groupId>org.webjars.bower</groupId>
-                <artifactId>github-com-polymerelements-iron-overlay-behavior</artifactId>
-                <version>2.0.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.webjars.bower</groupId>
-                <artifactId>iron-overlay-behavior</artifactId>
-                <version>2.0.0</version>
+                <artifactId>paper-input</artifactId>
+                <version>2.0.2</version>
             </dependency>
-
             <dependency>
                 <groupId>org.webjars.bower</groupId>
-                <artifactId>github-com-polymerelements-iron-fit-behavior</artifactId>
-                <version>2.0.1</version>
+                <artifactId>github-com-polymerelements-paper-input</artifactId>
+                <version>2.0.2</version>
             </dependency>
 
             <dependency>
                 <groupId>org.webjars.bower</groupId>
-                <artifactId>github-com-polymerelements-iron-resizable-behavior</artifactId>
+                <artifactId>paper-progress</artifactId>
                 <version>2.0.1</version>
             </dependency>
             <dependency>
                 <groupId>org.webjars.bower</groupId>
-                <artifactId>iron-resizable-behavior</artifactId>
+                <artifactId>github-com-polymerelements-paper-progress</artifactId>
                 <version>2.0.1</version>
             </dependency>
 
             <dependency>
                 <groupId>org.webjars.bower</groupId>
-                <artifactId>github-com-polymerelements-paper-item</artifactId>
+                <artifactId>github-com-polymerelements-iron-range-behavior</artifactId>
                 <version>2.0.0</version>
             </dependency>
 
-            <!-- components demo resolutions -->
-            <dependency>
-                <groupId>org.webjars.bower</groupId>
-                <artifactId>github-com-polymerelements-marked-element</artifactId>
-                <version>2.3.0</version>
-            </dependency>
-
             <dependency>
                 <groupId>org.webjars.bower</groupId>
-                <artifactId>github-com-polymerelements-prism-element</artifactId>
-                <version>2.0.1</version>
+                <artifactId>github-com-polymerelements-paper-behaviors</artifactId>
+                <version>1.0.10</version>
             </dependency>
 
             <dependency>
                 <groupId>org.webjars.bower</groupId>
-                <artifactId>github-com-polymerelements-iron-form-element-behavior</artifactId>
+                <artifactId>github-com-PolymerElements-iron-checked-element-behavior</artifactId>
                 <version>2.0.0</version>
             </dependency>
 
@@ -382,25 +288,18 @@
 
             <dependency>
                 <groupId>org.webjars.bower</groupId>
-                <artifactId>github-com-polymerelements-iron-range-behavior</artifactId>
-                <version>2.0.0</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.webjars.bower</groupId>
-                <artifactId>github-com-polymerelements-neon-animation</artifactId>
+                <artifactId>github-com-polymerelements-paper-dialog-behavior</artifactId>
                 <version>2.0.1</version>
             </dependency>
 
             <dependency>
                 <groupId>org.webjars.bower</groupId>
-                <artifactId>github-com-polymerelements-iron-selector</artifactId>
+                <artifactId>paper-item</artifactId>
                 <version>2.0.0</version>
             </dependency>
-
             <dependency>
                 <groupId>org.webjars.bower</groupId>
-                <artifactId>github-com-polymerelements-iron-scroll-target-behavior</artifactId>
+                <artifactId>github-com-polymerelements-paper-item</artifactId>
                 <version>2.0.0</version>
             </dependency>
 
@@ -410,36 +309,12 @@
                 <version>2.0.1</version>
             </dependency>
 
-            <dependency>
-                <groupId>org.webjars.bower</groupId>
-                <artifactId>github-com-polymerelements-iron-iconset-svg</artifactId>
-                <version>2.1.0</version>
-            </dependency>
-
             <dependency>
                 <groupId>org.webjars.bower</groupId>
                 <artifactId>github-com-polymerelements-paper-listbox</artifactId>
                 <version>2.0.0</version>
             </dependency>
 
-            <dependency>
-                <groupId>org.webjars.bower</groupId>
-                <artifactId>github-com-polymerelements-paper-menu-button</artifactId>
-                <version>2.0.0</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.webjars.bower</groupId>
-                <artifactId>github-com-polymerelements-iron-media-query</artifactId>
-                <version>2.0.0</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.webjars.bower</groupId>
-                <artifactId>github-com-polymerelements-iron-icon</artifactId>
-                <version>2.0.1</version>
-            </dependency>
-
             <dependency>
                 <groupId>org.webjars.bower</groupId>
                 <artifactId>github-com-polymerelements-iron-menu-behavior</artifactId>
@@ -448,69 +323,9 @@
 
             <dependency>
                 <groupId>org.webjars.bower</groupId>
-                <artifactId>github-com-polymerelements-iron-dropdown</artifactId>
-                <version>2.0.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.webjars.bower</groupId>
-                <artifactId>iron-dropdown</artifactId>
+                <artifactId>github-com-polymerelements-paper-menu-button</artifactId>
                 <version>2.0.0</version>
             </dependency>
-
-            <dependency>
-                <groupId>org.webjars.bower</groupId>
-                <artifactId>vaadin-themable-mixin</artifactId>
-                <version>1.1.3</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.webjars.bower</groupId>
-                <artifactId>vaadin-control-state-mixin</artifactId>
-                <version>1.1.4</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.webjars.bower</groupId>
-                <artifactId>iron-list</artifactId>
-                <version>2.0.8</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.webjars.bower</groupId>
-                <artifactId>vaadin-overlay</artifactId>
-                <version>1.4.1</version>
-            </dependency>
-
-            <!-- remove those after updating to newer vaadin-icons, see https://github.com/vaadin/vaadin-icons/commit/2eb9ed8e6b1d326af0652879c609fe69cc9653f0 -->
-            <dependency>
-                <groupId>org.webjars.bower</groupId>
-                <artifactId>vaadin-demo-helpers</artifactId>
-                <version>1.0.0</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.webjars.bower</groupId>
-                <artifactId>marked</artifactId>
-                <version>0.3.6</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.webjars.bower</groupId>
-                <artifactId>prism</artifactId>
-                <version>1.8.1</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.webjars.bower</groupId>
-                <artifactId>github-com-polymerelements-app-route</artifactId>
-                <version>2.0.2</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.webjars.bower</groupId>
-                <artifactId>github-com-polymerelements-iron-location</artifactId>
-                <version>2.0.1</version>
-            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -561,9 +376,11 @@
                 <artifactId>formatter-maven-plugin</artifactId>
                 <version>1.8.1</version>
                 <configuration>
-                    <configFile>classpath:/eclipse/VaadinJavaConventions.xml</configFile>
+                    <configFile>classpath:/eclipse/VaadinJavaConventions.xml
+                    </configFile>
                     <!-- Provide a dummy JS config file to avoid errors -->
-                    <configJsFile>classpath:/eclipse/VaadinJavaConventions.xml</configJsFile>
+                    <configJsFile>classpath:/eclipse/VaadinJavaConventions.xml
+                    </configJsFile>
                 </configuration>
                 <dependencies>
                     <dependency>
@@ -651,7 +468,8 @@
                             <directory>${project.rootdir}/driver</directory>
                         </fileset>
                         <fileset>
-                            <directory>${project.rootdir}/driver_zips</directory>
+                            <directory>${project.rootdir}/driver_zips
+                            </directory>
                         </fileset>
                         <fileset>
                             <directory>error-screenshots</directory>
@@ -674,8 +492,10 @@
                     <configuration>
                         <archive>
                             <manifestEntries>
-                                <Implementation-Title>${project.name}</Implementation-Title>
-                                <Implementation-Version>${project.version}</Implementation-Version>
+                                <Implementation-Title>${project.name}
+                                </Implementation-Title>
+                                <Implementation-Version>${project.version}
+                                </Implementation-Version>
                             </manifestEntries>
                         </archive>
                     </configuration>
diff --git a/webjars-bom/pom.xml b/webjars-bom/pom.xml
new file mode 100644
index 00000000000..c1bb327701a
--- /dev/null
+++ b/webjars-bom/pom.xml
@@ -0,0 +1,379 @@
+<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>
+    <groupId>com.vaadin</groupId>
+    <artifactId>vaadin-webjars-bom</artifactId>
+    <packaging>pom</packaging>
+    <version>1.0-SNAPSHOT</version>
+    <name>Vaadin Webjars (Bill of Materials)</name>
+    <description>Vaadin Webjars (Bill of Materials)</description>
+
+    <dependencyManagement>
+        <dependencies>
+            <!-- Vaadin components webJars -->
+            <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-icons</artifactId>
+                <version>4.1.3</version>
+            </dependency>
+            <dependency>
+                <groupId>org.webjars.bower</groupId>
+                <artifactId>vaadin-text-field</artifactId>
+                <version>1.1.0</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-dialog</artifactId>
+                <version>1.0.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.webjars.bower</groupId>
+                <artifactId>vaadin-combo-box</artifactId>
+                <version>3.0.0</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-checkbox</artifactId>
+                <version>1.0.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.webjars.bower</groupId>
+                <artifactId>vaadin-split-layout</artifactId>
+                <version>3.0.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.webjars.bower</groupId>
+                <artifactId>vaadin-ordered-layout</artifactId>
+                <version>1.0.0-alpha1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.webjars.bower</groupId>
+                <artifactId>vaadin-valo-theme</artifactId>
+                <version>2.0.0-alpha3</version>
+            </dependency>
+
+            <!-- WebJars' transitive dependencies resolutions -->
+            <dependency>
+                <groupId>org.webjars.bower</groupId>
+                <artifactId>polymer</artifactId>
+                <version>2.1.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.webjars.bower</groupId>
+                <artifactId>github-com-polymer-polymer</artifactId>
+                <version>v2.1.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.webjars.bower</groupId>
+                <artifactId>github-com-Polymer-polymer</artifactId>
+                <version>v2.1.1</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.webjars.bower</groupId>
+                <artifactId>github-com-webcomponents-shadycss</artifactId>
+                <version>v1.0.6</version>
+            </dependency>
+            <dependency>
+                <groupId>org.webjars.bower</groupId>
+                <artifactId>shadycss</artifactId>
+                <version>1.0.6</version>
+            </dependency>
+            <dependency>
+                <groupId>org.webjars.bower</groupId>
+                <artifactId>webcomponentsjs</artifactId>
+                <version>1.0.14</version>
+            </dependency>
+            <dependency>
+                <groupId>org.webjars.bower</groupId>
+                <artifactId>github-com-webcomponents-webcomponentsjs</artifactId>
+                <version>v1.0.14</version>
+            </dependency>
+            <dependency>
+                <groupId>org.webjars.bower</groupId>
+                <artifactId>vaadin-control-state-mixin</artifactId>
+                <version>1.1.5</version>
+            </dependency>
+            <dependency>
+                <groupId>org.webjars.bower</groupId>
+                <artifactId>github-com-vaadin-vaadin-control-state-mixin</artifactId>
+                <version>v1.1.5</version>
+            </dependency>
+            <dependency>
+                <groupId>org.webjars.bower</groupId>
+                <artifactId>vaadin-themable-mixin</artifactId>
+                <version>1.1.5</version>
+            </dependency>
+            <dependency>
+                <groupId>org.webjars.bower</groupId>
+                <artifactId>github-com-vaadin-vaadin-themable-mixin</artifactId>
+                <version>v1.1.5</version>
+            </dependency>
+            <dependency>
+                <groupId>org.webjars.bower</groupId>
+                <artifactId>vaadin-overlay</artifactId>
+                <version>1.4.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.webjars.bower</groupId>
+                <artifactId>github-com-vaadin-vaadin-overlay</artifactId>
+                <version>v1.4.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.webjars.bower</groupId>
+                <artifactId>iron-a11y-announcer</artifactId>
+                <version>2.0.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.webjars.bower</groupId>
+                <artifactId>github-com-polymerelements-iron-a11y-announcer</artifactId>
+                <version>2.0.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.webjars.bower</groupId>
+                <artifactId>github-com-PolymerElements-iron-a11y-announcer</artifactId>
+                <version>2.0.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.webjars.bower</groupId>
+                <artifactId>iron-a11y-keys-behavior</artifactId>
+                <version>2.0.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.webjars.bower</groupId>
+                <artifactId>github-com-polymerelements-iron-a11y-keys-behavior</artifactId>
+                <version>2.0.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.webjars.bower</groupId>
+                <artifactId>github-com-PolymerElements-iron-a11y-keys-behavior</artifactId>
+                <version>2.0.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.webjars.bower</groupId>
+                <artifactId>iron-resizable-behavior</artifactId>
+                <version>2.0.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.webjars.bower</groupId>
+                <artifactId>github-com-polymerelements-iron-resizable-behavior</artifactId>
+                <version>2.0.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.webjars.bower</groupId>
+                <artifactId>github-com-PolymerElements-iron-resizable-behavior</artifactId>
+                <version>2.0.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.webjars.bower</groupId>
+                <artifactId>iron-list</artifactId>
+                <version>2.0.10</version>
+            </dependency>
+            <dependency>
+                <groupId>org.webjars.bower</groupId>
+                <artifactId>github-com-polymerelements-iron-list</artifactId>
+                <version>v2.0.10</version>
+            </dependency>
+            <dependency>
+                <groupId>org.webjars.bower</groupId>
+                <artifactId>github-com-PolymerElements-iron-list</artifactId>
+                <version>v2.0.10</version>
+            </dependency>
+            <dependency>
+                <groupId>org.webjars.bower</groupId>
+                <artifactId>github-com-polymerelements-iron-scroll-target-behavior</artifactId>
+                <version>2.0.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.webjars.bower</groupId>
+                <artifactId>github-com-PolymerElements-iron-scroll-target-behavior</artifactId>
+                <version>2.0.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.webjars.bower</groupId>
+                <artifactId>iron-scroll-target-behavior</artifactId>
+                <version>2.0.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.webjars.bower</groupId>
+                <artifactId>iron-icon</artifactId>
+                <version>2.0.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.webjars.bower</groupId>
+                <artifactId>github-com-polymerelements-iron-icon</artifactId>
+                <version>2.0.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.webjars.bower</groupId>
+                <artifactId>github-com-PolymerElements-iron-icon</artifactId>
+                <version>2.0.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.webjars.bower</groupId>
+                <artifactId>github-com-polymerelements-iron-meta</artifactId>
+                <version>2.0.2</version>
+            </dependency>
+            <dependency>
+                <groupId>org.webjars.bower</groupId>
+                <artifactId>github-com-PolymerElements-iron-meta</artifactId>
+                <version>2.0.2</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>github-com-polymerelements-iron-selector</artifactId>
+                <version>2.0.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.webjars.bower</groupId>
+                <artifactId>github-com-PolymerElements-iron-selector</artifactId>
+                <version>2.0.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.webjars.bower</groupId>
+                <artifactId>iron-overlay-behavior</artifactId>
+                <version>2.1.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.webjars.bower</groupId>
+                <artifactId>github-com-polymerelements-iron-overlay-behavior</artifactId>
+                <version>2.1.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.webjars.bower</groupId>
+                <artifactId>github-com-PolymerElements-iron-overlay-behavior</artifactId>
+                <version>2.1.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>github-com-polymerelements-iron-iconset-svg</artifactId>
+                <version>2.1.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.webjars.bower</groupId>
+                <artifactId>github-com-PolymerElements-iron-iconset-svg</artifactId>
+                <version>2.1.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.webjars.bower</groupId>
+                <artifactId>iron-dropdown</artifactId>
+                <version>2.0.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.webjars.bower</groupId>
+                <artifactId>github-com-polymerelements-iron-dropdown</artifactId>
+                <version>2.0.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.webjars.bower</groupId>
+                <artifactId>github-com-PolymerElements-iron-dropdown</artifactId>
+                <version>2.0.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.webjars.bower</groupId>
+                <artifactId>iron-behaviors</artifactId>
+                <version>2.0.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.webjars.bower</groupId>
+                <artifactId>github-com-polymerelements-iron-behaviors</artifactId>
+                <version>2.0.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.webjars.bower</groupId>
+                <artifactId>github-com-PolymerElements-iron-behaviors</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>github-com-polymerelements-neon-animation</artifactId>
+                <version>2.0.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.webjars.bower</groupId>
+                <artifactId>github-com-PolymerElements-neon-animation</artifactId>
+                <version>2.0.1</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>github-com-polymerelements-iron-media-query</artifactId>
+                <version>2.0.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.webjars.bower</groupId>
+                <artifactId>github-com-PolymerElements-iron-media-query</artifactId>
+                <version>2.0.0</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>github-com-polymerelements-iron-flex-layout</artifactId>
+                <version>2.0.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.webjars.bower</groupId>
+                <artifactId>github-com-PolymerElements-iron-flex-layout</artifactId>
+                <version>2.0.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.webjars.bower</groupId>
+                <artifactId>iron-fit-behavior</artifactId>
+                <version>2.0.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.webjars.bower</groupId>
+                <artifactId>github-com-polymerelements-iron-fit-behavior</artifactId>
+                <version>2.0.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.webjars.bower</groupId>
+                <artifactId>github-com-PolymerElements-iron-fit-behavior</artifactId>
+                <version>2.0.1</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+</project>

From a4315220db5b37e3943d2512d5051549760eb426 Mon Sep 17 00:00:00 2001
From: Giovanni Lovato <heruan@aldu.net>
Date: Wed, 18 Oct 2017 21:21:32 +0200
Subject: [PATCH 2/4] Move Transport class to com.vaadin.shared.ui (#2716)

---
 .../java/com/vaadin/flow/nodefeature/PushConfigurationMap.java  | 2 +-
 .../src/main/java/com/vaadin/shared/ui/{ui => }/Transport.java  | 2 +-
 flow-server/src/main/java/com/vaadin/ui/Push.java               | 2 +-
 flow-server/src/main/java/com/vaadin/ui/PushConfiguration.java  | 2 +-
 flow-server/src/main/java/com/vaadin/util/AnnotationReader.java | 2 +-
 .../com/vaadin/flow/nodefeature/PushConfigurationMapTest.java   | 2 +-
 .../com/vaadin/flow/uitest/ui/push/BasicPushLongPollingUI.java  | 2 +-
 .../com/vaadin/flow/uitest/ui/push/BasicPushWebsocketUI.java    | 2 +-
 .../com/vaadin/flow/uitest/ui/push/BasicPushWebsocketXhrUI.java | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)
 rename flow-server/src/main/java/com/vaadin/shared/ui/{ui => }/Transport.java (98%)

diff --git a/flow-server/src/main/java/com/vaadin/flow/nodefeature/PushConfigurationMap.java b/flow-server/src/main/java/com/vaadin/flow/nodefeature/PushConfigurationMap.java
index 55b6f1e2130..b268be9623a 100644
--- a/flow-server/src/main/java/com/vaadin/flow/nodefeature/PushConfigurationMap.java
+++ b/flow-server/src/main/java/com/vaadin/flow/nodefeature/PushConfigurationMap.java
@@ -19,7 +19,7 @@
 
 import com.vaadin.flow.StateNode;
 import com.vaadin.shared.communication.PushMode;
-import com.vaadin.shared.ui.ui.Transport;
+import com.vaadin.shared.ui.Transport;
 import com.vaadin.ui.PushConfiguration;
 
 /**
diff --git a/flow-server/src/main/java/com/vaadin/shared/ui/ui/Transport.java b/flow-server/src/main/java/com/vaadin/shared/ui/Transport.java
similarity index 98%
rename from flow-server/src/main/java/com/vaadin/shared/ui/ui/Transport.java
rename to flow-server/src/main/java/com/vaadin/shared/ui/Transport.java
index 4505ba3b4cb..d34fcddb22e 100644
--- a/flow-server/src/main/java/com/vaadin/shared/ui/ui/Transport.java
+++ b/flow-server/src/main/java/com/vaadin/shared/ui/Transport.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.shared.ui.ui;
+package com.vaadin.shared.ui;
 
 /**
  * Transport modes for Push
diff --git a/flow-server/src/main/java/com/vaadin/ui/Push.java b/flow-server/src/main/java/com/vaadin/ui/Push.java
index 61d56f102ef..f9894e33f28 100644
--- a/flow-server/src/main/java/com/vaadin/ui/Push.java
+++ b/flow-server/src/main/java/com/vaadin/ui/Push.java
@@ -22,7 +22,7 @@
 import java.lang.annotation.Target;
 
 import com.vaadin.shared.communication.PushMode;
-import com.vaadin.shared.ui.ui.Transport;
+import com.vaadin.shared.ui.Transport;
 import com.vaadin.ui.UI;
 
 /**
diff --git a/flow-server/src/main/java/com/vaadin/ui/PushConfiguration.java b/flow-server/src/main/java/com/vaadin/ui/PushConfiguration.java
index 7993f16a5ff..ec4b4eb8e8b 100644
--- a/flow-server/src/main/java/com/vaadin/ui/PushConfiguration.java
+++ b/flow-server/src/main/java/com/vaadin/ui/PushConfiguration.java
@@ -23,7 +23,7 @@
 import com.vaadin.server.VaadinSession;
 import com.vaadin.server.communication.AtmospherePushConnection;
 import com.vaadin.shared.communication.PushMode;
-import com.vaadin.shared.ui.ui.Transport;
+import com.vaadin.shared.ui.Transport;
 
 /**
  * Provides method for configuring the push channel.
diff --git a/flow-server/src/main/java/com/vaadin/util/AnnotationReader.java b/flow-server/src/main/java/com/vaadin/util/AnnotationReader.java
index 494caae50eb..598ff45a45c 100644
--- a/flow-server/src/main/java/com/vaadin/util/AnnotationReader.java
+++ b/flow-server/src/main/java/com/vaadin/util/AnnotationReader.java
@@ -29,7 +29,7 @@
 import com.vaadin.router.PageTitle;
 import com.vaadin.flow.router.View;
 import com.vaadin.shared.communication.PushMode;
-import com.vaadin.shared.ui.ui.Transport;
+import com.vaadin.shared.ui.Transport;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.UI;
 
diff --git a/flow-server/src/test/java/com/vaadin/flow/nodefeature/PushConfigurationMapTest.java b/flow-server/src/test/java/com/vaadin/flow/nodefeature/PushConfigurationMapTest.java
index cf633c032fc..d612f8588fc 100644
--- a/flow-server/src/test/java/com/vaadin/flow/nodefeature/PushConfigurationMapTest.java
+++ b/flow-server/src/test/java/com/vaadin/flow/nodefeature/PushConfigurationMapTest.java
@@ -7,7 +7,7 @@
 import org.junit.Test;
 
 import com.vaadin.flow.nodefeature.PushConfigurationMap;
-import com.vaadin.shared.ui.ui.Transport;
+import com.vaadin.shared.ui.Transport;
 
 public class PushConfigurationMapTest
         extends AbstractNodeFeatureTest<PushConfigurationMap> {
diff --git a/flow-tests/test-root-context/src/main/java/com/vaadin/flow/uitest/ui/push/BasicPushLongPollingUI.java b/flow-tests/test-root-context/src/main/java/com/vaadin/flow/uitest/ui/push/BasicPushLongPollingUI.java
index da3f46f4661..70488fe17f4 100644
--- a/flow-tests/test-root-context/src/main/java/com/vaadin/flow/uitest/ui/push/BasicPushLongPollingUI.java
+++ b/flow-tests/test-root-context/src/main/java/com/vaadin/flow/uitest/ui/push/BasicPushLongPollingUI.java
@@ -3,7 +3,7 @@
 import com.vaadin.ui.Push;
 import com.vaadin.flow.nodefeature.PushConfigurationMap;
 import com.vaadin.server.VaadinRequest;
-import com.vaadin.shared.ui.ui.Transport;
+import com.vaadin.shared.ui.Transport;
 
 @Push(transport = Transport.LONG_POLLING)
 public class BasicPushLongPollingUI extends BasicPushUI {
diff --git a/flow-tests/test-root-context/src/main/java/com/vaadin/flow/uitest/ui/push/BasicPushWebsocketUI.java b/flow-tests/test-root-context/src/main/java/com/vaadin/flow/uitest/ui/push/BasicPushWebsocketUI.java
index d41c684c256..29bbcb468a2 100644
--- a/flow-tests/test-root-context/src/main/java/com/vaadin/flow/uitest/ui/push/BasicPushWebsocketUI.java
+++ b/flow-tests/test-root-context/src/main/java/com/vaadin/flow/uitest/ui/push/BasicPushWebsocketUI.java
@@ -3,7 +3,7 @@
 import com.vaadin.ui.Push;
 import com.vaadin.flow.nodefeature.PushConfigurationMap;
 import com.vaadin.server.VaadinRequest;
-import com.vaadin.shared.ui.ui.Transport;
+import com.vaadin.shared.ui.Transport;
 
 @Push(transport = Transport.WEBSOCKET)
 public class BasicPushWebsocketUI extends BasicPushUI {
diff --git a/flow-tests/test-root-context/src/main/java/com/vaadin/flow/uitest/ui/push/BasicPushWebsocketXhrUI.java b/flow-tests/test-root-context/src/main/java/com/vaadin/flow/uitest/ui/push/BasicPushWebsocketXhrUI.java
index 78ea0a536f2..c6d449e5784 100644
--- a/flow-tests/test-root-context/src/main/java/com/vaadin/flow/uitest/ui/push/BasicPushWebsocketXhrUI.java
+++ b/flow-tests/test-root-context/src/main/java/com/vaadin/flow/uitest/ui/push/BasicPushWebsocketXhrUI.java
@@ -3,7 +3,7 @@
 import com.vaadin.ui.Push;
 import com.vaadin.flow.nodefeature.PushConfigurationMap;
 import com.vaadin.server.VaadinRequest;
-import com.vaadin.shared.ui.ui.Transport;
+import com.vaadin.shared.ui.Transport;
 
 @Push(transport = Transport.WEBSOCKET_XHR)
 public class BasicPushWebsocketXhrUI extends BasicPushUI {

From 88b2d7c07fad94fbf2164518f25bfe16ce705895 Mon Sep 17 00:00:00 2001
From: Giovanni Lovato <heruan@aldu.net>
Date: Wed, 18 Oct 2017 22:07:40 +0200
Subject: [PATCH 3/4] Move AttachEvent and DetachEvent to com.vaadin.ui.event
 (#2717)

---
 .../src/main/java/com/vaadin/flow/demo/views/DemoView.java    | 2 +-
 .../com/vaadin/flow/tutorial/component/ComponentAttach.java   | 4 ++--
 flow-server/src/main/java/com/vaadin/ui/AngularTemplate.java  | 2 +-
 flow-server/src/main/java/com/vaadin/ui/Component.java        | 4 ++--
 flow-server/src/main/java/com/vaadin/ui/ComponentUtil.java    | 4 ++--
 flow-server/src/main/java/com/vaadin/ui/UI.java               | 4 ++--
 .../java/com/vaadin/ui/common/AbstractAttachDetachEvent.java  | 2 ++
 .../src/main/java/com/vaadin/ui/common/AttachNotifier.java    | 1 +
 .../src/main/java/com/vaadin/ui/common/DetachNotifier.java    | 1 +
 .../java/com/vaadin/ui/{common => event}/AttachEvent.java     | 3 ++-
 .../java/com/vaadin/ui/{common => event}/DetachEvent.java     | 3 ++-
 flow-server/src/test/java/com/vaadin/ui/ComponentTest.java    | 4 ++--
 flow-server/src/test/java/com/vaadin/ui/CompositeTest.java    | 4 ++--
 flow-server/src/test/java/com/vaadin/ui/UITest.java           | 4 ++--
 .../src/main/java/com/vaadin/spring/scopes/VaadinUIScope.java | 2 +-
 .../main/java/com/vaadin/flow/uitest/ui/DependencyView.java   | 2 +-
 .../main/java/com/vaadin/flow/uitest/ui/FragmentLinkView.java | 2 +-
 .../java/com/vaadin/flow/uitest/ui/FragmentLinkView2.java     | 2 +-
 .../src/main/java/com/vaadin/flow/uitest/ui/InfoView.java     | 2 +-
 .../com/vaadin/flow/uitest/ui/TimingInfoReportedView.java     | 2 +-
 .../uitest/ui/dependencies/DependenciesLoadingBaseUI.java     | 2 +-
 .../vaadin/flow/uitest/ui/frontend/FrontendProtocolView.java  | 2 +-
 .../com/vaadin/flow/uitest/ui/push/ClientServerCounterUI.java | 2 +-
 .../flow/uitest/ui/template/PolymerModelPropertiesView.java   | 2 +-
 .../flow/uitest/ui/template/imports/LazyWidgetView.java       | 2 +-
 .../src/main/java/com/vaadin/flow/spring/ChildTemplate.java   | 2 +-
 .../java/com/vaadin/flow/spring/RootNavigationTarget.java     | 2 +-
 .../src/main/java/com/vaadin/flow/spring/UIScopeTarget.java   | 2 +-
 28 files changed, 38 insertions(+), 32 deletions(-)
 rename flow-server/src/main/java/com/vaadin/ui/{common => event}/AttachEvent.java (95%)
 rename flow-server/src/main/java/com/vaadin/ui/{common => event}/DetachEvent.java (92%)

diff --git a/flow-components-parent/demo-flow-components/src/main/java/com/vaadin/flow/demo/views/DemoView.java b/flow-components-parent/demo-flow-components/src/main/java/com/vaadin/flow/demo/views/DemoView.java
index fcfd5f43906..78086a5692a 100644
--- a/flow-components-parent/demo-flow-components/src/main/java/com/vaadin/flow/demo/views/DemoView.java
+++ b/flow-components-parent/demo-flow-components/src/main/java/com/vaadin/flow/demo/views/DemoView.java
@@ -26,9 +26,9 @@
 import com.vaadin.ui.Component;
 import com.vaadin.ui.Tag;
 import com.vaadin.ui.UI;
-import com.vaadin.ui.common.AttachEvent;
 import com.vaadin.ui.common.HasComponents;
 import com.vaadin.ui.common.StyleSheet;
+import com.vaadin.ui.event.AttachEvent;
 import com.vaadin.ui.html.H3;
 
 /**
diff --git a/flow-documentation/src/main/java/com/vaadin/flow/tutorial/component/ComponentAttach.java b/flow-documentation/src/main/java/com/vaadin/flow/tutorial/component/ComponentAttach.java
index f3065c0616e..411c3a7c84b 100644
--- a/flow-documentation/src/main/java/com/vaadin/flow/tutorial/component/ComponentAttach.java
+++ b/flow-documentation/src/main/java/com/vaadin/flow/tutorial/component/ComponentAttach.java
@@ -4,10 +4,10 @@
 import java.util.function.Consumer;
 
 import com.vaadin.flow.tutorial.annotations.CodeFor;
-import com.vaadin.ui.common.AttachEvent;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.Tag;
-import com.vaadin.ui.common.DetachEvent;
+import com.vaadin.ui.event.AttachEvent;
+import com.vaadin.ui.event.DetachEvent;
 
 @CodeFor("creating-components/tutorial-component-with-dependencies.asciidoc")
 public class ComponentAttach {
diff --git a/flow-server/src/main/java/com/vaadin/ui/AngularTemplate.java b/flow-server/src/main/java/com/vaadin/ui/AngularTemplate.java
index 9d92fbe160a..a9d1261d813 100644
--- a/flow-server/src/main/java/com/vaadin/ui/AngularTemplate.java
+++ b/flow-server/src/main/java/com/vaadin/ui/AngularTemplate.java
@@ -32,6 +32,7 @@
 import com.vaadin.flow.router.HasChildView;
 import com.vaadin.flow.router.RouterConfiguration;
 import com.vaadin.flow.router.View;
+import com.vaadin.ui.event.AttachEvent;
 import com.vaadin.ui.polymertemplate.AbstractTemplate;
 import com.vaadin.flow.template.angular.RelativeFileResolver;
 import com.vaadin.flow.template.angular.TemplateNode;
@@ -42,7 +43,6 @@
 import com.vaadin.flow.template.angular.model.TemplateModelTypeParser;
 import com.vaadin.flow.template.angular.parser.TemplateParser;
 import com.vaadin.flow.template.angular.parser.TemplateResolver;
-import com.vaadin.ui.common.AttachEvent;
 import com.vaadin.util.ReflectTools;
 
 /**
diff --git a/flow-server/src/main/java/com/vaadin/ui/Component.java b/flow-server/src/main/java/com/vaadin/ui/Component.java
index 75dcdb9947a..6625eeb00be 100644
--- a/flow-server/src/main/java/com/vaadin/ui/Component.java
+++ b/flow-server/src/main/java/com/vaadin/ui/Component.java
@@ -24,17 +24,17 @@
 import com.vaadin.flow.dom.ElementUtil;
 import com.vaadin.flow.dom.ShadowRoot;
 import com.vaadin.shared.Registration;
-import com.vaadin.ui.common.AttachEvent;
 import com.vaadin.ui.common.AttachNotifier;
-import com.vaadin.ui.common.DetachEvent;
 import com.vaadin.ui.common.DetachNotifier;
 import com.vaadin.ui.common.HasElement;
 import com.vaadin.ui.common.PropertyDescriptor;
 import com.vaadin.ui.common.PropertyDescriptors;
+import com.vaadin.ui.event.AttachEvent;
 import com.vaadin.ui.event.ComponentEvent;
 import com.vaadin.ui.event.ComponentEventBus;
 import com.vaadin.ui.event.ComponentEventListener;
 import com.vaadin.ui.event.ComponentEventNotifier;
+import com.vaadin.ui.event.DetachEvent;
 import com.vaadin.util.AnnotationReader;
 
 /**
diff --git a/flow-server/src/main/java/com/vaadin/ui/ComponentUtil.java b/flow-server/src/main/java/com/vaadin/ui/ComponentUtil.java
index 7651f7913ff..ca2ddbe6ac7 100644
--- a/flow-server/src/main/java/com/vaadin/ui/ComponentUtil.java
+++ b/flow-server/src/main/java/com/vaadin/ui/ComponentUtil.java
@@ -27,12 +27,12 @@
 import com.vaadin.ui.Component.MapToExistingElement;
 import com.vaadin.ui.ComponentMetaData.DependencyInfo;
 import com.vaadin.ui.ComponentMetaData.SynchronizedPropertyInfo;
-import com.vaadin.ui.common.AttachEvent;
-import com.vaadin.ui.common.DetachEvent;
 import com.vaadin.ui.common.HtmlImport;
 import com.vaadin.ui.common.JavaScript;
 import com.vaadin.ui.common.StyleSheet;
 import com.vaadin.ui.common.Uses;
+import com.vaadin.ui.event.AttachEvent;
+import com.vaadin.ui.event.DetachEvent;
 
 /**
  * Utility methods for {@link Component}.
diff --git a/flow-server/src/main/java/com/vaadin/ui/UI.java b/flow-server/src/main/java/com/vaadin/ui/UI.java
index 50286013be7..26260793692 100644
--- a/flow-server/src/main/java/com/vaadin/ui/UI.java
+++ b/flow-server/src/main/java/com/vaadin/ui/UI.java
@@ -46,9 +46,9 @@
 import com.vaadin.server.VaadinSession;
 import com.vaadin.server.communication.PushConnection;
 import com.vaadin.shared.ApplicationConstants;
-import com.vaadin.ui.common.AttachEvent;
-import com.vaadin.ui.common.DetachEvent;
 import com.vaadin.ui.common.HasComponents;
+import com.vaadin.ui.event.AttachEvent;
+import com.vaadin.ui.event.DetachEvent;
 import com.vaadin.util.CurrentInstance;
 
 /**
diff --git a/flow-server/src/main/java/com/vaadin/ui/common/AbstractAttachDetachEvent.java b/flow-server/src/main/java/com/vaadin/ui/common/AbstractAttachDetachEvent.java
index 2c0e5a1f22c..a2c563ca844 100644
--- a/flow-server/src/main/java/com/vaadin/ui/common/AbstractAttachDetachEvent.java
+++ b/flow-server/src/main/java/com/vaadin/ui/common/AbstractAttachDetachEvent.java
@@ -18,7 +18,9 @@
 import com.vaadin.server.VaadinSession;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.UI;
+import com.vaadin.ui.event.AttachEvent;
 import com.vaadin.ui.event.ComponentEvent;
+import com.vaadin.ui.event.DetachEvent;
 
 /**
  * Internal helper for {@link AttachEvent} and {@link DetachEvent}.
diff --git a/flow-server/src/main/java/com/vaadin/ui/common/AttachNotifier.java b/flow-server/src/main/java/com/vaadin/ui/common/AttachNotifier.java
index eba8bfc8997..02c5639c566 100644
--- a/flow-server/src/main/java/com/vaadin/ui/common/AttachNotifier.java
+++ b/flow-server/src/main/java/com/vaadin/ui/common/AttachNotifier.java
@@ -15,6 +15,7 @@
  */
 package com.vaadin.ui.common;
 
+import com.vaadin.ui.event.AttachEvent;
 import com.vaadin.ui.event.ComponentEventListener;
 import com.vaadin.shared.Registration;
 import com.vaadin.ui.event.ComponentEventNotifier;
diff --git a/flow-server/src/main/java/com/vaadin/ui/common/DetachNotifier.java b/flow-server/src/main/java/com/vaadin/ui/common/DetachNotifier.java
index 1de029d8d40..67b8f54b093 100644
--- a/flow-server/src/main/java/com/vaadin/ui/common/DetachNotifier.java
+++ b/flow-server/src/main/java/com/vaadin/ui/common/DetachNotifier.java
@@ -18,6 +18,7 @@
 import com.vaadin.ui.event.ComponentEventListener;
 import com.vaadin.shared.Registration;
 import com.vaadin.ui.event.ComponentEventNotifier;
+import com.vaadin.ui.event.DetachEvent;
 
 /**
  * Mixin interface for components that support adding detach listeners.
diff --git a/flow-server/src/main/java/com/vaadin/ui/common/AttachEvent.java b/flow-server/src/main/java/com/vaadin/ui/event/AttachEvent.java
similarity index 95%
rename from flow-server/src/main/java/com/vaadin/ui/common/AttachEvent.java
rename to flow-server/src/main/java/com/vaadin/ui/event/AttachEvent.java
index aecaa22ef83..659e45d359e 100644
--- a/flow-server/src/main/java/com/vaadin/ui/common/AttachEvent.java
+++ b/flow-server/src/main/java/com/vaadin/ui/event/AttachEvent.java
@@ -13,9 +13,10 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.common;
+package com.vaadin.ui.event;
 
 import com.vaadin.ui.Component;
+import com.vaadin.ui.common.AbstractAttachDetachEvent;
 
 /**
  * Event fired after a {@link Component} is attached to the UI.
diff --git a/flow-server/src/main/java/com/vaadin/ui/common/DetachEvent.java b/flow-server/src/main/java/com/vaadin/ui/event/DetachEvent.java
similarity index 92%
rename from flow-server/src/main/java/com/vaadin/ui/common/DetachEvent.java
rename to flow-server/src/main/java/com/vaadin/ui/event/DetachEvent.java
index c6b83bf6bba..b955e97b3b6 100644
--- a/flow-server/src/main/java/com/vaadin/ui/common/DetachEvent.java
+++ b/flow-server/src/main/java/com/vaadin/ui/event/DetachEvent.java
@@ -13,9 +13,10 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.common;
+package com.vaadin.ui.event;
 
 import com.vaadin.ui.Component;
+import com.vaadin.ui.common.AbstractAttachDetachEvent;
 
 /**
  * Event fired before a {@link Component} is detached from the UI.
diff --git a/flow-server/src/test/java/com/vaadin/ui/ComponentTest.java b/flow-server/src/test/java/com/vaadin/ui/ComponentTest.java
index 3c0ad681e78..5e6d43a5ac1 100644
--- a/flow-server/src/test/java/com/vaadin/ui/ComponentTest.java
+++ b/flow-server/src/test/java/com/vaadin/ui/ComponentTest.java
@@ -44,16 +44,16 @@
 import com.vaadin.shared.Registration;
 import com.vaadin.shared.ui.Dependency;
 import com.vaadin.tests.util.TestUtil;
-import com.vaadin.ui.common.AttachEvent;
 import com.vaadin.ui.common.DependencyList;
-import com.vaadin.ui.common.DetachEvent;
 import com.vaadin.ui.common.HtmlImport;
 import com.vaadin.ui.common.JavaScript;
 import com.vaadin.ui.common.StyleSheet;
 import com.vaadin.ui.common.Uses;
+import com.vaadin.ui.event.AttachEvent;
 import com.vaadin.ui.event.ComponentEvent;
 import com.vaadin.ui.event.ComponentEventBus;
 import com.vaadin.ui.event.ComponentEventListener;
+import com.vaadin.ui.event.DetachEvent;
 import com.vaadin.ui.event.Synchronize;
 
 public class ComponentTest {
diff --git a/flow-server/src/test/java/com/vaadin/ui/CompositeTest.java b/flow-server/src/test/java/com/vaadin/ui/CompositeTest.java
index 72f340a56ae..2d7e6875f02 100644
--- a/flow-server/src/test/java/com/vaadin/ui/CompositeTest.java
+++ b/flow-server/src/test/java/com/vaadin/ui/CompositeTest.java
@@ -22,9 +22,9 @@
 import com.vaadin.ui.ComponentTest.TestComponent;
 import com.vaadin.ui.ComponentTest.TracksAttachDetach;
 import com.vaadin.ui.CompositeNestedTest.TestLayout;
-import com.vaadin.ui.common.AttachEvent;
-import com.vaadin.ui.common.DetachEvent;
+import com.vaadin.ui.event.AttachEvent;
 import com.vaadin.ui.event.ComponentEventListener;
+import com.vaadin.ui.event.DetachEvent;
 import com.vaadin.ui.polymertemplate.PolymerTemplate;
 
 public class CompositeTest {
diff --git a/flow-server/src/test/java/com/vaadin/ui/UITest.java b/flow-server/src/test/java/com/vaadin/ui/UITest.java
index 1982296d515..2f9751d78ad 100644
--- a/flow-server/src/test/java/com/vaadin/ui/UITest.java
+++ b/flow-server/src/test/java/com/vaadin/ui/UITest.java
@@ -31,8 +31,8 @@
 import com.vaadin.server.VaadinService;
 import com.vaadin.server.VaadinServlet;
 import com.vaadin.ui.History.HistoryStateChangeEvent;
-import com.vaadin.ui.common.AttachEvent;
-import com.vaadin.ui.common.DetachEvent;
+import com.vaadin.ui.event.AttachEvent;
+import com.vaadin.ui.event.DetachEvent;
 import com.vaadin.util.CurrentInstance;
 
 public class UITest {
diff --git a/flow-spring-addon/src/main/java/com/vaadin/spring/scopes/VaadinUIScope.java b/flow-spring-addon/src/main/java/com/vaadin/spring/scopes/VaadinUIScope.java
index 5de6f6fe559..e94a6ee588f 100644
--- a/flow-spring-addon/src/main/java/com/vaadin/spring/scopes/VaadinUIScope.java
+++ b/flow-spring-addon/src/main/java/com/vaadin/spring/scopes/VaadinUIScope.java
@@ -25,8 +25,8 @@
 import com.vaadin.shared.Registration;
 import com.vaadin.spring.SpringVaadinSession;
 import com.vaadin.ui.UI;
-import com.vaadin.ui.common.DetachEvent;
 import com.vaadin.ui.event.ComponentEventListener;
+import com.vaadin.ui.event.DetachEvent;
 
 /**
  * Implementation of Spring's
diff --git a/flow-tests/test-root-context/src/main/java/com/vaadin/flow/uitest/ui/DependencyView.java b/flow-tests/test-root-context/src/main/java/com/vaadin/flow/uitest/ui/DependencyView.java
index 6869157d112..2424dcc8f7d 100644
--- a/flow-tests/test-root-context/src/main/java/com/vaadin/flow/uitest/ui/DependencyView.java
+++ b/flow-tests/test-root-context/src/main/java/com/vaadin/flow/uitest/ui/DependencyView.java
@@ -27,9 +27,9 @@
 import com.vaadin.ui.Tag;
 import com.vaadin.ui.Text;
 import com.vaadin.ui.UI;
-import com.vaadin.ui.common.AttachEvent;
 import com.vaadin.ui.common.HasText;
 import com.vaadin.ui.common.HtmlImport;
+import com.vaadin.ui.event.AttachEvent;
 import com.vaadin.ui.html.Div;
 import com.vaadin.ui.html.Hr;
 import com.vaadin.ui.html.NativeButton;
diff --git a/flow-tests/test-root-context/src/main/java/com/vaadin/flow/uitest/ui/FragmentLinkView.java b/flow-tests/test-root-context/src/main/java/com/vaadin/flow/uitest/ui/FragmentLinkView.java
index c8f71d14283..8d8b7f4c544 100644
--- a/flow-tests/test-root-context/src/main/java/com/vaadin/flow/uitest/ui/FragmentLinkView.java
+++ b/flow-tests/test-root-context/src/main/java/com/vaadin/flow/uitest/ui/FragmentLinkView.java
@@ -2,8 +2,8 @@
 
 import com.vaadin.flow.dom.Element;
 import com.vaadin.flow.dom.ElementFactory;
-import com.vaadin.ui.common.AttachEvent;
 import com.vaadin.ui.History.HistoryStateChangeHandler;
+import com.vaadin.ui.event.AttachEvent;
 import com.vaadin.ui.Page;
 
 public class FragmentLinkView extends AbstractDivView {
diff --git a/flow-tests/test-root-context/src/main/java/com/vaadin/flow/uitest/ui/FragmentLinkView2.java b/flow-tests/test-root-context/src/main/java/com/vaadin/flow/uitest/ui/FragmentLinkView2.java
index 898f3eabde3..7bd421f3822 100644
--- a/flow-tests/test-root-context/src/main/java/com/vaadin/flow/uitest/ui/FragmentLinkView2.java
+++ b/flow-tests/test-root-context/src/main/java/com/vaadin/flow/uitest/ui/FragmentLinkView2.java
@@ -1,7 +1,7 @@
 package com.vaadin.flow.uitest.ui;
 
 import com.vaadin.flow.dom.Element;
-import com.vaadin.ui.common.AttachEvent;
+import com.vaadin.ui.event.AttachEvent;
 
 public class FragmentLinkView2 extends FragmentLinkView {
 
diff --git a/flow-tests/test-root-context/src/main/java/com/vaadin/flow/uitest/ui/InfoView.java b/flow-tests/test-root-context/src/main/java/com/vaadin/flow/uitest/ui/InfoView.java
index f283b4aa544..dde2d2e9a07 100644
--- a/flow-tests/test-root-context/src/main/java/com/vaadin/flow/uitest/ui/InfoView.java
+++ b/flow-tests/test-root-context/src/main/java/com/vaadin/flow/uitest/ui/InfoView.java
@@ -26,9 +26,9 @@
 import com.vaadin.function.DeploymentConfiguration;
 import com.vaadin.server.VaadinSession;
 import com.vaadin.server.WebBrowser;
-import com.vaadin.ui.common.AttachEvent;
 import com.vaadin.ui.Html;
 import com.vaadin.ui.UI;
+import com.vaadin.ui.event.AttachEvent;
 
 public class InfoView extends Div implements View {
 
diff --git a/flow-tests/test-root-context/src/main/java/com/vaadin/flow/uitest/ui/TimingInfoReportedView.java b/flow-tests/test-root-context/src/main/java/com/vaadin/flow/uitest/ui/TimingInfoReportedView.java
index af71d90032b..4b84fc3ce14 100644
--- a/flow-tests/test-root-context/src/main/java/com/vaadin/flow/uitest/ui/TimingInfoReportedView.java
+++ b/flow-tests/test-root-context/src/main/java/com/vaadin/flow/uitest/ui/TimingInfoReportedView.java
@@ -16,9 +16,9 @@
 package com.vaadin.flow.uitest.ui;
 
 import com.vaadin.ui.html.NativeButton;
+import com.vaadin.ui.event.AttachEvent;
 import com.vaadin.ui.html.Div;
 import com.vaadin.flow.router.View;
-import com.vaadin.ui.common.AttachEvent;
 
 /**
  * @author Vaadin Ltd
diff --git a/flow-tests/test-root-context/src/main/java/com/vaadin/flow/uitest/ui/dependencies/DependenciesLoadingBaseUI.java b/flow-tests/test-root-context/src/main/java/com/vaadin/flow/uitest/ui/dependencies/DependenciesLoadingBaseUI.java
index 6ddda74413c..ae5fcd17b57 100644
--- a/flow-tests/test-root-context/src/main/java/com/vaadin/flow/uitest/ui/dependencies/DependenciesLoadingBaseUI.java
+++ b/flow-tests/test-root-context/src/main/java/com/vaadin/flow/uitest/ui/dependencies/DependenciesLoadingBaseUI.java
@@ -2,8 +2,8 @@
 
 import com.vaadin.ui.html.Div;
 import com.vaadin.server.VaadinRequest;
-import com.vaadin.ui.common.AttachEvent;
 import com.vaadin.ui.UI;
+import com.vaadin.ui.event.AttachEvent;
 
 /**
  * This class provides test base for IT test that check dependencies being
diff --git a/flow-tests/test-root-context/src/main/java/com/vaadin/flow/uitest/ui/frontend/FrontendProtocolView.java b/flow-tests/test-root-context/src/main/java/com/vaadin/flow/uitest/ui/frontend/FrontendProtocolView.java
index f2aa90a59c7..0c5061e0ef5 100644
--- a/flow-tests/test-root-context/src/main/java/com/vaadin/flow/uitest/ui/frontend/FrontendProtocolView.java
+++ b/flow-tests/test-root-context/src/main/java/com/vaadin/flow/uitest/ui/frontend/FrontendProtocolView.java
@@ -16,10 +16,10 @@
 package com.vaadin.flow.uitest.ui.frontend;
 
 import com.vaadin.flow.router.View;
-import com.vaadin.ui.common.AttachEvent;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.Tag;
 import com.vaadin.ui.common.HasComponents;
+import com.vaadin.ui.event.AttachEvent;
 
 /**
  * Wrapper view for the {@link FrontendProtocolTemplate} component. This class
diff --git a/flow-tests/test-root-context/src/main/java/com/vaadin/flow/uitest/ui/push/ClientServerCounterUI.java b/flow-tests/test-root-context/src/main/java/com/vaadin/flow/uitest/ui/push/ClientServerCounterUI.java
index 44c3424fa57..7bfc0916a10 100644
--- a/flow-tests/test-root-context/src/main/java/com/vaadin/flow/uitest/ui/push/ClientServerCounterUI.java
+++ b/flow-tests/test-root-context/src/main/java/com/vaadin/flow/uitest/ui/push/ClientServerCounterUI.java
@@ -7,8 +7,8 @@
 import com.vaadin.flow.dom.ElementFactory;
 import com.vaadin.ui.html.NativeButton;
 import com.vaadin.server.VaadinRequest;
-import com.vaadin.ui.common.DetachEvent;
 import com.vaadin.ui.UI;
+import com.vaadin.ui.event.DetachEvent;
 
 public class ClientServerCounterUI extends UI {
 
diff --git a/flow-tests/test-root-context/src/main/java/com/vaadin/flow/uitest/ui/template/PolymerModelPropertiesView.java b/flow-tests/test-root-context/src/main/java/com/vaadin/flow/uitest/ui/template/PolymerModelPropertiesView.java
index 52621e21373..ede7beaebe0 100644
--- a/flow-tests/test-root-context/src/main/java/com/vaadin/flow/uitest/ui/template/PolymerModelPropertiesView.java
+++ b/flow-tests/test-root-context/src/main/java/com/vaadin/flow/uitest/ui/template/PolymerModelPropertiesView.java
@@ -17,8 +17,8 @@
 
 import com.vaadin.flow.router.View;
 import com.vaadin.ui.Tag;
-import com.vaadin.ui.common.AttachEvent;
 import com.vaadin.ui.common.HtmlImport;
+import com.vaadin.ui.event.AttachEvent;
 import com.vaadin.ui.event.ComponentEvent;
 import com.vaadin.ui.event.DomEvent;
 import com.vaadin.ui.html.Div;
diff --git a/flow-tests/test-root-context/src/main/java/com/vaadin/flow/uitest/ui/template/imports/LazyWidgetView.java b/flow-tests/test-root-context/src/main/java/com/vaadin/flow/uitest/ui/template/imports/LazyWidgetView.java
index 5357f0644e1..aac58723613 100644
--- a/flow-tests/test-root-context/src/main/java/com/vaadin/flow/uitest/ui/template/imports/LazyWidgetView.java
+++ b/flow-tests/test-root-context/src/main/java/com/vaadin/flow/uitest/ui/template/imports/LazyWidgetView.java
@@ -19,9 +19,9 @@
 import com.vaadin.flow.router.View;
 import com.vaadin.shared.ui.LoadMode;
 import com.vaadin.ui.Tag;
-import com.vaadin.ui.common.AttachEvent;
 import com.vaadin.ui.common.ClientDelegate;
 import com.vaadin.ui.common.HtmlImport;
+import com.vaadin.ui.event.AttachEvent;
 import com.vaadin.ui.polymertemplate.PolymerTemplate;
 
 @Tag("x-lazy-widget")
diff --git a/flow-tests/test-spring-common/src/main/java/com/vaadin/flow/spring/ChildTemplate.java b/flow-tests/test-spring-common/src/main/java/com/vaadin/flow/spring/ChildTemplate.java
index f5d90f6ae03..7f3dbb9c731 100644
--- a/flow-tests/test-spring-common/src/main/java/com/vaadin/flow/spring/ChildTemplate.java
+++ b/flow-tests/test-spring-common/src/main/java/com/vaadin/flow/spring/ChildTemplate.java
@@ -21,8 +21,8 @@
 import com.vaadin.flow.model.TemplateModel;
 import com.vaadin.spring.annotation.VaadinSessionScope;
 import com.vaadin.ui.Tag;
-import com.vaadin.ui.common.AttachEvent;
 import com.vaadin.ui.common.HtmlImport;
+import com.vaadin.ui.event.AttachEvent;
 import com.vaadin.ui.polymertemplate.PolymerTemplate;
 
 @Tag("child-template")
diff --git a/flow-tests/test-spring-common/src/main/java/com/vaadin/flow/spring/RootNavigationTarget.java b/flow-tests/test-spring-common/src/main/java/com/vaadin/flow/spring/RootNavigationTarget.java
index 3370870554c..0e45fbaa6cc 100644
--- a/flow-tests/test-spring-common/src/main/java/com/vaadin/flow/spring/RootNavigationTarget.java
+++ b/flow-tests/test-spring-common/src/main/java/com/vaadin/flow/spring/RootNavigationTarget.java
@@ -18,7 +18,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 
 import com.vaadin.router.Route;
-import com.vaadin.ui.common.AttachEvent;
+import com.vaadin.ui.event.AttachEvent;
 import com.vaadin.ui.html.Div;
 import com.vaadin.ui.html.Label;
 
diff --git a/flow-tests/test-spring-common/src/main/java/com/vaadin/flow/spring/UIScopeTarget.java b/flow-tests/test-spring-common/src/main/java/com/vaadin/flow/spring/UIScopeTarget.java
index 39a14768474..55e3424c79c 100644
--- a/flow-tests/test-spring-common/src/main/java/com/vaadin/flow/spring/UIScopeTarget.java
+++ b/flow-tests/test-spring-common/src/main/java/com/vaadin/flow/spring/UIScopeTarget.java
@@ -21,7 +21,7 @@
 import org.springframework.stereotype.Component;
 
 import com.vaadin.router.Route;
-import com.vaadin.ui.common.AttachEvent;
+import com.vaadin.ui.event.AttachEvent;
 import com.vaadin.ui.html.Div;
 import com.vaadin.ui.html.Label;
 

From 3355be8b043951c91e3c70fc2ed60d87698d36ae Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@vaadin.com>
Date: Thu, 19 Oct 2017 01:35:40 +0300
Subject: [PATCH 4/4] Update documentation.

---
 .../tutorial-flow-components-setup.asciidoc   | 135 ++++++++++++++----
 .../java/com/vaadin/server/Constants.java     |   2 +-
 2 files changed, 111 insertions(+), 26 deletions(-)

diff --git a/flow-documentation/flow-components/tutorial-flow-components-setup.asciidoc b/flow-documentation/flow-components/tutorial-flow-components-setup.asciidoc
index 3122d8b5652..7de316618a7 100644
--- a/flow-documentation/flow-components/tutorial-flow-components-setup.asciidoc
+++ b/flow-documentation/flow-components/tutorial-flow-components-setup.asciidoc
@@ -7,40 +7,116 @@ layout: page
 = Setup your project to use Flow components
 
 Flow provides some pre-built server-side components for Vaadin webcomponents,
-such as `VaadinButton`, `VaadinTextField` and so on. Those components are part of
+such as `Button`, `TextField` and so on. Those components are part of
 the `flow-components` package, that can be added as an optional dependency to
 any Flow project.
 
-== Maven configuration
+= Overview
+
+`flow-components` package consists of two main sections:
+
+* java api classes (`Button`, `TextField`, etc)
+* web components' files (html, js, css etc)
+
+All sections are used by `flow` to display the components in web pages correctly.
+By default, both sections are provided in the same jar.
+
+Web components' files are provided as https://github.com/webjars/webjars/[webjars] –
+jar files that contain webcomponents' files,
+heavily influenced by current Polymer package manager: https://bower.io/[bower]
+(not developed or maintained by Vaadin)
+
+Webjars are designed to replace `bower` usage by using `Maven` for the same purposes.
+
+`Flow` is able to resolve requests into webjars' contents (if intended by request),
+imitating the regular web component's files.
+
+Although currently enabled by default, webjars do not restrict users from using external
+web components' files:
+
+* webjar resolving can be turned off
+* if no suitable webjar is found, request resolving falls back to configured
+external web components' locations
 
 [NOTE]
-Before you configure your project to use Flow components, make sure it is
-properly configured to run with Polymer webcomponents. Please refer to
-<<../web-components/tutorial-webcomponent-basic#,Basic Integration of a Polymer Web Component>>
-for more information.
+Due to current webjar https://github.com/webjars/webjars/issues[limitations],
+extra maven configuration (extra repository + bom file declaration) is required.
 
-The first step is to add the `flow-components` package to your project
+== Maven configuration
+
+The first step is to add the `bom` and `flow-components` package to your project
 dependencies. This package is released alongside Flow and shares the same
-version number. When using Maven you can add it to your `pom.xml` as this:
+version number. When using Maven you can add it into your `pom.xml` as this:
 
 [source,xml]
 ----
-<dependency>
-    <groupId>com.vaadin</groupId>
-    <artifactId>flow-components</artifactId>
-    <version>${flow.version}</version>
-</dependency>
+<repositories>
+    <repository>
+        <!-- Limitation: Not all webjars are synced into Maven Central now -->
+        <id>webjars</id>
+        <url>https://dl.bintray.com/webjars/maven</url>
+    </repository>
+</repositories>
+
+<dependencyManagement>
+    <dependencies>
+        <dependency>
+            <!-- Limitation: A bom file to fix webjars' transitive dependencies -->
+            <groupId>com.vaadin</groupId>
+            <artifactId>vaadin-webjars-bom</artifactId>
+            <type>pom</type>
+            <scope>import</scope>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+</dependencyManagement>
+
+<dependencies>
+    <!-- other dependencies -->
+
+    <!-- the dependency with webjars -->
+    <dependency>
+        <groupId>com.vaadin</groupId>
+        <artifactId>flow-components</artifactId>
+        <version>${flow.version}</version>
+    </dependency>
+
+    <!-- other dependencies -->
+</dependncies>
 ----
 
-[TIP]
-To enable compilation to ES5 (for browsers that lack of ES6 support, such as
-  IE11), you need extra configuration, which is described at
-  <<../web-components/tutorial-webcomponents-es5#,Serving ES5 Web Components to older browsers with Polymer 2>>
+== Runtime configuration
+
+Extra parameters can be specified to configure `flow`:
+
+* disable.webjars - if set to `true`, webjars would be ignored during request resolving,
+allows `flow` to use external source of web components' files.
+[NOTE]
+Webjars are enabled for development mode and disabled for production mode by default,
+unless explicitly overridden by parameter specified.
+In future, webjars should be expected to be enabled always.
+
+Next group of parameters are paths to external web component's locations in development and production modes.
+
+Development mode:
+
+* frontend.url.dev (default value is context://frontend) – a location `flow` searches web components' files in development mode.
+Supports changes reload on a working application and should be set as a directory, containing `bower.json` file.
+By default, `flow` looks for files in `frontend` directory,
+located in https://docs.jboss.org/jbossas/guides/webguide/r2/en/html/ch06.html[context root] of the application
+
+Production mode:
+
+* frontend.url.es5 (default value is context://frontend-es5) - a location `flow` searches web components' files in production mode
+when the request is coming from older browsers, not supporting http://es6-features.org/[es6], default web components' development language version.
+* frontend.url.es6 (default value is context://frontend-es6) - a location `flow` searches web components' files in production mode for requests from modern browsers
 
 == bower.json configuration
 
-In your `bower.json` file, which is located at `${frontend.working.directory}`
-(see <<../web-components/tutorial-webcomponent-basic#,Basic Integration of a Polymer Web Component>> for details), you
+Currently `bower.json` is needed for production mode and in cases wne you'd like to be able
+to manipulate web component's files before adding them to the application (transpile, minify, check, bundle etc)
+
+In your `bower.json` file, which is located at `${frontend.working.directory}`, you
 need to add the webcomponent dependencies to each desired webcomponent. Here is
 an example that adds all supported elements:
 
@@ -49,12 +125,12 @@ an example that adds all supported elements:
 {
   // [...] other properties
   "dependencies": {
-    "polymer": "~2.0.2",
-    "vaadin-text-field": "~1.1.0-alpha2",
-    "vaadin-button": "~1.0.0",
-    "vaadin-checkbox": "~1.0.0-alpha1",
-    "vaadin-combo-box": "~2.0.0",
-    "vaadin-form-layout": "~1.0.0"
+    "polymer": "2.0.2",
+    "vaadin-text-field": "1.1.0-alpha2",
+    "vaadin-button": "1.0.0",
+    "vaadin-checkbox": "1.0.0-alpha1",
+    "vaadin-combo-box": "2.0.0",
+    "vaadin-form-layout": "1.0.0"
   }
 }
 ----
@@ -66,6 +142,15 @@ You only need to add the webcomponents you are going to use in your project.
 There's no harm to add webcomponents that you are not going to use at the
 server-side, except that the final `war` size will be larger for no reason.
 
+[TIP]
+To enable compilation to ES5 (for browsers that lack of ES6 support, such as
+  IE11), you need extra configuration, which is described at
+  <<../web-components/tutorial-webcomponents-es5#,Serving ES5 Web Components to older browsers with Polymer 2>>
+
+[NOTE]
+How to integrate java and web components' files is explained in
+<<../web-components/tutorial-webcomponent-basic#,Basic Integration of a Polymer Web Component>>.
+
 == Demo and code samples
 
 The Flow components demo at http://flow.app.fi contains examples of
diff --git a/flow-server/src/main/java/com/vaadin/server/Constants.java b/flow-server/src/main/java/com/vaadin/server/Constants.java
index d3d51c4a52f..ac1f9e6daf6 100644
--- a/flow-server/src/main/java/com/vaadin/server/Constants.java
+++ b/flow-server/src/main/java/com/vaadin/server/Constants.java
@@ -92,7 +92,7 @@ public final class Constants implements Serializable {
      * Configuration name for the parameter that determines if Flow should use
      * webJars or not.
      */
-    public static final String DISABLE_WEBJARS = "disable.webjar";
+    public static final String DISABLE_WEBJARS = "disable.webjars";
 
     private Constants() {
         // prevent instantiation constants class only