diff options
| author | Henrik Paul <henrik@vaadin.com> | 2013-12-12 11:13:24 +0200 |
|---|---|---|
| committer | Henrik Paul <henrik@vaadin.com> | 2013-12-12 11:13:47 +0200 |
| commit | 39064d707c9d839b08a296e809c649795850c21d (patch) | |
| tree | e10f5cbc4e79b6035e16b5ef8c2cd89a784428b0 /shared | |
| parent | eb75c09574249687d9ea3899791c8daa3fcec314 (diff) | |
| parent | 30f5934f275a7a095d6e314f942ff2a8eb1b265f (diff) | |
| download | vaadin-framework-39064d707c9d839b08a296e809c649795850c21d.tar.gz vaadin-framework-39064d707c9d839b08a296e809c649795850c21d.zip | |
Merge branch 'master' into grid-merge
Change-Id: I4a6ac4385b4edf85703ed7b6f463af9892479589
Diffstat (limited to 'shared')
| -rw-r--r-- | shared/build.xml | 5 | ||||
| -rw-r--r-- | shared/ivy.xml | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/shared/build.xml b/shared/build.xml index 73a0a8df7f..966d250d66 100644 --- a/shared/build.xml +++ b/shared/build.xml @@ -15,7 +15,7 @@ <property name="src.filtered" location="${result.dir}/filtered-src" /> <property name="src" location="${src.filtered}" /> <path id="classpath.compile.custom" /> - + <path id="classpath.test.custom" /> <target name="jar"> <property name="shared.osgi.import" value="org.json;version="0.0.20080701", com.google.gwt.thirdparty.guava.common.annotations;version="10.0.1.rebased", com.google.gwt.thirdparty.guava.common.base;version="10.0.1.rebased", com.google.gwt.thirdparty.guava.common.base.internal;version="10.0.1.rebased", com.google.gwt.thirdparty.guava.common.cache;version="10.0.1.rebased", com.google.gwt.thirdparty.guava.common.collect;version="10.0.1.rebased", com.google.gwt.thirdparty.guava.common.eventbus;version="10.0.1.rebased", com.google.gwt.thirdparty.guava.common.io;version="10.0.1.rebased", com.google.gwt.thirdparty.guava.common.net;version="10.0.1.rebased", com.google.gwt.thirdparty.guava.common.primitives;version="10.0.1.rebased", com.google.gwt.thirdparty.guava.common.util.concurrent;version="10.0.1.rebased", com.google.gwt.thirdparty.streamhtmlparser;version="0.1.5.r10-rebased", com.google.gwt.thirdparty.streamhtmlparser.impl;version="0.1.5.r10-rebased", com.google.gwt.thirdparty.streamhtmlparser.util;version="0.1.5.r10-rebased", org.w3c.flute.parser;version="1.3.0.gg2", org.w3c.flute.parser.selectors;version="1.3.0.gg2", org.w3c.flute.util;version="1.3.0.gg2"" /> @@ -57,8 +57,7 @@ </target> <target name="test" depends="checkstyle"> - <!--<antcall target="common.test.run" /> --> - <echo>WHAT? No tests for ${module.name}!</echo> + <antcall target="common.test.run" /> </target> </project> diff --git a/shared/ivy.xml b/shared/ivy.xml index fc54d680fa..169a52034d 100644 --- a/shared/ivy.xml +++ b/shared/ivy.xml @@ -22,6 +22,10 @@ <dependencies> <dependency org="com.vaadin" name="vaadin-shared-deps" rev="1.0.3" conf="build,ide,test->default" /> + + <dependency org="junit" name="junit" rev="4.11" + conf="test,ide -> default" /> + </dependencies> </ivy-module> |