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 86955575fd4f76496ee00ea674826ce386f80349..76b8b8aad73443c928136455c8b51b62dcfe3358 100644 (file)
--- 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 2a23da31070cdb050ed9f3d9397890532af3fa1e..21c424cb89295527b1898c858b3ae095abdf6add 100644 (file)
--- 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