From 5a8f373e53f804b1e49d40bf74040fc69381b985 Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Thu, 16 Oct 2014 11:28:12 +0300 Subject: [PATCH] Update GWT to 2.7.0.beta1vaadin1. Update client-compiler-deps to 1.2.0. Fix classpaths for devmodes. Change-Id: I8452271594b4563bf476420ff7ab22985913e397 --- WebContent/license.html | 12 ++++++- WebContent/licenses/ow2-asm-license.txt | 31 +++++++++++++++++++ build.properties | 2 +- build/ide.xml | 3 +- client-compiler/ivy.xml | 8 ++++- .../src/com/vaadin/tools/CvalChecker.java | 7 +++-- client/src/com/vaadin/Vaadin.gwt.xml | 9 ++---- eclipse/Development Mode (vaadin).launch | 2 +- .../Super Development Mode (vaadin).launch | 2 +- 9 files changed, 60 insertions(+), 16 deletions(-) create mode 100644 WebContent/licenses/ow2-asm-license.txt diff --git a/WebContent/license.html b/WebContent/license.html index 0ce22da99c..48be15b98d 100644 --- a/WebContent/license.html +++ b/WebContent/license.html @@ -90,6 +90,16 @@ Apache License, Version 2.0 + + Closure Stylesheets + Apache License, Version 2.0 + + + + ASM + ASM Project License + + Guava @@ -99,7 +109,7 @@ JSON - The JSON License + Apache License, Version 2.0 diff --git a/WebContent/licenses/ow2-asm-license.txt b/WebContent/licenses/ow2-asm-license.txt new file mode 100644 index 0000000000..b8ed869a5c --- /dev/null +++ b/WebContent/licenses/ow2-asm-license.txt @@ -0,0 +1,31 @@ +http://asm.ow2.org/license.html + +Copyright (c) 2000-2011 INRIA, France Telecom +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + +3. Neither the name of the copyright holders nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF +THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file diff --git a/build.properties b/build.properties index a9ad640e53..9df1c8d767 100644 --- a/build.properties +++ b/build.properties @@ -6,5 +6,5 @@ vaadin.url=http://vaadin.com vaadin.java.version=1.6 vaadin.version=0.0.0.unversioned-development-build vaadin.sass.version=0.9.10 -gwt.version=2.6.0.vaadin5 +gwt.version=2.7.0.beta1vaadin1 commons-io.version=2.4 diff --git a/build/ide.xml b/build/ide.xml index fff4ba911d..7c5267ef30 100755 --- a/build/ide.xml +++ b/build/ide.xml @@ -29,10 +29,10 @@ - + @@ -163,6 +163,7 @@ + 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" /> + + + @@ -88,7 +94,7 @@ conf="build,ide -> default" /> + rev="1.2.0" conf="build,ide -> default" /> 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 { diff --git a/client/src/com/vaadin/Vaadin.gwt.xml b/client/src/com/vaadin/Vaadin.gwt.xml index aad0563975..5e8f08fe22 100644 --- a/client/src/com/vaadin/Vaadin.gwt.xml +++ b/client/src/com/vaadin/Vaadin.gwt.xml @@ -13,11 +13,7 @@ - - - - + @@ -58,10 +54,9 @@ - - + diff --git a/eclipse/Development Mode (vaadin).launch b/eclipse/Development Mode (vaadin).launch index 2b8ff23ce8..072b9a57c4 100644 --- a/eclipse/Development Mode (vaadin).launch +++ b/eclipse/Development Mode (vaadin).launch @@ -15,9 +15,9 @@ - + diff --git a/eclipse/Super Development Mode (vaadin).launch b/eclipse/Super Development Mode (vaadin).launch index ed243cba82..b57410bfd6 100644 --- a/eclipse/Super Development Mode (vaadin).launch +++ b/eclipse/Super Development Mode (vaadin).launch @@ -15,9 +15,9 @@ - + -- 2.39.5