diff options
| author | Sauli Tähkäpää <sauli@vaadin.com> | 2014-04-14 11:54:22 +0300 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2014-04-14 12:07:50 +0000 |
| commit | 8314e3c82cd35d13a0eeb381b681b4b03ba8a0eb (patch) | |
| tree | 221141ac7cd6ec676e9cf6bd69c80d66851d0862 /push/build.xml | |
| parent | 487963914e6ff7ab8def7af809ef2db4b79faa55 (diff) | |
| download | vaadin-framework-8314e3c82cd35d13a0eeb381b681b4b03ba8a0eb.tar.gz vaadin-framework-8314e3c82cd35d13a0eeb381b681b4b03ba8a0eb.zip | |
Downgrade Atmosphere client jQuery 2.0.3 -> 1.11.0. (#13374)
Change-Id: I5103be114ed5c45a533b89b4c973bb5c91d47a8b
Diffstat (limited to 'push/build.xml')
| -rw-r--r-- | push/build.xml | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/push/build.xml b/push/build.xml index c307ee621d..dfc8d03156 100644 --- a/push/build.xml +++ b/push/build.xml @@ -17,7 +17,7 @@ <!-- Keep the version number in sync with ivy.xml, server/src/com/vaadin/server/Constants.java --> <property name="atmosphere.runtime.version" value="2.1.2.vaadin2" /> - <property name="jquery.version" value="2.0.3" /> + <property name="jquery.js" location="lib/jquery/jquery-1.11.0.js" /> <path id="classpath.compile.custom" /> @@ -42,11 +42,10 @@ <unzip src="${temp.dir}/jquery.war" dest="${jquery.unpack}"> <patternset> <include name="**/jquery.atmosphere.js" /> - <include name="**/jquery-${jquery.version}.js" /> </patternset> <mapper type="flatten" /> </unzip> - <loadfile srcfile="${jquery.unpack}/jquery-${jquery.version}.js" property="jquery.js.contents" /> + <loadfile srcfile="${jquery.js}" property="jquery.js.contents" /> <loadfile srcfile="${jquery.unpack}/jquery.atmosphere.js" property="jquery.atmosphere.js.contents" /> <loadfile srcfile="${vaadin.basedir}/WebContent/VAADIN/vaadinPush.js.tpl" property="vaadinPush.js.contents"> |