diff options
Diffstat (limited to 'uitest')
| -rw-r--r-- | uitest/build.xml | 10 | ||||
| -rw-r--r-- | uitest/ivy.xml | 19 |
2 files changed, 15 insertions, 14 deletions
diff --git a/uitest/build.xml b/uitest/build.xml index 6b8a6934c3..8a5fe71b35 100644 --- a/uitest/build.xml +++ b/uitest/build.xml @@ -17,8 +17,8 @@ <target name="dependencies"> <!-- This is copied from common.xml to be able to add server.tests.source to the source path --> - <ivy:resolve resolveid="common" conf="build, build-provided" /> - <ivy:cachepath pathid="classpath.compile.dependencies" conf="build, build-provided" /> + <ivy:resolve resolveid="common" conf="build" /> + <ivy:cachepath pathid="classpath.compile.dependencies" conf="build" /> </target> <target name="compile" description="Compiles the module" depends="dependencies"> @@ -55,10 +55,14 @@ <property name="WebContent.dir" location="${vaadin.basedir}/WebContent" /> <property name="deps.dir" location="${result.dir}/deps" /> + <ivy:resolve resolveid="common" conf="build" /> + <ivy:cachepath pathid="classpath.runtime.dependencies" conf="build" /> + <delete dir="${deps.dir}" /> <mkdir dir="${deps.dir}" /> + <copy todir="${deps.dir}" flatten="true"> - <path refid="classpath.compile.dependencies" /> + <path refid="classpath.runtime.dependencies" /> </copy> <war destfile="${result.war}" duplicate="fail" index="true"> diff --git a/uitest/ivy.xml b/uitest/ivy.xml index 2e4829b721..583e09c76b 100644 --- a/uitest/ivy.xml +++ b/uitest/ivy.xml @@ -8,8 +8,7 @@ <configurations> <conf name="build" /> - <conf name="build-provided" /> - <conf name="ide" /> + <conf name="ide" visibility="private" /> </configurations> <publications> <artifact type="war" /> @@ -17,28 +16,26 @@ <dependencies defaultconf="build" defaultconfmapping="build,ide->default"> <!-- API DEPENDENCIES --> <dependency org="javax.portlet" name="portlet-api" - rev="2.0" conf="build-provided,ide -> default" /> + rev="2.0" conf="ide -> default" /> <dependency org="javax.validation" name="validation-api" - rev="1.0.0.GA" conf="build-provided,ide -> default" /> + rev="1.0.0.GA" conf="ide -> default" /> <!--Servlet API version 2.5 --> <dependency org="javax.servlet" name="servlet-api" - rev="2.5" conf="build-provided,ide -> default" /> + rev="2.5" conf="ide -> default" /> <!-- Google App Engine --> <dependency org="com.google.appengine" name="appengine-api-1.0-sdk" - rev="1.2.1" conf="build-provided,ide -> default" /> + rev="1.2.1" conf="ide -> default" /> <!-- LIBRARY DEPENDENCIES (compile time) --> <!-- Project modules --> <dependency org="com.vaadin" name="vaadin-server" rev="${vaadin.version}" conf="build->build"></dependency> - <dependency org="com.vaadin" name="vaadin-client" + <dependency org="com.vaadin" name="vaadin-client-compiled" rev="${vaadin.version}" conf="build->build"></dependency> -<!-- <dependency org="com.vaadin" name="vaadin-client-compiled" + <dependency org="com.vaadin" name="vaadin-themes-compiled" rev="${vaadin.version}" conf="build->build"></dependency> - <dependency org="com.vaadin" name="vaadin-theme-compiled" - rev="${vaadin.version}" conf="build->build"></dependency> ---> + <dependency org="org.mortbay.jetty" name="jetty" rev="6.1.11" conf="build,ide->default" /> <dependency org="org.mortbay.jetty" name="jetty-util" |