From c0205e8fc4da5d03e74b7476327ab75f06059cc4 Mon Sep 17 00:00:00 2001
From: Miguel Pastor <miguelinlas3@gmail.com>
Date: Tue, 28 May 2013 23:31:45 +0200
Subject: [PATCH] LPS-35702 Declarative way to declare dependencies in an OSGi
 bundle to deploy along with it

---
 build-common-osgi-plugin.xml | 12 +++++++-----
 build.properties             | 10 ----------
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/build-common-osgi-plugin.xml b/build-common-osgi-plugin.xml
index c05be7a979d..a1b6a5448d2 100644
--- a/build-common-osgi-plugin.xml
+++ b/build-common-osgi-plugin.xml
@@ -70,12 +70,14 @@
 		</antcall>
 	</target>
 
-	<target name="deploy" depends="jar">
-		<copy failonerror="false" todir="${osgi.auto.deploy.dir}">
-			<fileset dir="lib" includes="*.jar" />
-		</copy>
+	<target name="deploy" depends="jar,deploy-dependencies">		
+		<copy file="${plugin.file}" todir="${auto.deploy.dir}" />
+	</target>
 
-		<copy file="${plugin.file}" todir="${osgi.auto.deploy.dir}" />
+	<target name="deploy-dependencies">
+		<copy failonerror="false" todir="${auto.deploy.dir}">
+			<fileset dir="lib" includes="${module.dependencies}" />
+		</copy>
 	</target>
 
 	<target name="jar" depends="compile">
diff --git a/build.properties b/build.properties
index 6c51f586e6a..fd7242a192d 100644
--- a/build.properties
+++ b/build.properties
@@ -194,16 +194,6 @@
     os.unix=Linux,FreeBSD,Solaris,SunOS
     os.windows=Windows 95,Windows 98,Windows NT,Windows 2000,Windows 2003,Windows XP,Windows Vista,Windows 7
 
-##
-## OSGi
-##
-
-	#
-    # OSGi bundles will be deployed to this directory. Make sure that the
-	# Liferay module framework is enabled and is set to scan this directory.
-    #
-    osgi.auto.deploy.dir=${app.server.parent.dir}/osgi/deploy
-
 ##
 ## Plugins
 ##