diff options
| -rw-r--r-- | all/ivy.xml | 2 | ||||
| -rw-r--r-- | common.xml | 2 | ||||
| -rw-r--r-- | ivysettings.xml | 2 | ||||
| -rw-r--r-- | themes/build.xml (renamed from themes-compiled/build.xml) | 2 | ||||
| -rw-r--r-- | themes/ivy.xml (renamed from themes-compiled/ivy.xml) | 2 | ||||
| -rw-r--r-- | uitest/ivy.xml | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/all/ivy.xml b/all/ivy.xml index 4450eb168f..aebba5ba35 100644 --- a/all/ivy.xml +++ b/all/ivy.xml @@ -27,7 +27,7 @@ rev="${vaadin.version}"/> <dependency org="com.vaadin" name="vaadin-theme-compiler" rev="${vaadin.version}"/> - <dependency org="com.vaadin" name="vaadin-themes-compiled" + <dependency org="com.vaadin" name="vaadin-themes" rev="${vaadin.version}"/> <dependency org="com.vaadin" name="vaadin-client-compiled" rev="${vaadin.version}"/> diff --git a/common.xml b/common.xml index 2d64fb88e5..a854ef4358 100644 --- a/common.xml +++ b/common.xml @@ -8,7 +8,7 @@ <dirname property="vaadin.basedir" file="${ant.file.common}" /> <property file="${vaadin.basedir}/build.properties" /> - <property name="modules.to.publish.to.maven" value="shared,server,client,client-compiler,client-compiled,theme-compiler,themes-compiled" /> + <property name="modules.to.publish.to.maven" value="shared,server,client,client-compiler,client-compiled,theme-compiler,themes" /> <property name="modules.to.publish.to.download" value="${modules.to.publish.to.maven},all" /> <ivy:settings file="${vaadin.basedir}/ivysettings.xml" /> diff --git a/ivysettings.xml b/ivysettings.xml index 487fc921df..e1e2e45b3d 100644 --- a/ivysettings.xml +++ b/ivysettings.xml @@ -49,7 +49,7 @@ resolver="build-temp" /> <module organisation="com.vaadin" name="vaadin-theme-compiler" resolver="build-temp" /> - <module organisation="com.vaadin" name="vaadin-themes-compiled" + <module organisation="com.vaadin" name="vaadin-themes" resolver="build-temp" /> </modules> diff --git a/themes-compiled/build.xml b/themes/build.xml index b5e27c882f..d3a657cd18 100644 --- a/themes-compiled/build.xml +++ b/themes/build.xml @@ -10,7 +10,7 @@ <include file="../gwt-files.xml" as="gwtfiles" /> <!-- global properties --> - <property name="module.name" value="vaadin-themes-compiled" /> + <property name="module.name" value="vaadin-themes" /> <property name="result.dir" value="result" /> <property name="theme.result.dir" value="${result.dir}/VAADIN/themes" /> diff --git a/themes-compiled/ivy.xml b/themes/ivy.xml index ce5260c598..2f39771a95 100644 --- a/themes-compiled/ivy.xml +++ b/themes/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-themes-compiled" + <info organisation="com.vaadin" module="vaadin-themes" revision="${vaadin.version}" /> <configurations> diff --git a/uitest/ivy.xml b/uitest/ivy.xml index 2a9bc6b2ef..00a5dce703 100644 --- a/uitest/ivy.xml +++ b/uitest/ivy.xml @@ -38,7 +38,7 @@ rev="${vaadin.version}" conf="build->build"></dependency> <dependency org="com.vaadin" name="vaadin-client-compiled" rev="${vaadin.version}" conf="build->build"></dependency> - <dependency org="com.vaadin" name="vaadin-themes-compiled" + <dependency org="com.vaadin" name="vaadin-themes" rev="${vaadin.version}" conf="build->build"></dependency> <!-- For compiling TestingWidgetSet --> |