summaryrefslogtreecommitdiffstats
path: root/push
diff options
context:
space:
mode:
authorHenri Sara <hesara@vaadin.com>2016-04-02 14:34:05 +0300
committerHenri Sara <hesara@vaadin.com>2016-04-02 14:44:21 +0300
commitc2afd4339ae1c8158171da93744abc2c27e2cbf4 (patch)
tree07f616efefffd549ed64a9b907dd5d359479700a /push
parent009efc50ec48ad97f991ba1e65424c05c6b3b1fb (diff)
downloadvaadin-framework-c2afd4339ae1c8158171da93744abc2c27e2cbf4.tar.gz
vaadin-framework-c2afd4339ae1c8158171da93744abc2c27e2cbf4.zip
Remove most Ivy files
Consolidate Ivy dependencies for Eclipse and ide.xml in one location and remove redundant ivy.xml files. This also fixes some theme and resource paths in ide.xml but does not fully fix test theme compilation. Change-Id: If44c73d7f85d02ebef379aa306e6e284fe7446c1
Diffstat (limited to 'push')
-rw-r--r--push/ivy.xml33
1 files changed, 0 insertions, 33 deletions
diff --git a/push/ivy.xml b/push/ivy.xml
deleted file mode 100644
index 8bd9bc3d80..0000000000
--- a/push/ivy.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE ivy-module [
-<!-- Keep the version number in sync with build.xml -->
- <!ENTITY atmosphere.runtime.version "2.2.7.vaadin1">
-
- <!ENTITY atmosphere.js.version "2.2.13.vaadin3">
-]>
-<ivy-module version="2.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd"
- xmlns:m="http://ant.apache.org/ivy/maven">
-
- <info organisation="com.vaadin" module="vaadin-push" revision="${vaadin.version}" />
-
- <configurations>
- <conf name="ide" visibility="private" />
- </configurations>
-
- <dependencies>
- <!-- API DEPENDENCIES -->
-
- <!-- @WebListener is used for JSR356 websockets so we need to compile with servlet 3 API -->
- <dependency org="javax.servlet" name="javax.servlet-api"
- rev="3.0.1" conf="ide -> default" />
-
- <!-- Atmosphere -->
- <dependency org="com.vaadin.external.atmosphere"
- name="atmosphere-runtime" rev="&atmosphere.runtime.version;"
- conf="ide -> default" />
- <dependency org="com.vaadin.external.atmosphere.client"
- name="jquery" rev="&atmosphere.js.version;" conf="ide -> default" />
- </dependencies>
-</ivy-module> \ No newline at end of file