diff options
Diffstat (limited to 'server')
| -rw-r--r-- | server/build.xml | 7 | ||||
| -rw-r--r-- | server/ivy.xml | 6 |
2 files changed, 6 insertions, 7 deletions
diff --git a/server/build.xml b/server/build.xml index 1d3f8a5938..2763d5ff10 100644 --- a/server/build.xml +++ b/server/build.xml @@ -16,13 +16,14 @@ <union id="jar.includes"> <union refid="server.gwt.includes" /> - <fileset dir="${vaadin.basedir}"> - <include name="WebContent/VAADIN/vaadinBootstrap.js" /> + <fileset dir="${vaadin.basedir}/WebContent"> + <include name="VAADIN/vaadinBootstrap.js" /> </fileset> </union> <target name="jar"> <antcall target="common.jar"> + <param name="conf" value="build" /> <reference torefid="extra.jar.includes" refid="jar.includes" /> </antcall> </target> @@ -36,7 +37,7 @@ </target> <target name="tests"> - <antcall target="common.tests.run"/> + <antcall target="common.tests.run" /> </target> diff --git a/server/ivy.xml b/server/ivy.xml index 10f06700e5..e6f3d60de6 100644 --- a/server/ivy.xml +++ b/server/ivy.xml @@ -9,8 +9,8 @@ <configurations> <conf name="build" /> <conf name="build-provided" /> - <conf name="ide" /> - <conf name="tests" /> + <conf name="ide" visibility="private"/> + <conf name="tests" visibility="private"/> </configurations> <publications> <artifact></artifact> @@ -39,8 +39,6 @@ <!-- Project modules --> <dependency org="com.vaadin" name="vaadin-shared" rev="${vaadin.version}" conf="build,tests" /> - <dependency org="com.vaadin" name="vaadin-buildhelpers" - rev="${vaadin.version}" conf="build,tests" /> <!-- Jsoup for BootstrapHandler --> <dependency org="org.jsoup" name="jsoup" rev="1.6.3" |