Browse Source

Make widgets dependencies provided (#16217)

Change-Id: I9b887a25203760ac99efd51f5042ef6ededac23a
tags/7.4.0.beta3
Artur Signell 9 years ago
parent
commit
c6bad1a518
2 changed files with 6 additions and 9 deletions
  1. 2
    5
      widgets/build.xml
  2. 4
    4
      widgets/ivy.xml

+ 2
- 5
widgets/build.xml View File

@@ -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>


+ 4
- 4
widgets/ivy.xml View File

@@ -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"

Loading…
Cancel
Save