From fb63a60cc40133a0062dd77b9694d80b1b39155c Mon Sep 17 00:00:00 2001 From: Teemu Suo-Anttila Date: Mon, 2 May 2016 14:30:42 +0300 Subject: [PATCH] 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 --- all/pom.xml | 9 +-- all/src/main/templates/release-notes.html | 28 +++++++++ client-compiler/pom.xml | 63 +------------------ client/pom.xml | 73 +---------------------- server/pom.xml | 41 +------------ shared/pom.xml | 32 +--------- uitest/pom.xml | 14 +++++ 7 files changed, 48 insertions(+), 212 deletions(-) diff --git a/all/pom.xml b/all/pom.xml index 5d29cd73cb6..7742b54f7d9 100644 --- a/all/pom.xml +++ b/all/pom.xml @@ -126,18 +126,11 @@ - - - - + - - - - diff --git a/all/src/main/templates/release-notes.html b/all/src/main/templates/release-notes.html index 8c2a7d653ee..9d942d31345 100644 --- a/all/src/main/templates/release-notes.html +++ b/all/src/main/templates/release-notes.html @@ -48,6 +48,7 @@

Release Notes for Vaadin Framework
  • Incompatible or Behavior-altering Changes in @version-minor@
  • Known Issues and Limitations
    • +
  • GWT Dependency Changes
  • Vaadin Installation
  • Package Contents
  • Migrating from Vaadin 6
    • @@ -115,6 +116,7 @@

    Incompatible or Behavior-altering Changes in @version-mino
  • The return type of BootstrapHandler.getWidgetsetForUI() has changed.
  • Vaadin shared no longer depends on a custom build of Guava. Any project that depends on Guava as a transitive dependency should use standard Guava.
  • Valo theme field error styles now apply to NativeSelect, ListSelect and TwinColSelect as well.
    • +
  • The way we handle GWT dependencies has been completely changed. See this section for more details

    • Known Issues and Limitations

    + +

    GWT Dependency Changes

    + +

    + The GWT dependencies for Vaadin are now provided as actual dependencies + and not bundled with Vaadin packages. This means that you can override + the GWT version in your own project if you want to. Note that the GWT Elemental + is still partially bundled with shared package to avoid having the gwt-user as a + dependency everywhere. +

    + + +

    Vaadin Installation

    diff --git a/client-compiler/pom.xml b/client-compiler/pom.xml index ef6f5cbeb40..33a3423b3f3 100644 --- a/client-compiler/pom.xml +++ b/client-compiler/pom.xml @@ -68,21 +68,6 @@ ant-launcher 1.6.5 - - org.ow2.asm - asm - 5.0.3 - - - org.ow2.asm - asm-util - 5.0.3 - - - org.ow2.asm - asm-commons - 5.0.3 - org.eclipse.jetty jetty-annotations @@ -185,7 +170,6 @@ com.vaadin.external.gwt gwt-dev ${vaadin.gwt.version} - provided junit @@ -204,51 +188,6 @@ - - org.apache.maven.plugins - maven-dependency-plugin - - - unpack-dependencies - generate-resources - - unpack - - - - - com.vaadin.external.gwt - gwt-dev - - 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 - - - com/google/gwt/dev/protobuf/**, - com/google/gwt/dev/About.properties - - - - - - - org.apache.maven.plugins maven-checkstyle-plugin @@ -291,7 +230,7 @@ JavaSE-1.6 - com.vaadin.*;version="${project.version}",com.google.gwt.*;version="${project.version}" + com.vaadin.*;version="${project.version}" diff --git a/client/pom.xml b/client/pom.xml index 8a80b3ddbb5..87a6e93d532 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -36,28 +36,6 @@ - - - org.w3c.css - sac - 1.3 - - - - - javax.validation - validation-api - ${javax.validation.version} - provided - - - - javax.validation - validation-api - ${javax.validation.version} - sources - - junit @@ -74,64 +52,15 @@ - - com.vaadin.external.gwt - gwt-user - ${vaadin.gwt.version} - provided - com.vaadin.external.gwt gwt-elemental ${vaadin.gwt.version} - provided - - - - org.apache.maven.plugins - maven-dependency-plugin - - - unpack-dependencies - generate-resources - - unpack - - - - - com.vaadin.external.gwt - gwt-user - - 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/** - - - - com.vaadin.external.gwt - gwt-elemental - META-INF/** - - - - - - - - maven-resources-plugin @@ -167,7 +96,7 @@ JavaSE-1.6 - com.vaadin.*;version="${project.version}",com.google.*;version="${project.version}" + com.vaadin.*;version="${project.version}" diff --git a/server/pom.xml b/server/pom.xml index 6ea5ab87fc2..fcd11f3a477 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -147,49 +147,10 @@ - - - - com.vaadin.external.gwt - gwt-user - ${vaadin.gwt.version} - provided - - - com.vaadin.external.gwt - gwt-elemental - ${vaadin.gwt.version} - provided - - - - org.apache.maven.plugins - maven-dependency-plugin - - - unpack-dependencies - generate-resources - - unpack - - - - - com.vaadin.external.gwt - gwt-user - - - com/google/gwt/*/server/** - - - - - - maven-resources-plugin @@ -260,7 +221,7 @@ JavaSE-1.6 - com.vaadin.*;version="${project.version}",com.google.*;version="${project.version}" + com.vaadin.*;version="${project.version}" javax.servlet;version="${javax.servlet.version}", javax.servlet.http;version="${javax.servlet.version}", javax.validation;version="${javax.validation.version}";resolution:=optional, diff --git a/shared/pom.xml b/shared/pom.xml index b94cfd7475f..f8bff03e6b5 100644 --- a/shared/pom.xml +++ b/shared/pom.xml @@ -20,19 +20,6 @@ Vaadin shared - - - com.vaadin.external.flute - flute - ${flute.version} - - - com.vaadin.external.streamhtmlparser - streamhtmlparser-jsilver - ${streamhtmlparser.version} - - - com.vaadin.external.gwt @@ -40,12 +27,6 @@ ${vaadin.gwt.version} provided - - com.vaadin.external.gwt - gwt-user - ${vaadin.gwt.version} - provided - junit @@ -94,21 +75,12 @@ elemental/util/Map* - - com.vaadin.external.gwt - gwt-user - - com/google/gwt/*/shared/**, - com/google/gwt/*/*/shared/**, - com/google/web/bindery/*/shared/**, - com/google/gwt/user/client/rpc/IsSerializable.* - - + maven-resources-plugin @@ -145,7 +117,7 @@ JavaSE-1.6 - com.vaadin.*;version="${project.version}",com.google.*;version="${project.version}",elemental.*;version="${project.version}" + com.vaadin.*;version="${project.version}",elemental.*;version="${project.version}" 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}", diff --git a/uitest/pom.xml b/uitest/pom.xml index fadca2f0282..866c45a2739 100644 --- a/uitest/pom.xml +++ b/uitest/pom.xml @@ -106,6 +106,7 @@ + com.vaadin vaadin-client @@ -117,6 +118,19 @@ + + + com.vaadin.external.gwt + gwt-elemental + ${vaadin.gwt.version} + provided + + + com.vaadin.external.gwt + gwt-servlet + ${vaadin.gwt.version} + + com.vaadin vaadin-client-compiled