Updated to Smartsprites 0.2.10 (#12069)

Change-Id: Ice1ef6a6ac837f0ef07b65de1bd46c3a4427780c

diff --git a/ivysettings.xml b/ivysettings.xml
index 6c230b9fd8ca1a5483f58305e1d3065b76c27c8f..3db0a8a06df910bccdf16c9f9b77116bb5658b8a 100644 (file)
--- 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 97ecfa441662d4b75d69d69a806d49efa57052a1..6a7528ceebbca3bf4dec9589e3e9e9ba9aa75b05 100644 (file)
--- 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>