diff options
| author | Teemu Suo-Anttila <teemusa@vaadin.com> | 2016-05-02 14:30:42 +0300 |
|---|---|---|
| committer | Teemu Suo-Anttila <teemusa@vaadin.com> | 2016-06-01 10:59:24 +0300 |
| commit | fb63a60cc40133a0062dd77b9694d80b1b39155c (patch) | |
| tree | 594dcba2dba8c732860fd6dd436a9ae93a658755 /server | |
| parent | 68784363dca98529286420206b22a9a8881c70dc (diff) | |
| download | vaadin-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 'server')
| -rw-r--r-- | server/pom.xml | 41 |
1 files changed, 1 insertions, 40 deletions
diff --git a/server/pom.xml b/server/pom.xml index 6ea5ab87fc..fcd11f3a47 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -147,49 +147,10 @@ <!-- For manual testing with PostgreSQL (see SQLTestConstants) --> <!-- <dependency><groupId>postgresql</groupId><artifactId>postgresql</artifactId><version>9.1-901.jdbc3</version></dependency> --> - - <!-- Needed GWT dependencies. Required parts are packaged to jar --> - <dependency> - <groupId>com.vaadin.external.gwt</groupId> - <artifactId>gwt-user</artifactId> - <version>${vaadin.gwt.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.vaadin.external.gwt</groupId> - <artifactId>gwt-elemental</artifactId> - <version>${vaadin.gwt.version}</version> - <scope>provided</scope> - </dependency> </dependencies> <build> <plugins> - <!-- Copy needed GWT dependencies to package --> - <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-user</artifactId> - </artifactItem> - </artifactItems> - <includes>com/google/gwt/*/server/**</includes> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> <artifactId>maven-resources-plugin</artifactId> <executions> @@ -260,7 +221,7 @@ <configuration> <instructions> <Bundle-RequiredExecutionEnvironment>JavaSE-1.6</Bundle-RequiredExecutionEnvironment> - <Export-Package>com.vaadin.*;version="${project.version}",com.google.*;version="${project.version}"</Export-Package> + <Export-Package>com.vaadin.*;version="${project.version}"</Export-Package> <Import-Package>javax.servlet;version="${javax.servlet.version}", javax.servlet.http;version="${javax.servlet.version}", javax.validation;version="${javax.validation.version}";resolution:=optional, |