diff options
| -rw-r--r-- | all/build.xml | 4 | ||||
| -rw-r--r-- | all/ivy.xml | 2 | ||||
| -rw-r--r-- | common.xml | 2 | ||||
| -rw-r--r-- | server/ivy.xml | 10 |
4 files changed, 9 insertions, 9 deletions
diff --git a/all/build.xml b/all/build.xml index 4e0b2293a9..d5b9b5fd83 100644 --- a/all/build.xml +++ b/all/build.xml @@ -8,10 +8,10 @@ <include file="../build.xml" as="vaadin" /> <!-- global properties --> - <property name="module.name" value="vaadin" /> + <property name="module.name" value="vaadin-all" /> <property name="result.dir" value="result" /> <property name="temp.dir" location="${result.dir}/temp" /> - <property name="zip.file" location="${result.dir}/lib/vaadin-${vaadin.version}.zip" /> + <property name="zip.file" location="${result.dir}/lib/${module.name}-${vaadin.version}.zip" /> <target name="fetch.module.and.dependencies"> <fail unless="module" message="No 'module' parameter given" /> diff --git a/all/ivy.xml b/all/ivy.xml index 93ca988d45..4450eb168f 100644 --- a/all/ivy.xml +++ b/all/ivy.xml @@ -4,7 +4,7 @@ xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd" xmlns:m="http://ant.apache.org/ivy/maven"> - <info organisation="com.vaadin" module="vaadin" revision="${vaadin.version}" /> + <info organisation="com.vaadin" module="vaadin-all" revision="${vaadin.version}" /> <configurations> <conf name="build" /> diff --git a/common.xml b/common.xml index 1bfe2736af..96a2a701b2 100644 --- a/common.xml +++ b/common.xml @@ -4,7 +4,7 @@ <dirname property="vaadin.basedir" file="${ant.file.common}" /> <property file="${vaadin.basedir}/build.properties" /> - <property name="modules.to.publish" value="shared,server,client,client-compiler,client-compiled,theme-compiler,themes-compiled" /> + <property name="modules.to.publish" value="shared,server,client,client-compiler,client-compiled,theme-compiler,themes-compiled, all" /> <ivy:resolve file="${vaadin.basedir}/build/ivy/ivy.xml" conf="taskdefs" /> <ivy:cachepath pathid="taskdefs.classpath" conf="taskdefs" /> diff --git a/server/ivy.xml b/server/ivy.xml index 99e5ae7811..acc384ea30 100644 --- a/server/ivy.xml +++ b/server/ivy.xml @@ -14,11 +14,11 @@ <conf name="tests" 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> + <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 --> |