Updated to custom build of Smartsprites 0.2.10 which includes a fix for SMARTSPRITES...

Change-Id: Ibf549acba14a8b884424a5e2c98f3a4aac5de84c

diff --git a/ivysettings.xml b/ivysettings.xml
index 288eae903671c4de88d1487324e3a1acf3a5bb72..88c38ff33ef0b872b1e63d9cbbba43e796eb8924 100644 (file)
--- a/ivysettings.xml
+++ b/ivysettings.xml
@@ -16,12 +16,12 @@
                 pattern="${user.home}/.m2/repository/[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]" />
         </filesystem>
         <dual name="custom-smartsprites">
-            <filesystem name="smartsprites-ivy">
-                <ivy pattern="${ivy.settings.dir}/theme-compiler/ivymodule/[module]-ivy-[revision].xml" />
-            </filesystem>
+            <url name="smartsprites-ivy">
+                <ivy pattern="http://vaadin.com/download/external/[module]-ivy-[revision].xml" />
+            </url>
             <url name="smartsprites-artifact">
                 <artifact
-                    pattern="http://dev.vaadin.com/svn/versions/6.8/build/smartsprites/lib/[artifact](-[revision]).[ext]" />
+                    pattern="http://vaadin.com/download/external/[artifact](-[revision]).[ext]" />
             </url>
         </dual>
         <filesystem name="build-temp">
@@ -32,9 +32,9 @@
         </filesystem>
     </resolvers>
     <modules>
-        <!-- IT Mill patched SmartSprites -->
+        <!-- Custom SmartSprites until 0.2.10 is released -->
         <module organisation="com.carrotsearch" name="smartsprites"
-            revision="0.2.3-itmill" resolver="custom-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 f0646c04e6758c6512e7a7931e130bbf5807db62..97ecfa441662d4b75d69d69a806d49efa57052a1 100644 (file)
--- a/theme-compiler/ivy.xml
+++ b/theme-compiler/ivy.xml
@@ -45,11 +45,9 @@
 
         <!-- Internally used, for now -->
         <dependency org="com.carrotsearch" name="smartsprites"
-            rev="0.2.3-itmill" />
-        <!-- Use 1.1.1 even though smartsprites indirectly depends on an
-            older version -->
-       <override org="commons-logging" module="commons-logging"
-            rev="1.1.1"/>
+            rev="0.2.10-vaadin" />
+        <!-- Use the same commons-io as the rest of the project -->
+        <override org="commons-io" module="commons-io" rev="2.2" />
     </dependencies>
 
 </ivy-module>

diff --git a/theme-compiler/ivymodule/smartsprites-ivy-0.2.3-itmill.xml b/theme-compiler/ivymodule/smartsprites-ivy-0.2.3-itmill.xml
deleted file mode 100644 (file)
index 29dc2d3..0000000
--- a/theme-compiler/ivymodule/smartsprites-ivy-0.2.3-itmill.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ivy-module version="2.0" xmlns:m="http://ant.apache.org/ivy/maven">
-    <info organisation="com.carrotsearch"
-        module="smartsprites"
-        revision="0.2.3-itmill"
-        status="release"
-        publication="20111130000000">
-        <license name="BSD license" url="http://csssprites.org/smartsprites.LICENSE" />
-        <description homepage="http://csssprites.org">
-        CSS Sprites Generator Done Right. SmartSprites maintains CSS sprites in your designs, 
-    fully automatically. No tedious copying and pasting to your CSS when adding or changing 
-    sprited images.
-        </description>
-        </info>
-    <configurations>
-        <conf name="default" visibility="public" description="runtime dependencies and master artifact can be used with this conf" extends="runtime,master"/>
-        <conf name="master" visibility="public" description="contains only the artifact published by this module itself, with no transitive dependencies"/>
-        <conf name="compile" visibility="public" description="this is the default scope, used if none is specified. Compile dependencies are available in all classpaths."/>
-        <conf name="provided" visibility="public" description="this is much like compile, but indicates you expect the JDK or a container to provide it. It is only available on the compilation classpath, and is not transitive."/>
-        <conf name="runtime" visibility="public" description="this scope indicates that the dependency is not required for compilation, but is for execution. It is in the runtime and test classpaths, but not the compile classpath." extends="compile"/>
-        <conf name="test" visibility="private" description="this scope indicates that the dependency is not required for normal use of the application, and is only available for the test compilation and execution phases." extends="runtime"/>
-        <conf name="system" visibility="public" description="this scope is similar to provided except that you have to provide the JAR which contains it explicitly. The artifact is always available and is not looked up in a repository."/>
-        <conf name="sources" visibility="public" description="this configuration contains the source artifact of this module, if any."/>
-        <conf name="javadoc" visibility="public" description="this configuration contains the javadoc artifact of this module, if any."/>
-        <conf name="optional" visibility="public" description="contains all optional dependencies"/>
-    </configurations>
-    <publications>
-        <artifact name="smartsprites" type="jar" ext="jar" conf="master"/>
-    </publications>
-    <dependencies>
-        <dependency org="com.google.collections" name="google-collections" rev="0.9" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
-        <dependency org="args4j" name="args4j" rev="2.0.9" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
-        <dependency org="commons-math" name="commons-math" rev="1.1" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
-        <dependency org="commons-io" name="commons-io" rev="2.2" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
-        <dependency org="commons-lang" name="commons-lang" rev="2.6" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
-        <dependency org="junit" name="junit" rev="4.4" force="true" conf="test->runtime(*),master(*)"/>
-    </dependencies>
-</ivy-module>