diff options
| author | Artur Signell <artur@vaadin.com> | 2012-08-29 14:43:31 +0300 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2012-09-09 11:22:59 +0300 |
| commit | 856e26aa2191d72974b1cd140229b4fa6e79bc61 (patch) | |
| tree | b1c0f6f40b9eeb6d300c86e83c1edaa0eb08c91b /client | |
| parent | 30feb6d844b81e537ed741a9a7862e926f793cdf (diff) | |
| download | vaadin-framework-856e26aa2191d72974b1cd140229b4fa6e79bc61.tar.gz vaadin-framework-856e26aa2191d72974b1cd140229b4fa6e79bc61.zip | |
Fixed scopes for generated Maven pom.xml files (#9299)
Diffstat (limited to 'client')
| -rw-r--r-- | client/build.xml | 6 | ||||
| -rw-r--r-- | client/ivy.xml | 16 |
2 files changed, 15 insertions, 7 deletions
diff --git a/client/build.xml b/client/build.xml index 99dbb268d5..09c22ab36e 100644 --- a/client/build.xml +++ b/client/build.xml @@ -13,7 +13,11 @@ <property name="result.dir" value="result" /> <path id="classpath.compile.custom"> - <fileset file="${gwt.user.jar}"/> + <!-- Could possibly compile GWT files also here to verify that + a) the same dependencies are used and + b) all dependencies have been declared + --> + <fileset file="${gwt.user.jar}" /> </path> <target name="jar"> diff --git a/client/ivy.xml b/client/ivy.xml index 953ca51a61..1e2bc41bd4 100644 --- a/client/ivy.xml +++ b/client/ivy.xml @@ -13,15 +13,19 @@ <publications> <artifact></artifact> </publications> - <dependencies> + <dependencies defaultconf="build" defaultconfmapping="build,ide->master"> + <!-- API DEPENDENCIES --> + + <!-- LIBRARY DEPENDENCIES (compile time) --> + <!-- Project modules --> <dependency org="com.vaadin" name="vaadin-shared" - rev="${vaadin.version}" conf="build"></dependency> + rev="${vaadin.version}" conf="build->build"></dependency> <dependency org="com.vaadin" name="vaadin-server" - rev="${vaadin.version}" conf="build"></dependency> + rev="${vaadin.version}" conf="build->build"></dependency> - <!-- gwt-dev dependencies --> - <dependency org="net.sourceforge.cssparser" name="cssparser" - rev="0.9.5" /> + <!-- gwt-user dependencies --> + <dependency org="org.w3c.css" name="sac" rev="1.3" + conf="build" /> </dependencies> |