From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sun, 17 Jan 2010 20:46:52 +0000 (+0000)
Subject: Put profiles at SDK level
X-Git-Tag: argeo-slc-2.1.7~1457
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=061e03873ca4523c51b48ba05bce4591aaa2c465;p=gpl%2Fargeo-slc.git

Put profiles at SDK level

git-svn-id: https://svn.argeo.org/slc/trunk@3314 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/dist/org.argeo.slc.sdk/pom.xml b/dist/org.argeo.slc.sdk/pom.xml
index 86955575f..76b8b8aad 100644
--- a/dist/org.argeo.slc.sdk/pom.xml
+++ b/dist/org.argeo.slc.sdk/pom.xml
@@ -164,18 +164,6 @@
 		</dependency>
 
 		<!-- Modules -->
-		<dependency>
-			<groupId>org.argeo.slc.modules</groupId>
-			<artifactId>org.argeo.slc.modules.agent.bundles</artifactId>
-			<version>${project.version}</version>
-			<type>pom</type>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.slc.modules</groupId>
-			<artifactId>org.argeo.slc.modules.server.bundles</artifactId>
-			<version>${project.version}</version>
-			<type>pom</type>
-		</dependency>
 
 		<!-- Launcher -->
 		<dependency>
@@ -188,11 +176,48 @@
 
 	</dependencies>
 	<profiles>
+		<profile>
+			<id>sdkWithModules</id>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
+			<dependencies>
+				<dependency>
+					<groupId>org.argeo.slc.modules</groupId>
+					<artifactId>org.argeo.slc.modules.agent.bundles</artifactId>
+					<version>${project.version}</version>
+					<type>pom</type>
+				</dependency>
+				<dependency>
+					<groupId>org.argeo.slc.modules</groupId>
+					<artifactId>org.argeo.slc.modules.server.bundles</artifactId>
+					<version>${project.version}</version>
+					<type>pom</type>
+				</dependency>
+			</dependencies>
+		</profile>
+		<profile>
+			<id>sdkWithoutModules</id>
+		</profile>
 		<profile>
 			<id>release</id>
 			<properties>
 				<argeo.p2.repository>/var/argeo/projects/SLC/www/sdk</argeo.p2.repository>
 			</properties>
+			<dependencies>
+				<dependency>
+					<groupId>org.argeo.slc.modules</groupId>
+					<artifactId>org.argeo.slc.modules.agent.bundles</artifactId>
+					<version>${project.version}</version>
+					<type>pom</type>
+				</dependency>
+				<dependency>
+					<groupId>org.argeo.slc.modules</groupId>
+					<artifactId>org.argeo.slc.modules.server.bundles</artifactId>
+					<version>${project.version}</version>
+					<type>pom</type>
+				</dependency>
+			</dependencies>
 		</profile>
 	</profiles>
 </project>
\ No newline at end of file
diff --git a/dist/pom.xml b/dist/pom.xml
index 2a23da310..21c424cb8 100644
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -12,25 +12,6 @@
 	<packaging>pom</packaging>
 	<name>SLC Distribution</name>
 	<modules>
+		<module>org.argeo.slc.sdk</module>
 	</modules>
-	<profiles>
-		<profile>
-			<id>withSdk</id>
-			<activation>
-				<activeByDefault>true</activeByDefault>
-			</activation>
-			<modules>
-				<module>org.argeo.slc.sdk</module>
-			</modules>
-		</profile>
-		<profile>
-			<id>withoutSdk</id>
-		</profile>
-		<profile>
-			<id>release</id>
-			<modules>
-				<module>org.argeo.slc.sdk</module>
-			</modules>
-		</profile>
-	</profiles>
 </project>
\ No newline at end of file