summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2013-06-13 15:18:36 +0300
committerVaadin Code Review <review@vaadin.com>2013-06-13 15:42:45 +0000
commitf2b2ce967d4835afeadc38af346609e16261f4fb (patch)
tree2efec99c19c7ee26d9b13626852983f41271dcda
parent53e3a25840acd79b51475137cd9615d52b5684cd (diff)
downloadvaadin-framework-f2b2ce967d4835afeadc38af346609e16261f4fb.tar.gz
vaadin-framework-f2b2ce967d4835afeadc38af346609e16261f4fb.zip
Updated to Smartsprites 0.2.10 (#12069)
Change-Id: Ice1ef6a6ac837f0ef07b65de1bd46c3a4427780c
-rw-r--r--ivysettings.xml13
-rw-r--r--theme-compiler/ivy.xml2
2 files changed, 1 insertions, 14 deletions
diff --git a/ivysettings.xml b/ivysettings.xml
index 6c230b9fd8..3db0a8a06d 100644
--- a/ivysettings.xml
+++ b/ivysettings.xml
@@ -15,16 +15,6 @@
<artifact
pattern="${user.home}/.m2/repository/[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]" />
</filesystem>
- <dual name="custom-smartsprites">
- <url name="smartsprites-ivy">
- <ivy
- pattern="http://vaadin.com/download/external/[module]-ivy-[revision].xml" />
- </url>
- <url name="smartsprites-artifact">
- <artifact
- pattern="http://vaadin.com/download/external/[artifact](-[revision]).[ext]" />
- </url>
- </dual>
<filesystem name="build-temp">
<ivy
pattern="${ivy.settings.dir}/result/artifacts/[revision]/[module]/ivy-[revision].xml" />
@@ -33,9 +23,6 @@
</filesystem>
</resolvers>
<modules>
- <!-- Custom SmartSprites until 0.2.10 is released -->
- <module organisation="com.carrotsearch" name="smartsprites"
- revision="0.2.10-vaadin" resolver="custom-smartsprites" />
<module organisation="com.vaadin" name="vaadin-buildhelpers"
resolver="build-temp" />
<module organisation="com.vaadin" name="vaadin-shared"
diff --git a/theme-compiler/ivy.xml b/theme-compiler/ivy.xml
index 97ecfa4416..6a7528ceeb 100644
--- a/theme-compiler/ivy.xml
+++ b/theme-compiler/ivy.xml
@@ -45,7 +45,7 @@
<!-- Internally used, for now -->
<dependency org="com.carrotsearch" name="smartsprites"
- rev="0.2.10-vaadin" />
+ rev="0.2.10" />
<!-- Use the same commons-io as the rest of the project -->
<override org="commons-io" module="commons-io" rev="2.2" />
</dependencies>