From 646cbaecbb5ef0e1cbefc7570e0340d926b7c85a Mon Sep 17 00:00:00 2001
From: Teemu Suo-Anttila <teemusa@vaadin.com>
Date: Fri, 18 Mar 2016 14:50:25 +0200
Subject: Use correct unpack goal in shared, rename push

Change-Id: Ib01fec5ebcefd429bf94badaa069cf486bb8156d
---
 push/pom.xml   |  2 +-
 shared/pom.xml | 21 +++++++++++++++++++--
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/push/pom.xml b/push/pom.xml
index 3b3325a803..bfabb430de 100644
--- a/push/pom.xml
+++ b/push/pom.xml
@@ -8,7 +8,7 @@
         <version>7.7.0-SNAPSHOT</version>
     </parent>
     <artifactId>vaadin-push</artifactId>
-    <name>Vaadin Push</name>
+    <name>vaadin-push</name>
     <packaging>jar</packaging>
     <properties>
 
diff --git a/shared/pom.xml b/shared/pom.xml
index d76ab9ea77..cff92bf4a5 100644
--- a/shared/pom.xml
+++ b/shared/pom.xml
@@ -47,6 +47,12 @@
 			<version>${vaadin.gwt.version}</version>
 			<scope>provided</scope>
 		</dependency>
+		<dependency>
+			<groupId>com.vaadin.external.gwt</groupId>
+			<artifactId>gwt-user</artifactId>
+			<version>${vaadin.gwt.version}</version>
+			<scope>provided</scope>
+		</dependency>
 
 		<dependency>
 			<groupId>junit</groupId>
@@ -82,20 +88,31 @@
 						<id>unpack-dependencies</id>
 						<phase>prepare-package</phase>
 						<goals>
-							<goal>unpack-dependencies</goal>
+							<goal>unpack</goal>
 						</goals>
 						<configuration>
 							<artifactItems>
 								<artifactItem>
 									<groupId>com.vaadin.external.gwt</groupId>
 									<artifactId>gwt-elemental</artifactId>
+									<includes>
+										elemental/json/**,
+										elemental/util/Array*,
+										elemental/util/Can*,
+										elemental/util/Map*
+									</includes>
 								</artifactItem>
 								<artifactItem>
 									<groupId>com.vaadin.external.gwt</groupId>
 									<artifactId>gwt-user</artifactId>
+									<includes>
+										com/google/gwt/*/shared/**,
+										com/google/gwt/*/*/shared/**,
+										com/google/web/bindery/*/shared/**,
+										com/google/gwt/user/client/rpc/IsSerializable.*
+									</includes>
 								</artifactItem>
 							</artifactItems>
-							<includes>elemental/json/**,elemental/util/Array*,elemental/util/Can*,elemental/util/Map*,com/google/gwt/*/shared/**,com/google/gwt/*/*/shared/**,com/google/web/bindery/*/shared/**,com/google/gwt/user/client/rpc/IsSerializable.*</includes>
 							<outputDirectory>${project.build.directory}/classes</outputDirectory>
 							<overWriteReleases>false</overWriteReleases>
 							<overWriteSnapshots>true</overWriteSnapshots>
-- 
cgit v1.2.3