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 /common.xml | |
| 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 'common.xml')
| -rw-r--r-- | common.xml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/common.xml b/common.xml index 7eef3f1b00..2e9341c423 100644 --- a/common.xml +++ b/common.xml @@ -21,9 +21,9 @@ <fail unless="result.dir" message="No result.dir parameter given" /> <property name="ivy.xml" location="${result.dir}/../ivy.xml" /> <property name="pom.xml" location="${result.dir}/pom.xml" /> - <ivy:makepom templatefile="${vaadin.basedir}/pom-template.xml" ivyfile="${ivy.xml}" pomfile="${pom.xml}" conf="compile, runtime"> - <mapping conf="compile" scope="compile" /> - <mapping conf="runtime" scope="runtime" /> + <ivy:makepom templatefile="${vaadin.basedir}/pom-template.xml" ivyfile="${ivy.xml}" pomfile="${pom.xml}" conf="build, build-provided"> + <mapping conf="build" scope="compile" /> + <mapping conf="build-provided" scope="provided" /> </ivy:makepom> </target> @@ -134,8 +134,8 @@ </target> <target name="dependencies" description="Resolves dependencies needed by this module"> - <ivy:resolve resolveid="common" conf="build" /> - <ivy:cachepath pathid="classpath.compile.dependencies" conf="build" /> + <ivy:resolve resolveid="common" conf="build, build-provided" /> + <ivy:cachepath pathid="classpath.compile.dependencies" conf="build, build-provided" /> </target> <target name="clean"> |