From fb63a60cc40133a0062dd77b9694d80b1b39155c Mon Sep 17 00:00:00 2001
From: Teemu Suo-Anttila <teemusa@vaadin.com>
Date: Mon, 2 May 2016 14:30:42 +0300
Subject: Use gwt-user and gwt-dev dependencies in client and compiler

This removes GWT dependency from the server and shared parts of the
framework

Change-Id: Iafbb752c0184611a18d4a9d61c9e03229d42836e
---
 client-compiler/pom.xml | 63 +------------------------------------------------
 1 file changed, 1 insertion(+), 62 deletions(-)

(limited to 'client-compiler')

diff --git a/client-compiler/pom.xml b/client-compiler/pom.xml
index ef6f5cbeb4..33a3423b3f 100644
--- a/client-compiler/pom.xml
+++ b/client-compiler/pom.xml
@@ -68,21 +68,6 @@
 			<artifactId>ant-launcher</artifactId>
 			<version>1.6.5</version>
 		</dependency>
-		<dependency>
-			<groupId>org.ow2.asm</groupId>
-			<artifactId>asm</artifactId>
-			<version>5.0.3</version>
-		</dependency>
-		<dependency>
-			<groupId>org.ow2.asm</groupId>
-			<artifactId>asm-util</artifactId>
-			<version>5.0.3</version>
-		</dependency>
-		<dependency>
-			<groupId>org.ow2.asm</groupId>
-			<artifactId>asm-commons</artifactId>
-			<version>5.0.3</version>
-		</dependency>
 		<dependency>
 			<groupId>org.eclipse.jetty</groupId>
 			<artifactId>jetty-annotations</artifactId>
@@ -185,7 +170,6 @@
 			<groupId>com.vaadin.external.gwt</groupId>
 			<artifactId>gwt-dev</artifactId>
 			<version>${vaadin.gwt.version}</version>
-			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>junit</groupId>
@@ -204,51 +188,6 @@
 		</resources>
 
 		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>unpack-dependencies</id>
-						<phase>generate-resources</phase>
-						<goals>
-							<goal>unpack</goal>
-						</goals>
-						<configuration>
-							<artifactItems>
-								<artifactItem>
-									<groupId>com.vaadin.external.gwt</groupId>
-									<artifactId>gwt-dev</artifactId>
-									<includes>
-										about_files/**,
-										com/google/gwt/core/**,
-										com/google/gwt/dev/**,
-										com/google/gwt/lang/**,
-										com/google/gwt/soyc/**,
-										com/google/gwt/thirdparty/json/**,
-										com/google/gwt/thirdparty/guava/**,
-										com/google/gwt/util/**,
-										license/LICENSE.sax.txt,
-										netscape/**,
-										org/apache/COPYING,
-										org/apache/jasper/**,
-										org/apache/commons/el/**,
-										org/apache/commons/lang3/**,
-										templates/*,
-										about.html,
-										jetty-dir.css,
-										plugin.properties
-									</includes>
-									<excludes>
-										com/google/gwt/dev/protobuf/**,
-										com/google/gwt/dev/About.properties
-									</excludes>
-								</artifactItem>
-							</artifactItems>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-checkstyle-plugin</artifactId>
@@ -291,7 +230,7 @@
 				<configuration>
 					<instructions>
 						<Bundle-RequiredExecutionEnvironment>JavaSE-1.6</Bundle-RequiredExecutionEnvironment>
-						<Export-Package>com.vaadin.*;version="${project.version}",com.google.gwt.*;version="${project.version}"</Export-Package>
+						<Export-Package>com.vaadin.*;version="${project.version}"</Export-Package>
 						<!--TODO decide gwt packages version number<Export-Package>com.vaadin.*;version="${project.version}",com.google.gwt.*;version="${vaadin.gwt.version}"</Export-Package> -->
 						<Import-Package></Import-Package> <!--todo find out what should be in Import-Package -->
 					</instructions>
-- 
cgit v1.2.3