mirrors
/
vaadin-framework
mirror of https://github.com/vaadin/framework.git
Watch 1
Star 0
Fork 0
Code Issues 0 Releases 329 Wiki Activity
Browse Source

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: I66755e8fb058eca924a6551a38ca588de8bf0996
feature/standard-gwt
Teemu Suo-Anttila 8 years ago
parent
08bdb4829a
commit
22ff6d0f9e
5 changed files with 25 additions and 204 deletions
Split View Show Diff Stats
  1. 1
    61
      client-compiler/pom.xml
  2. 1
    72
      client/pom.xml
  3. 1
    40
      server/pom.xml
  4. 7
    30
      shared/pom.xml
  5. 15
    1
      uitest/pom.xml

+ 1
- 61
client-compiler/pom.xml View File

@@ -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>
@@ -205,50 +189,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/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 +231,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>

+ 1
- 72
client/pom.xml View File

@@ -36,28 +36,6 @@
</exclusions>
</dependency>

<!-- gwt-user dependencies -->
<dependency>
<groupId>org.w3c.css</groupId>
<artifactId>sac</artifactId>
<version>1.3</version>
</dependency>

<!-- Bean Validation API -->
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
<version>${javax.validation.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
<version>${javax.validation.version}</version>
<classifier>sources</classifier>
</dependency>

<!-- Testing dependencies -->
<dependency>
<groupId>junit</groupId>
@@ -74,64 +52,15 @@
</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>
<excludes>
META-INF/**,
**/*.gwtar,
com/google/gwt/*/server/**,
com/google/gwt/*/shared/**,
com/google/gwt/*/*/shared/**,
com/google/web/bindery/*/shared/**,
com/google/gwt/user/client/rpc/IsSerializable.*,
com/google/gwt/thirdparty/streamhtmlparser/**,
org/w3c/**,
javax/servlet/**
</excludes>
</artifactItem>
<artifactItem>
<groupId>com.vaadin.external.gwt</groupId>
<artifactId>gwt-elemental</artifactId>
<excludes>META-INF/**</excludes>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>


<plugin>
<artifactId>maven-resources-plugin</artifactId>
<executions>
@@ -167,7 +96,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></Import-Package>
</instructions>
</configuration>

+ 1
- 40
server/pom.xml View File

@@ -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,

+ 7
- 30
shared/pom.xml View File

@@ -20,36 +20,22 @@
<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>
<!-- <dependency>
<groupId>com.vaadin.external.gwt</groupId>
<artifactId>gwt-servlet</artifactId>
<version>${vaadin.gwt.version}</version>
</dependency> -->
<dependency>
<groupId>com.vaadin.external.google</groupId>
<artifactId>guava</artifactId>
<version>${guava.version}</version>
</dependency>

<!-- Needed GWT dependencies. Required parts are packaged to jar -->
<dependency>
<groupId>com.vaadin.external.gwt</groupId>
<artifactId>gwt-elemental</artifactId>
<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>
@@ -98,21 +84,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>
@@ -149,7 +126,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}",

+ 15
- 1
uitest/pom.xml View File

@@ -67,6 +67,7 @@
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-client</artifactId>
@@ -78,6 +79,19 @@
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>com.vaadin.external.gwt</groupId>
<artifactId>gwt-elemental</artifactId>
<version>${vaadin.gwt.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.vaadin.external.gwt</groupId>
<artifactId>gwt-servlet</artifactId>
<version>${vaadin.gwt.version}</version>
</dependency>

<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-client-compiled</artifactId>
@@ -227,7 +241,7 @@
<groupId>com.vaadin</groupId>
<artifactId>vaadin-testbench</artifactId>
<version>4.0.3</version>
<scope>test</scope>
<scope>test</scope>
</dependency>
<!-- This should be removed once tests have been updated to use lang3 -->
<dependency>

Write Preview
Loading…
Cancel
Save