diff --git a/build-common-ivy.xml b/build-common-ivy.xml
index 01ab78eb65df..5a27338eb8dc 100644
--- a/build-common-ivy.xml
+++ b/build-common-ivy.xml
@@ -42,7 +42,6 @@
 							<ivy:resolve
 								file="@{ivy.xml.dir}/ivy.xml"
 								log="download-only"
-								transitive="false"
 							/>
 
 							<if>
@@ -57,12 +56,6 @@
 										pattern="@{ivy.xml.dir}/lib/[artifact].[ext]"
 										type="jar"
 									/>
-
-									<ivy:retrieve
-										log="download-only"
-										pattern="@{ivy.xml.dir}/lib/[artifact]-[type]s.[ext]"
-										type="source"
-									/>
 								</then>
 								<else>
 									<ivy:retrieve
@@ -70,12 +63,6 @@
 										pattern="@{ivy.xml.dir}/docroot/WEB-INF/lib/[artifact].[ext]"
 										type="jar"
 									/>
-
-									<ivy:retrieve
-										log="download-only"
-										pattern="@{ivy.xml.dir}/docroot/WEB-INF/lib/[artifact]-[type]s.[ext]"
-										type="source"
-									/>
 								</else>
 							</if>
 
diff --git a/hooks/antisamy-hook/ivy.xml b/hooks/antisamy-hook/ivy.xml
index 66ca9e11948c..610ec0d402e8 100644
--- a/hooks/antisamy-hook/ivy.xml
+++ b/hooks/antisamy-hook/ivy.xml
@@ -3,7 +3,7 @@
 <ivy-module version="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
 	<info module="antisamy-hook" organisation="com.liferay" />
 
-	<dependencies defaultconfmapping="default">
+	<dependencies>
 		<dependency name="antisamy" org="org.owasp.antisamy" rev="1.4.4" />
 		<dependency name="batik-css" org="org.apache.xmlgraphics" rev="1.7" />
 		<dependency name="batik-util" org="org.apache.xmlgraphics" rev="1.7" />
diff --git a/hooks/antisamy-hook/ivy.xml.MD5 b/hooks/antisamy-hook/ivy.xml.MD5
index 4811aac05853..dad4c3f35236 100644
--- a/hooks/antisamy-hook/ivy.xml.MD5
+++ b/hooks/antisamy-hook/ivy.xml.MD5
@@ -1 +1 @@
-263a8d58cf635a76e7aa5ab198a5ea48
+6ada72d7a5204b59a642f027836803ea
diff --git a/hooks/mongodb-hook/ivy.xml b/hooks/mongodb-hook/ivy.xml
index 16a390154572..2d14fd7cffad 100644
--- a/hooks/mongodb-hook/ivy.xml
+++ b/hooks/mongodb-hook/ivy.xml
@@ -3,7 +3,7 @@
 <ivy-module version="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
 	<info module="mongodb-hook" organisation="com.liferay" />
 
-	<dependencies defaultconfmapping="default">
+	<dependencies>
 		<dependency name="mongo-java-driver" org="org.mongodb" rev="2.1" />
 	</dependencies>
 </ivy-module>
\ No newline at end of file
diff --git a/hooks/mongodb-hook/ivy.xml.MD5 b/hooks/mongodb-hook/ivy.xml.MD5
index bd8af61a0a30..411889dd4e1e 100644
--- a/hooks/mongodb-hook/ivy.xml.MD5
+++ b/hooks/mongodb-hook/ivy.xml.MD5
@@ -1 +1 @@
-0add6eac997f7e4f5eddf41944a3c3ee
+7df89971ec39151b9aab6a176a026501
diff --git a/ivy-settings.xml b/ivy-settings.xml
index 4c099a756db5..802724b3af63 100644
--- a/ivy-settings.xml
+++ b/ivy-settings.xml
@@ -2,11 +2,11 @@
 	<settings defaultResolver="default" />
 
 	<resolvers>
-		<ibiblio m2compatible="true" name="jboss-nexus" root="https://repository.jboss.org/nexus/content/repositories/releases" />
-		<ibiblio m2compatible="true" name="jboss-thirdparty" root="https://repository.jboss.org/nexus/content/repositories/thirdparty-releases" />
-		<ibiblio m2compatible="true" name="maven2" root="http://repo1.maven.org/maven2" />
-		<ibiblio m2compatible="true" name="ow2-public" root="http://repository.ow2.org/nexus/content/repositories/public" />
-		<ibiblio m2compatible="true" name="primefaces" root="http://repository.primefaces.org" />
+		<ibiblio m2compatible="true" name="jboss-nexus" root="https://repository.jboss.org/nexus/content/repositories/releases" usepoms="false" />
+		<ibiblio m2compatible="true" name="jboss-thirdparty" root="https://repository.jboss.org/nexus/content/repositories/thirdparty-releases" usepoms="false" />
+		<ibiblio m2compatible="true" name="maven2" root="http://repo1.maven.org/maven2" usepoms="false" />
+		<ibiblio m2compatible="true" name="ow2-public" root="http://repository.ow2.org/nexus/content/repositories/public" usepoms="false" />
+		<ibiblio m2compatible="true" name="primefaces" root="http://repository.primefaces.org" usepoms="false" />
 
 		<chain name="default" dual="true">
 			<resolver ref="jboss-nexus" />
diff --git a/ivy.xml b/ivy.xml
index 87e50375d644..1d4348873863 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -3,13 +3,8 @@
 <ivy-module version="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
 	<info module="plugins" organisation="com.liferay" />
 
-	<configurations>
-		<conf name="default" />
-		<conf name="sources" />
-	</configurations>
-
-	<dependencies defaultconfmapping="default">
-		<dependency conf="default,sources" name="activation" org="javax.activation" rev="1.1" />
+	<dependencies>
+		<dependency name="activation" org="javax.activation" rev="1.1" />
 		<dependency name="antelopetasks" org="org.tigris.antelope" rev="3.2.10" />
 		<dependency name="ccpp" org="javax.ccpp" rev="1.0" />
 		<dependency name="ecj" org="org.eclipse.jdt.core.compiler" rev="3.7.2" />
diff --git a/ivy.xml.MD5 b/ivy.xml.MD5
index 4325b8e96784..4c527a0ae1c9 100644
--- a/ivy.xml.MD5
+++ b/ivy.xml.MD5
@@ -1 +1 @@
-b0c20ea2b2709123b1087fa20bbd82b7
+bec214d9e6dbe0f3c5445bc6ee2b08e0
diff --git a/portlets/ip-geocoder-portlet/ivy.xml b/portlets/ip-geocoder-portlet/ivy.xml
index 1f0ba675829a..0bc02a7ebefc 100644
--- a/portlets/ip-geocoder-portlet/ivy.xml
+++ b/portlets/ip-geocoder-portlet/ivy.xml
@@ -3,7 +3,7 @@
 <ivy-module version="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
 	<info module="ip-geocoder-portlet" organisation="com.liferay" />
 
-	<dependencies defaultconfmapping="default">
+	<dependencies>
 		<dependency name="geoip" org="org.kohsuke" rev="1.2.8" />
 	</dependencies>
 </ivy-module>
\ No newline at end of file
diff --git a/portlets/ip-geocoder-portlet/ivy.xml.MD5 b/portlets/ip-geocoder-portlet/ivy.xml.MD5
index 553097ceef25..053830b81b9e 100644
--- a/portlets/ip-geocoder-portlet/ivy.xml.MD5
+++ b/portlets/ip-geocoder-portlet/ivy.xml.MD5
@@ -1 +1 @@
-4caa03565f3025a00c7a1c9956f32725
+27b5acf359e78209b871eb64763a488b
diff --git a/portlets/modules-admin-portlet/ivy.xml b/portlets/modules-admin-portlet/ivy.xml
index b7398e635cbc..bda9297fde12 100644
--- a/portlets/modules-admin-portlet/ivy.xml
+++ b/portlets/modules-admin-portlet/ivy.xml
@@ -3,7 +3,7 @@
 <ivy-module version="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
 	<info module="modules-admin-portlet" organisation="com.liferay" />
 
-	<dependencies defaultconfmapping="default">
+	<dependencies>
 		<dependency name="org.osgi.compendium" org="org.osgi" rev="4.3.1" />
 		<dependency name="org.osgi.core" org="org.osgi" rev="4.3.1" />
 	</dependencies>
diff --git a/portlets/modules-admin-portlet/ivy.xml.MD5 b/portlets/modules-admin-portlet/ivy.xml.MD5
index c4e90d723c07..843aa9fb1c51 100644
--- a/portlets/modules-admin-portlet/ivy.xml.MD5
+++ b/portlets/modules-admin-portlet/ivy.xml.MD5
@@ -1 +1 @@
-3e0f520632459c4e433221018d5acc03
+468fcfb767c03f902fa7c56ed3696b43
diff --git a/portlets/ruby-console-portlet/ivy.xml b/portlets/ruby-console-portlet/ivy.xml
index d86306a96e2d..eac0f5d3bdd1 100644
--- a/portlets/ruby-console-portlet/ivy.xml
+++ b/portlets/ruby-console-portlet/ivy.xml
@@ -3,7 +3,7 @@
 <ivy-module version="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
 	<info module="ruby-console-portlet" organisation="com.liferay" />
 
-	<dependencies defaultconfmapping="default">
+	<dependencies>
 		<dependency name="jruby" org="org.jruby" rev="1.1" />
 	</dependencies>
 </ivy-module>
\ No newline at end of file
diff --git a/portlets/ruby-console-portlet/ivy.xml.MD5 b/portlets/ruby-console-portlet/ivy.xml.MD5
index 9d650a20bbd0..65ac46187902 100644
--- a/portlets/ruby-console-portlet/ivy.xml.MD5
+++ b/portlets/ruby-console-portlet/ivy.xml.MD5
@@ -1 +1 @@
-e9a31a619c601ae7cd8f80027f0dbe0b
+e04ccfcb0f0601b18ad242a361b0274d
diff --git a/portlets/sample-dao-portlet/ivy.xml b/portlets/sample-dao-portlet/ivy.xml
index 9084b80cfecb..bfa29b144dcc 100644
--- a/portlets/sample-dao-portlet/ivy.xml
+++ b/portlets/sample-dao-portlet/ivy.xml
@@ -3,7 +3,7 @@
 <ivy-module version="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
 	<info module="sample-dao-portlet" organisation="com.liferay" />
 
-	<dependencies defaultconfmapping="default">
+	<dependencies>
 		<dependency name="c3p0" org="c3p0" rev="0.9.0.4" />
 		<dependency name="mysql-connector-java" org="mysql" rev="5.0.7" />
 	</dependencies>
diff --git a/portlets/sample-dao-portlet/ivy.xml.MD5 b/portlets/sample-dao-portlet/ivy.xml.MD5
index 328ddb60eaa4..fdebd8091f4c 100644
--- a/portlets/sample-dao-portlet/ivy.xml.MD5
+++ b/portlets/sample-dao-portlet/ivy.xml.MD5
@@ -1 +1 @@
-f3b51a6f8fc48214184a94265ae27bab
+6c0316a2a9903b5e36c0ba15340df0e6
diff --git a/portlets/sample-groovy-portlet/ivy.xml b/portlets/sample-groovy-portlet/ivy.xml
index c0ca71b79946..c259fdfc489a 100644
--- a/portlets/sample-groovy-portlet/ivy.xml
+++ b/portlets/sample-groovy-portlet/ivy.xml
@@ -3,7 +3,7 @@
 <ivy-module version="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
 	<info module="sample-groovy-portlet" organisation="com.liferay" />
 
-	<dependencies defaultconfmapping="default">
+	<dependencies>
 		<dependency name="groovy-all" org="org.codehaus.groovy" rev="1.5.7" />
 	</dependencies>
 </ivy-module>
\ No newline at end of file
diff --git a/portlets/sample-groovy-portlet/ivy.xml.MD5 b/portlets/sample-groovy-portlet/ivy.xml.MD5
index f68ee1f02f41..8cf99a4c1187 100644
--- a/portlets/sample-groovy-portlet/ivy.xml.MD5
+++ b/portlets/sample-groovy-portlet/ivy.xml.MD5
@@ -1 +1 @@
-de83f260a31b2581d9fca48b0d61fe9b
+091d7d91f616f92e1475e76c8b0ff582
diff --git a/portlets/sample-python-portlet/ivy.xml b/portlets/sample-python-portlet/ivy.xml
index f806d751d4cf..d11e27ba9258 100644
--- a/portlets/sample-python-portlet/ivy.xml
+++ b/portlets/sample-python-portlet/ivy.xml
@@ -3,7 +3,7 @@
 <ivy-module version="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
 	<info module="sample-python-portlet" organisation="com.liferay" />
 
-	<dependencies defaultconfmapping="default">
+	<dependencies>
 		<dependency name="jython" org="org.python" rev="2.2.1" />
 	</dependencies>
 </ivy-module>
\ No newline at end of file
diff --git a/portlets/sample-python-portlet/ivy.xml.MD5 b/portlets/sample-python-portlet/ivy.xml.MD5
index beef7f8ede65..a199d0af161b 100644
--- a/portlets/sample-python-portlet/ivy.xml.MD5
+++ b/portlets/sample-python-portlet/ivy.xml.MD5
@@ -1 +1 @@
-5997b2ada30fbc5c00e21b767fbcb709
+917067ac293a8cc41f268d9778be167c
diff --git a/portlets/sample-tapestry-portlet/ivy.xml b/portlets/sample-tapestry-portlet/ivy.xml
index d23c3f204969..bf87c9cbb866 100644
--- a/portlets/sample-tapestry-portlet/ivy.xml
+++ b/portlets/sample-tapestry-portlet/ivy.xml
@@ -3,7 +3,7 @@
 <ivy-module version="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
 	<info module="sample-tapestry-portlet" organisation="com.liferay" />
 
-	<dependencies defaultconfmapping="default">
+	<dependencies>
 		<dependency name="hivemind" org="hivemind" rev="1.1" />
 		<dependency name="hivemind-lib" org="hivemind" rev="1.1" />
 		<dependency name="javassist" org="javassist" rev="3.0" />
diff --git a/portlets/sample-tapestry-portlet/ivy.xml.MD5 b/portlets/sample-tapestry-portlet/ivy.xml.MD5
index 5b1b79142a84..2e8cd4d3c33c 100644
--- a/portlets/sample-tapestry-portlet/ivy.xml.MD5
+++ b/portlets/sample-tapestry-portlet/ivy.xml.MD5
@@ -1 +1 @@
-758fe9872641f3685041157b21abdc96
+86a69ce54d36594cdf096dda4531ae78
diff --git a/portlets/social-coding-portlet/ivy.xml b/portlets/social-coding-portlet/ivy.xml
index cd488390f075..e7fb2b4642b9 100644
--- a/portlets/social-coding-portlet/ivy.xml
+++ b/portlets/social-coding-portlet/ivy.xml
@@ -3,7 +3,7 @@
 <ivy-module version="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
 	<info module="social-coding-portlet" organisation="com.liferay" />
 
-	<dependencies defaultconfmapping="default">
+	<dependencies>
 		<dependency name="svnkit" org="org.tmatesoft.svnkit" rev="1.2.0.4949" />
 	</dependencies>
 </ivy-module>
\ No newline at end of file
diff --git a/portlets/social-coding-portlet/ivy.xml.MD5 b/portlets/social-coding-portlet/ivy.xml.MD5
index 252b0a3dca2f..f3fb1277b62b 100644
--- a/portlets/social-coding-portlet/ivy.xml.MD5
+++ b/portlets/social-coding-portlet/ivy.xml.MD5
@@ -1 +1 @@
-9a286c48bf386ee2fad41da299e8b942
+95dc2ffd3de239cdd20acf75ca427d28
diff --git a/portlets/test-pacl-portlet/ivy.xml b/portlets/test-pacl-portlet/ivy.xml
index eb5bf2b0dba9..02d119742ca2 100644
--- a/portlets/test-pacl-portlet/ivy.xml
+++ b/portlets/test-pacl-portlet/ivy.xml
@@ -3,7 +3,7 @@
 <ivy-module version="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
 	<info module="test-pacl-portlet" organisation="com.liferay" />
 
-	<dependencies defaultconfmapping="default">
+	<dependencies>
 		<dependency name="jackson-core-asl" org="org.codehaus.jackson" rev="1.9.11" />
 		<dependency name="jackson-mapper-asl" org="org.codehaus.jackson" rev="1.9.11" />
 	</dependencies>
diff --git a/portlets/test-pacl-portlet/ivy.xml.MD5 b/portlets/test-pacl-portlet/ivy.xml.MD5
index 4c32fa82ba51..10a1b08b9d40 100644
--- a/portlets/test-pacl-portlet/ivy.xml.MD5
+++ b/portlets/test-pacl-portlet/ivy.xml.MD5
@@ -1 +1 @@
-515a8dd3e72833d53f5e8a58c2217b53
+3c99f637847d4462f2db3d0e37b86a2b
diff --git a/portlets/wsrp-portlet/ivy.xml b/portlets/wsrp-portlet/ivy.xml
index f5a353c7bfb9..bfeb84a3b822 100644
--- a/portlets/wsrp-portlet/ivy.xml
+++ b/portlets/wsrp-portlet/ivy.xml
@@ -3,7 +3,7 @@
 <ivy-module version="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
 	<info module="wsrp-portlet" organisation="com.liferay" />
 
-	<dependencies defaultconfmapping="default">
+	<dependencies>
 		<dependency name="wss4j" org="org.apache.ws.security" rev="1.5.12" />
 	</dependencies>
 </ivy-module>
\ No newline at end of file
diff --git a/portlets/wsrp-portlet/ivy.xml.MD5 b/portlets/wsrp-portlet/ivy.xml.MD5
index 9ff5f0573abd..b77d5940c7db 100644
--- a/portlets/wsrp-portlet/ivy.xml.MD5
+++ b/portlets/wsrp-portlet/ivy.xml.MD5
@@ -1 +1 @@
-dc7755c31d84a409e8af026dfb953e31
+5c36441a04f6752f1041c0186ec78769
diff --git a/shared/cdi-portlet-bridge-shared/ivy.xml b/shared/cdi-portlet-bridge-shared/ivy.xml
index 4eda3ce21490..4ecd0735d747 100644
--- a/shared/cdi-portlet-bridge-shared/ivy.xml
+++ b/shared/cdi-portlet-bridge-shared/ivy.xml
@@ -3,7 +3,7 @@
 <ivy-module version="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
 	<info module="cdi-portlet-bridge-shared" organisation="com.liferay" />
 
-	<dependencies defaultconfmapping="default">
+	<dependencies>
 		<dependency name="cdi-api" org="javax.enterprise" rev="1.0-SP4" />
 	</dependencies>
 </ivy-module>
\ No newline at end of file
diff --git a/shared/cdi-portlet-bridge-shared/ivy.xml.MD5 b/shared/cdi-portlet-bridge-shared/ivy.xml.MD5
index 15e7f9eb13b3..f4707c59df08 100644
--- a/shared/cdi-portlet-bridge-shared/ivy.xml.MD5
+++ b/shared/cdi-portlet-bridge-shared/ivy.xml.MD5
@@ -1 +1 @@
-6d8cc884512355d0c29fa1dcf9706e22
+31ad24de645d69999f921eea9f2badf8
diff --git a/shared/http-service-shared/ivy.xml b/shared/http-service-shared/ivy.xml
index c872eab04e04..22d0c501d0bf 100644
--- a/shared/http-service-shared/ivy.xml
+++ b/shared/http-service-shared/ivy.xml
@@ -3,7 +3,7 @@
 <ivy-module version="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
 	<info module="http-service-shared" organisation="com.liferay" />
 
-	<dependencies defaultconfmapping="default">
+	<dependencies>
 		<dependency name="org.osgi.compendium" org="org.osgi" rev="4.3.1" />
 		<dependency name="org.osgi.core" org="org.osgi" rev="4.3.1" />
 	</dependencies>
diff --git a/shared/http-service-shared/ivy.xml.MD5 b/shared/http-service-shared/ivy.xml.MD5
index 8e10f5b689bd..48c565c69dfa 100644
--- a/shared/http-service-shared/ivy.xml.MD5
+++ b/shared/http-service-shared/ivy.xml.MD5
@@ -1 +1 @@
-799602cf6e16ec518d4672d1e2bef5fc
+476786deb5ae9ca76e8d68b61bdf9961
diff --git a/shared/log-bridge-shared/ivy.xml b/shared/log-bridge-shared/ivy.xml
index 7e0440b69b0f..ef919ff9ed5e 100644
--- a/shared/log-bridge-shared/ivy.xml
+++ b/shared/log-bridge-shared/ivy.xml
@@ -3,7 +3,7 @@
 <ivy-module version="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
 	<info module="log-bridge-shared" organisation="com.liferay" />
 
-	<dependencies defaultconfmapping="default">
+	<dependencies>
 		<dependency name="org.osgi.compendium" org="org.osgi" rev="4.3.1" />
 		<dependency name="org.osgi.core" org="org.osgi" rev="4.3.1" />
 	</dependencies>
diff --git a/shared/log-bridge-shared/ivy.xml.MD5 b/shared/log-bridge-shared/ivy.xml.MD5
index 6e6a5539b7e7..f0455bd4d148 100644
--- a/shared/log-bridge-shared/ivy.xml.MD5
+++ b/shared/log-bridge-shared/ivy.xml.MD5
@@ -1 +1 @@
-d12ac0a6c9120ac92d59efe437b22703
+a7517eb04ccd29a2764a5a1d5dfb2284
diff --git a/tools/portlet_icefaces_tmpl/ivy.xml b/tools/portlet_icefaces_tmpl/ivy.xml
index a83a25fa7831..b18b17a0bff6 100644
--- a/tools/portlet_icefaces_tmpl/ivy.xml
+++ b/tools/portlet_icefaces_tmpl/ivy.xml
@@ -3,7 +3,7 @@
 <ivy-module version="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
 	<info module="portlet_icefaces_tmpl" organisation="com.liferay" />
 
-	<dependencies defaultconfmapping="default">
+	<dependencies>
 		<dependency name="icefaces" org="org.icefaces" rev="3.0.1" />
 		<dependency name="icefaces-ace" org="org.icefaces" rev="3.0.1" />
 		<dependency name="jboss-el" org="org.jboss.el" rev="2.0.1.GA" />
diff --git a/tools/portlet_jsf_tmpl/ivy.xml b/tools/portlet_jsf_tmpl/ivy.xml
index 3057ace43012..6751608df6be 100644
--- a/tools/portlet_jsf_tmpl/ivy.xml
+++ b/tools/portlet_jsf_tmpl/ivy.xml
@@ -3,7 +3,7 @@
 <ivy-module version="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
 	<info module="portlet_jsf_tmpl" organisation="com.liferay" />
 
-	<dependencies defaultconfmapping="default">
+	<dependencies>
 		<dependency name="jboss-el" org="org.jboss.el" rev="2.0.1.GA" />
 		<dependency name="jsf-api" org="com.sun.faces" rev="2.1.3-b02" />
 		<dependency name="jsf-impl" org="com.sun.faces" rev="2.1.3-b02" />
diff --git a/tools/portlet_liferay_faces_alloy_tmpl/ivy.xml b/tools/portlet_liferay_faces_alloy_tmpl/ivy.xml
index 0a0d6ba4882d..b96a3ddd92ba 100644
--- a/tools/portlet_liferay_faces_alloy_tmpl/ivy.xml
+++ b/tools/portlet_liferay_faces_alloy_tmpl/ivy.xml
@@ -3,7 +3,7 @@
 <ivy-module version="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
 	<info module="portlet_liferay_faces_alloy_tmpl" organisation="com.liferay" />
 
-	<dependencies defaultconfmapping="default">
+	<dependencies>
 		<dependency name="jboss-el" org="org.jboss.el" rev="2.0.1.GA" />
 		<dependency name="jsf-api" org="com.sun.faces" rev="2.1.3-b02" />
 		<dependency name="jsf-impl" org="com.sun.faces" rev="2.1.3-b02" />
diff --git a/tools/portlet_primefaces_tmpl/ivy.xml b/tools/portlet_primefaces_tmpl/ivy.xml
index a65527a22cef..c74250fd0cb4 100644
--- a/tools/portlet_primefaces_tmpl/ivy.xml
+++ b/tools/portlet_primefaces_tmpl/ivy.xml
@@ -3,7 +3,7 @@
 <ivy-module version="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
 	<info module="portlet_primefaces_tmpl" organisation="com.liferay" />
 
-	<dependencies defaultconfmapping="default">
+	<dependencies>
 		<dependency name="jboss-el" org="org.jboss.el" rev="2.0.1.GA" />
 		<dependency name="jsf-api" org="com.sun.faces" rev="2.1.3-b02" />
 		<dependency name="jsf-impl" org="com.sun.faces" rev="2.1.3-b02" />
diff --git a/tools/portlet_richfaces_tmpl/ivy.xml b/tools/portlet_richfaces_tmpl/ivy.xml
index 3cabef148347..4f65ba4d922c 100644
--- a/tools/portlet_richfaces_tmpl/ivy.xml
+++ b/tools/portlet_richfaces_tmpl/ivy.xml
@@ -3,7 +3,7 @@
 <ivy-module version="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
 	<info module="portlet_richfaces_tmpl" organisation="com.liferay" />
 
-	<dependencies defaultconfmapping="default">
+	<dependencies>
 		<dependency name="cssparser" org="net.sourceforge.cssparser" rev="0.9.5" />
 		<dependency name="guava" org="com.google.guava" rev="10.0.1" />
 		<dependency name="jboss-el" org="org.jboss.el" rev="2.0.1.GA" />
diff --git a/webs/wurfl-web/ivy.xml b/webs/wurfl-web/ivy.xml
index 93a30cdac466..d9c3fafa3836 100644
--- a/webs/wurfl-web/ivy.xml
+++ b/webs/wurfl-web/ivy.xml
@@ -3,7 +3,7 @@
 <ivy-module version="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
 	<info module="wurfl-web" organisation="com.liferay" />
 
-	<dependencies defaultconfmapping="default">
+	<dependencies>
 		<dependency name="wurfl" org="net.sourceforge.wurfl" rev="1.3.1.1" />
 	</dependencies>
 </ivy-module>
\ No newline at end of file
diff --git a/webs/wurfl-web/ivy.xml.MD5 b/webs/wurfl-web/ivy.xml.MD5
index 636ec69b5941..c2faaa05015c 100644
--- a/webs/wurfl-web/ivy.xml.MD5
+++ b/webs/wurfl-web/ivy.xml.MD5
@@ -1 +1 @@
-fba30ae34da3c50dae4dc18fc7f8fe7c
+6c01a77f26ef98a4f78d9dcbfdea6432