summaryrefslogtreecommitdiffstats
path: root/push
diff options
context:
space:
mode:
Diffstat (limited to 'push')
-rw-r--r--push/build.xml9
-rw-r--r--push/ivy.xml3
2 files changed, 6 insertions, 6 deletions
diff --git a/push/build.xml b/push/build.xml
index 9e3c0c1414..fcf75b162c 100644
--- a/push/build.xml
+++ b/push/build.xml
@@ -17,8 +17,6 @@
<!-- Keep the version number in sync with ivy.xml, server/src/com/vaadin/server/Constants.java -->
<property name="atmosphere.runtime.version" value="1.0.14.vaadin4" />
- <!-- Keep the version number in sync with ivy.xml -->
- <property name="atmosphere.js.version" value="2.0.3-vaadin1" />
<property name="jquery.version" value="1.9.0" />
<path id="classpath.compile.custom" />
@@ -32,15 +30,16 @@
<target name="vaadinPush.js">
<mkdir dir="${result.dir}/js/VAADIN" />
- <ivy:resolve file="ivy.xml" conf="push.js" />
+ <ivy:resolve log="download-only" file="ivy.xml" conf="push.js" />
<ivy:cachepath pathid="atmosphere.jquery.deps" conf="push.js" />
- <copy todir="${temp.dir}" flatten="true">
+ <delete dir="${temp.dir}" />
+ <copy flatten="true" tofile="${temp.dir}/jquery.war">
<path refid="atmosphere.jquery.deps" />
</copy>
<!-- Unzip to temp dir -->
- <unzip src="${temp.dir}/jquery-${atmosphere.js.version}.war" dest="${jquery.unpack}">
+ <unzip src="${temp.dir}/jquery.war" dest="${jquery.unpack}">
<patternset>
<include name="**/jquery.atmosphere.js" />
<include name="**/jquery-${jquery.version}.js" />
diff --git a/push/ivy.xml b/push/ivy.xml
index 1f76224190..1f0f37a460 100644
--- a/push/ivy.xml
+++ b/push/ivy.xml
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE ivy-module [
-<!-- Keep the version numbers in sync with build.xml -->
+<!-- Keep the version number in sync with build.xml -->
<!ENTITY atmosphere.runtime.version "1.0.14.vaadin4">
+
<!ENTITY atmosphere.js.version "2.0.3-vaadin1">
]>
<ivy-module version="2.0"