From 5a8f373e53f804b1e49d40bf74040fc69381b985 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Thu, 16 Oct 2014 11:28:12 +0300
Subject: Update GWT to 2.7.0.beta1vaadin1.

Update client-compiler-deps to 1.2.0.
Fix classpaths for devmodes.

Change-Id: I8452271594b4563bf476420ff7ab22985913e397
---
 client-compiler/ivy.xml                               | 8 +++++++-
 client-compiler/src/com/vaadin/tools/CvalChecker.java | 7 ++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

(limited to 'client-compiler')

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 {
 
-- 
cgit v1.2.3