diff options
Diffstat (limited to 'server/ivy.xml')
| -rw-r--r-- | server/ivy.xml | 57 |
1 files changed, 19 insertions, 38 deletions
diff --git a/server/ivy.xml b/server/ivy.xml index c384829a16..05af3528c0 100644 --- a/server/ivy.xml +++ b/server/ivy.xml @@ -8,87 +8,68 @@ revision="${vaadin.version}" /> <configurations> - <conf name="build" /> - <conf name="build-provided" /> <conf name="ide" visibility="private" /> - <conf name="test" visibility="private" /> </configurations> - <publications> - <artifact type="jar" ext="jar" /> - <artifact type="source" ext="jar" m:classifier="sources" /> - <artifact type="javadoc" ext="jar" m:classifier="javadoc" /> - <artifact type="pom" ext="pom" /> - </publications> + <dependencies> <!-- API DEPENDENCIES --> <!-- Liferay Portal Service --> <dependency org="com.liferay.portal" name="portal-service" - rev="6.0.2" conf="build-provided,ide -> default" /> + rev="6.0.2" conf="ide -> default" /> <!--Servlet API version 3.0 --> <dependency org="javax.servlet" name="javax.servlet-api" - rev="3.0.1" conf="build-provided,ide,test -> default" /> + rev="3.0.1" conf="ide -> default" /> <!--Portlet API version 2.0 (JSR-286) --> <dependency org="javax.portlet" name="portlet-api" - rev="2.0" conf="build-provided,ide,test -> default" /> + rev="2.0" conf="ide -> default" /> <!-- Google App Engine --> <dependency org="com.google.appengine" name="appengine-api-1.0-sdk" - rev="1.7.7" conf="build-provided,ide,test -> default" /> + rev="1.7.7" conf="ide -> default" /> <!-- Bean Validation API --> <dependency org="javax.validation" name="validation-api" - rev="1.0.0.GA" conf="build-provided,ide,test -> default" /> + rev="1.0.0.GA" conf="ide -> default" /> <!-- Sass compiler --> <dependency org="com.vaadin" name="vaadin-sass-compiler" - rev="${vaadin.sass.version}" conf="build,ide,test->default"> - <exclude type="pom" conf="test" /> - </dependency> - - <!-- LIBRARY DEPENDENCIES (compile time) --> - <!-- Project modules --> - <dependency org="com.vaadin" name="vaadin-shared" - rev="${vaadin.version}" conf="build,test->default"> - <exclude type="pom" conf="test" /> - </dependency> - <dependency org="com.vaadin" name="vaadin-push" rev="${vaadin.version}" - conf="build-provided,test->compile"> - <exclude type="pom" conf="test" /> + rev="${vaadin.sass.version}" conf="ide ->default"> + <exclude type="pom" conf="ide" /> </dependency> <!-- Jsoup for BootstrapHandler --> <dependency org="org.jsoup" name="jsoup" rev="1.8.3" - conf="build,ide,test -> default" /> + conf="ide -> default" /> <!-- TESTING DEPENDENCIES --> <!-- Test frameworks & related --> <dependency org="junit" name="junit" rev="4.11" - conf="test,ide -> default" /> + conf="ide -> default" /> <dependency org="org.mockito" name="mockito-all" rev="1.9.5" - conf="test,ide->default" /> + conf="ide ->default" /> <dependency org="org.hamcrest" name="hamcrest-all" rev="1.3" - conf="test,ide->default" /> + conf="ide ->default" /> <dependency org="org.easymock" name="easymock" rev="3.0" - conf="test,ide-> default" transitive="true" /> + conf="ide -> default" transitive="true" /> <dependency org="org.hsqldb" name="hsqldb" rev="2.2.6" - conf="test,ide -> default" /> + conf="ide -> default" /> <dependency org="commons-io" name="commons-io" rev="${commons-io.version}" - conf="test->default" /> + conf="ide->default" /> <dependency org="commons-lang" name="commons-lang" - rev="2.6" conf="test,ide->default" /> + rev="2.6" conf="ide ->default" /> <!-- Bean Validation implementation --> <dependency org="org.slf4j" name="slf4j-log4j12" rev="1.6.1" - conf="test -> default" /> + conf="ide -> default" /> <dependency org="org.hibernate" name="hibernate-validator" - rev="4.2.0.Final" conf="test -> default" /> + rev="4.2.0.Final" conf="ide -> default" /> <!-- For manual testing with PostgreSQL (see SQLTestConstants) --> <!-- <dependency org="postgresql" name="postgresql" rev="9.1-901.jdbc3" - conf="test,ide->default" /> --> + conf="ide" /> --> <!-- remove cssparser override once sass-compiler is updated --> <override org="net.sourceforge.cssparser" module="cssparser" |