diff options
| author | Teemu Suo-Anttila <teemusa@vaadin.com> | 2014-11-14 11:26:22 +0200 |
|---|---|---|
| committer | Teemu Suo-Anttila <teemusa@vaadin.com> | 2014-11-14 11:27:32 +0200 |
| commit | d1cd6ffce4a3107f869f9d9256ca105d718f3e46 (patch) | |
| tree | 08789066be9deb5162ad83ff3b766ea2d4c4812d /client-compiler | |
| parent | 1ac8b6bff007d997bf2cfc69954e69d8fa65e119 (diff) | |
| parent | ee6f9483f36eeeecf32730016d02fb22e5cbaab3 (diff) | |
| download | vaadin-framework-d1cd6ffce4a3107f869f9d9256ca105d718f3e46.tar.gz vaadin-framework-d1cd6ffce4a3107f869f9d9256ca105d718f3e46.zip | |
Merge remote-tracking branch 'origin/master' into grid
Change-Id: Iec61d9242be530edbb76ba952746ba0f9c9bd966
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 { |