summaryrefslogtreecommitdiffstats
path: root/shared
diff options
context:
space:
mode:
authorTeemu Suo-Anttila <teemusa@vaadin.com>2016-05-02 14:30:42 +0300
committerTeemu Suo-Anttila <teemusa@vaadin.com>2016-06-01 10:59:24 +0300
commitfb63a60cc40133a0062dd77b9694d80b1b39155c (patch)
tree594dcba2dba8c732860fd6dd436a9ae93a658755 /shared
parent68784363dca98529286420206b22a9a8881c70dc (diff)
downloadvaadin-framework-fb63a60cc40133a0062dd77b9694d80b1b39155c.tar.gz
vaadin-framework-fb63a60cc40133a0062dd77b9694d80b1b39155c.zip
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
Diffstat (limited to 'shared')
-rw-r--r--shared/pom.xml32
1 files changed, 2 insertions, 30 deletions
diff --git a/shared/pom.xml b/shared/pom.xml
index b94cfd7475..f8bff03e6b 100644
--- a/shared/pom.xml
+++ b/shared/pom.xml
@@ -20,19 +20,6 @@
<description>Vaadin shared</description>
<dependencies>
- <!-- Actual dependencies -->
- <dependency>
- <groupId>com.vaadin.external.flute</groupId>
- <artifactId>flute</artifactId>
- <version>${flute.version}</version>
- </dependency>
- <dependency>
- <groupId>com.vaadin.external.streamhtmlparser</groupId>
- <artifactId>streamhtmlparser-jsilver</artifactId>
- <version>${streamhtmlparser.version}</version>
- </dependency>
-
-
<!-- Needed GWT dependencies. Required parts are packaged to jar -->
<dependency>
<groupId>com.vaadin.external.gwt</groupId>
@@ -40,12 +27,6 @@
<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>
@@ -94,21 +75,12 @@
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>
</configuration>
</execution>
</executions>
</plugin>
+
<plugin>
<artifactId>maven-resources-plugin</artifactId>
@@ -145,7 +117,7 @@
<configuration>
<instructions>
<Bundle-RequiredExecutionEnvironment>JavaSE-1.6</Bundle-RequiredExecutionEnvironment>
- <Export-Package>com.vaadin.*;version="${project.version}",com.google.*;version="${project.version}",elemental.*;version="${project.version}"</Export-Package>
+ <Export-Package>com.vaadin.*;version="${project.version}",elemental.*;version="${project.version}"</Export-Package>
<Import-Package>com.google.gwt.thirdparty.streamhtmlparser;version="${streamhtmlparser.version}",
com.google.gwt.thirdparty.streamhtmlparser.impl;version="${streamhtmlparser.version}",
com.google.gwt.thirdparty.streamhtmlparser.util;version="${streamhtmlparser.version}",