diff options
| author | Artur Signell <artur@vaadin.com> | 2014-10-16 11:28:12 +0300 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2014-10-31 07:34:00 +0000 |
| commit | 5a8f373e53f804b1e49d40bf74040fc69381b985 (patch) | |
| tree | 409732a8fec5008994d03768606c1a112deabe30 /client-compiler | |
| parent | 54ed43adad5b853dfffdc48aebbc74087e34b735 (diff) | |
| download | vaadin-framework-5a8f373e53f804b1e49d40bf74040fc69381b985.tar.gz vaadin-framework-5a8f373e53f804b1e49d40bf74040fc69381b985.zip | |
Update GWT to 2.7.0.beta1vaadin1.
Update client-compiler-deps to 1.2.0.
Fix classpaths for devmodes.
Change-Id: I8452271594b4563bf476420ff7ab22985913e397
Diffstat (limited to 'client-compiler')
| -rw-r--r-- | client-compiler/ivy.xml | 8 | ||||
| -rw-r--r-- | client-compiler/src/com/vaadin/tools/CvalChecker.java | 7 |
2 files changed, 11 insertions, 4 deletions
diff --git a/client-compiler/ivy.xml b/client-compiler/ivy.xml index 0b87069f2c..af60b76e22 100644 --- a/client-compiler/ivy.xml +++ b/client-compiler/ivy.xml @@ -44,6 +44,12 @@ conf="build,ide -> default" /> <dependency org="ant" name="ant-launcher" rev="1.6.5" conf="build,ide -> default" /> + <dependency org="org.ow2.asm" name="asm" + rev="5.0.3" conf="build-> default" /> + <dependency org="org.ow2.asm" name="asm-util" + rev="5.0.3" conf="build-> default" /> + <dependency org="org.ow2.asm" name="asm-commons" + rev="5.0.3" conf="build-> default" /> <dependency org="org.eclipse.jetty" name="jetty-annotations" rev="8.1.12.v20130726" conf="build,ide -> default"> @@ -88,7 +94,7 @@ conf="build,ide -> default" /> <dependency org="com.vaadin" name="vaadin-client-compiler-deps" - rev="1.1.0" conf="build,ide -> default" /> + rev="1.2.0" conf="build,ide -> default" /> </dependencies> diff --git a/client-compiler/src/com/vaadin/tools/CvalChecker.java b/client-compiler/src/com/vaadin/tools/CvalChecker.java index 53cbce798e..b3345c7658 100644 --- a/client-compiler/src/com/vaadin/tools/CvalChecker.java +++ b/client-compiler/src/com/vaadin/tools/CvalChecker.java @@ -32,10 +32,11 @@ import java.util.Locale; import java.util.ResourceBundle; import java.util.prefs.Preferences; +import org.apache.commons.io.IOUtils; + import elemental.json.JsonException; import elemental.json.JsonObject; import elemental.json.impl.JsonUtil; -import org.apache.commons.io.IOUtils; /** * This class is able to validate the vaadin CVAL license. @@ -54,8 +55,8 @@ public final class CvalChecker { * It is not in a separate f le, so as it is easier to copy into any product * which does not depend on vaadin core. * - * We are using org.json in order not to use additional dependency like - * auto-beans, gson, etc. + * We are using elemental.json in order not to use additional dependency + * like auto-beans, gson, etc. */ public static class CvalInfo { |