Revert "LPS-31936 Make sources retrievable"

This reverts commit 52e5796.

build-common-ivy.xml

@@ -42,7 +42,6 @@
 							<ivy:resolve
 								file="@{ivy.xml.dir}/ivy.xml"
 								log="download-only"
-								transitive="false"
 							/>
 
 							<if>
@@ -57,25 +56,13 @@
 										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
 										log="download-only"
 										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>
 

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" />

hooks/antisamy-hook/ivy.xml.MD5

@@ -1 +1 @@
-263a8d58cf635a76e7aa5ab198a5ea48
+6ada72d7a5204b59a642f027836803ea

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>

hooks/mongodb-hook/ivy.xml.MD5

@@ -1 +1 @@
-0add6eac997f7e4f5eddf41944a3c3ee
+7df89971ec39151b9aab6a176a026501

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" />

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" />

ivy.xml.MD5

@@ -1 +1 @@
-b0c20ea2b2709123b1087fa20bbd82b7
+bec214d9e6dbe0f3c5445bc6ee2b08e0

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>

portlets/ip-geocoder-portlet/ivy.xml.MD5

@@ -1 +1 @@
-4caa03565f3025a00c7a1c9956f32725
+27b5acf359e78209b871eb64763a488b

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>

portlets/modules-admin-portlet/ivy.xml.MD5

@@ -1 +1 @@
-3e0f520632459c4e433221018d5acc03
+468fcfb767c03f902fa7c56ed3696b43

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>

portlets/ruby-console-portlet/ivy.xml.MD5

@@ -1 +1 @@
-e9a31a619c601ae7cd8f80027f0dbe0b
+e04ccfcb0f0601b18ad242a361b0274d

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>

portlets/sample-dao-portlet/ivy.xml.MD5

@@ -1 +1 @@
-f3b51a6f8fc48214184a94265ae27bab
+6c0316a2a9903b5e36c0ba15340df0e6

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>

portlets/sample-groovy-portlet/ivy.xml.MD5

@@ -1 +1 @@
-de83f260a31b2581d9fca48b0d61fe9b
+091d7d91f616f92e1475e76c8b0ff582

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>

portlets/sample-python-portlet/ivy.xml.MD5

@@ -1 +1 @@
-5997b2ada30fbc5c00e21b767fbcb709
+917067ac293a8cc41f268d9778be167c

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" />

portlets/sample-tapestry-portlet/ivy.xml.MD5

@@ -1 +1 @@
-758fe9872641f3685041157b21abdc96
+86a69ce54d36594cdf096dda4531ae78

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>

portlets/social-coding-portlet/ivy.xml.MD5

@@ -1 +1 @@
-9a286c48bf386ee2fad41da299e8b942
+95dc2ffd3de239cdd20acf75ca427d28

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>

portlets/test-pacl-portlet/ivy.xml.MD5

@@ -1 +1 @@
-515a8dd3e72833d53f5e8a58c2217b53
+3c99f637847d4462f2db3d0e37b86a2b

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>

portlets/wsrp-portlet/ivy.xml.MD5

@@ -1 +1 @@
-dc7755c31d84a409e8af026dfb953e31
+5c36441a04f6752f1041c0186ec78769

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>

shared/cdi-portlet-bridge-shared/ivy.xml.MD5

@@ -1 +1 @@
-6d8cc884512355d0c29fa1dcf9706e22
+31ad24de645d69999f921eea9f2badf8

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>

shared/http-service-shared/ivy.xml.MD5

@@ -1 +1 @@
-799602cf6e16ec518d4672d1e2bef5fc
+476786deb5ae9ca76e8d68b61bdf9961

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>

shared/log-bridge-shared/ivy.xml.MD5

@@ -1 +1 @@
-d12ac0a6c9120ac92d59efe437b22703
+a7517eb04ccd29a2764a5a1d5dfb2284

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" />

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" />

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" />

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" />

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" />

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>

webs/wurfl-web/ivy.xml.MD5

@@ -1 +1 @@
-fba30ae34da3c50dae4dc18fc7f8fe7c
+6c01a77f26ef98a4f78d9dcbfdea6432