diff options
| author | Artur Signell <artur@vaadin.com> | 2013-10-11 16:28:32 +0300 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2013-10-14 17:18:51 +0000 |
| commit | c29ca5ea626b7d2a219bf32bcd0c1b4bf5258018 (patch) | |
| tree | ef394fe86e61b3c903d0f78baa771a262ba4c77f /push/ivy.xml | |
| parent | 25fc2f2f1af0b6bf52053f0ca6d11d31c5e7453a (diff) | |
| download | vaadin-framework-c29ca5ea626b7d2a219bf32bcd0c1b4bf5258018.tar.gz vaadin-framework-c29ca5ea626b7d2a219bf32bcd0c1b4bf5258018.zip | |
Update to atmosphere javascript 2.0.3-vaadin1 (#12241, #12127)
Build vaadinPush.js from the released version instead of having a separate
javascript version in the project
Change-Id: I37aac284216c8ec6efd03c242e639e88854f11fd
Diffstat (limited to 'push/ivy.xml')
| -rw-r--r-- | push/ivy.xml | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/push/ivy.xml b/push/ivy.xml index 5a2a24fb1f..1f76224190 100644 --- a/push/ivy.xml +++ b/push/ivy.xml @@ -1,4 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE ivy-module [ +<!-- Keep the version numbers 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" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd" @@ -11,6 +16,8 @@ <conf name="build-provided" /> <conf name="ide" visibility="private" /> <conf name="test" visibility="private" /> + <!-- Used for building push.js only --> + <conf name="push.js" visibility="private" /> </configurations> <publications> <artifact type="jar" ext="jar" /> @@ -26,10 +33,11 @@ rev="2.4" conf="build-provided,ide,test -> default" /> <!-- Atmosphere --> - <!-- Keep the version number in sync with build.xml and other locations listed in that file --> - <dependency org="com.vaadin.external.atmosphere" name="atmosphere-runtime" - rev="1.0.14.vaadin4" conf="build,ide,test -> default"> - </dependency> + <dependency org="com.vaadin.external.atmosphere" + name="atmosphere-runtime" rev="&atmosphere.runtime.version;" + conf="build,ide,test -> default" /> + <dependency org="com.vaadin.external.atmosphere.client" + name="jquery" rev="&atmosphere.js.version;" conf="push.js -> default" /> </dependencies> </ivy-module> |