diff options
| author | Artur Signell <artur@vaadin.com> | 2015-01-14 21:02:13 +0200 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2015-01-15 10:37:50 +0000 |
| commit | c6bad1a51871b2bb282540c0626c98272efefbb1 (patch) | |
| tree | ae1472203bdc463225d7966baf2a8cbf668eccdd /widgets | |
| parent | d444a90ffacd016f9c61141abe5d97774fafd838 (diff) | |
| download | vaadin-framework-c6bad1a51871b2bb282540c0626c98272efefbb1.tar.gz vaadin-framework-c6bad1a51871b2bb282540c0626c98272efefbb1.zip | |
Make widgets dependencies provided (#16217)
Change-Id: I9b887a25203760ac99efd51f5042ef6ededac23a
Diffstat (limited to 'widgets')
| -rw-r--r-- | widgets/build.xml | 7 | ||||
| -rw-r--r-- | widgets/ivy.xml | 8 |
2 files changed, 6 insertions, 9 deletions
diff --git a/widgets/build.xml b/widgets/build.xml index 1a93f79631..5d012f4615 100644 --- a/widgets/build.xml +++ b/widgets/build.xml @@ -33,11 +33,8 @@ <target name="copysrc" depends="dependencies"> <delete dir="${result.deps}" /> - <ivy:resolve transitive="false" type="jar" conf="build" /> + <ivy:resolve transitive="false" type="jar" conf="build-provided" /> <ivy:cachepath pathid="vaadin.jars" /> - <ivy:resolve transitive="false" type="jar" - conf="build-provided" /> - <ivy:cachepath pathid="compile.deps" /> <unjar dest="${result.deps}"> <path refid="vaadin.jars" /> </unjar> @@ -92,7 +89,7 @@ includeantruntime="false"> <src path="${result.src}" /> <classpath refid="classpath.compile.custom" /> - <classpath refid="compile.deps" /> + <classpath refid="vaadin.jars" /> </javac> </target> diff --git a/widgets/ivy.xml b/widgets/ivy.xml index d7c29631f4..68aefe22b0 100644 --- a/widgets/ivy.xml +++ b/widgets/ivy.xml @@ -25,19 +25,19 @@ <!-- LIBRARY DEPENDENCIES (compile time) --> <!-- Project modules --> <dependency org="com.vaadin" name="vaadin-shared" - rev="${vaadin.version}" conf="build,test->build"> + rev="${vaadin.version}" conf="build-provided,test->build"> <exclude type="pom" conf="test" /> </dependency> <dependency org="com.vaadin" name="vaadin-client" - rev="${vaadin.version}" conf="build,test->build"> + rev="${vaadin.version}" conf="build-provided,test->build"> <exclude type="pom" conf="test" /> </dependency> <dependency org="com.vaadin" name="vaadin-client-compiler" - rev="${vaadin.version}" conf="build,test->build"> + rev="${vaadin.version}" conf="build-provided,test->build"> <exclude type="pom" conf="test" /> </dependency> <dependency org="com.vaadin" name="vaadin-themes" - rev="${vaadin.version}" conf="build,test->build"> + rev="${vaadin.version}" conf="build-provided,test->build"> <exclude type="pom" conf="test" /> </dependency> <dependency org="com.vaadin" name="vaadin-sass-compiler" |