summaryrefslogtreecommitdiffstats
path: root/build/ivy
diff options
context:
space:
mode:
authorHenri Sara <hesara@vaadin.com>2012-06-14 16:56:10 +0300
committerHenri Sara <hesara@vaadin.com>2012-06-14 16:56:10 +0300
commit96b23eef54ab56b88ee9d8dd8e6f15a414c7ba11 (patch)
tree05c78d5c8198ac23f348923ae9ca4c4bd77838ae /build/ivy
parentadcf03c1b5f05b38cda25819b732745c1a4859fc (diff)
downloadvaadin-framework-96b23eef54ab56b88ee9d8dd8e6f15a414c7ba11.tar.gz
vaadin-framework-96b23eef54ab56b88ee9d8dd8e6f15a414c7ba11.zip
Integrate GWT build with Vaadin - first step.
Build vaadin.jar that contains the contents of gwt-user.jar, gwt-dev.jar and gwt-codeserver.jar in addition to Vaadin itself. The property gwt.root must be defined and point to a GWT trunk branch check-out. The tools branch should be checked out in a directory next to it.
Diffstat (limited to 'build/ivy')
-rw-r--r--build/ivy/ivy.xml5
1 files changed, 1 insertions, 4 deletions
diff --git a/build/ivy/ivy.xml b/build/ivy/ivy.xml
index ffcf7b19c8..6b569d1248 100644
--- a/build/ivy/ivy.xml
+++ b/build/ivy/ivy.xml
@@ -19,11 +19,8 @@
<!-- Google App Engine -->
<dependency org="com.google.appengine" name="appengine-api-1.0-sdk" rev="1.2.1" />
- <!-- GWT user with dependencies (validation-api) -->
- <dependency org="com.google.gwt" name="gwt-user" rev="2.4.0" conf="cs.compile->master" />
+ <!-- GWT dependencies (validation-api) -->
<dependency org="javax.validation" name="validation-api" rev="1.0.0.GA" conf="cs.compile->master,sources" />
- <!-- GWT dev (incl. servlet-api 2.4 classes) -->
- <dependency org="com.google.gwt" name="gwt-dev" rev="2.4.0" conf="cs.compile->master" />
<!-- Test frameworks & related -->
<dependency org="junit" name="junit" rev="4.5" conf="ss.test.compile -> master"/>