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/src | |
| 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/src')
| -rw-r--r-- | client-compiler/src/com/vaadin/tools/CvalChecker.java | 7 |
1 files changed, 4 insertions, 3 deletions
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 { |