X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=dist%2Forg.argeo.slc.sdk%2Fpom.xml;h=d9cda3b5be39ec32cb190011ab63c9ac9180a328;hb=d2cbad461d61dc780c47ca2d742cd5a0e89aa1df;hp=a3f50e51177d7da05595bff71aef5cf450f5e3c1;hpb=0757e6ae5c3ae9cec09dc2d04242dc9af3dee189;p=gpl%2Fargeo-slc.git

diff --git a/dist/org.argeo.slc.sdk/pom.xml b/dist/org.argeo.slc.sdk/pom.xml
index a3f50e511..d9cda3b5b 100644
--- a/dist/org.argeo.slc.sdk/pom.xml
+++ b/dist/org.argeo.slc.sdk/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.argeo.slc</groupId>
 		<artifactId>dep</artifactId>
-		<version>0.12.1-SNAPSHOT</version>
+		<version>0.12.2-SNAPSHOT</version>
 	</parent>
 	<groupId>org.argeo.slc.dist</groupId>
 	<artifactId>org.argeo.slc.sdk</artifactId>
@@ -36,7 +36,7 @@
 			<plugin>
 				<groupId>org.argeo.maven.plugins</groupId>
 				<artifactId>maven-argeo-osgi-plugin</artifactId>
-				<extensions>true</extensions>
+				<version>${version.maven-argeo-osgi}</version>
 				<executions>
 					<execution>
 						<id>pde-source</id>
@@ -47,6 +47,27 @@
 						<configuration>
 						</configuration>
 					</execution>
+					<execution>
+						<id>check-osgi</id>
+						<phase>test</phase>
+						<goals>
+							<goal>equinox</goal>
+						</goals>
+						<configuration>
+							<useDependencies>false</useDependencies>
+							<onlyCheck>true</onlyCheck>
+							<argsToAppend>
+								<arg>-clean</arg>
+							</argsToAppend>
+							<systemProperties>
+								<!-- Make sure that no bundle will be started -->
+								<argeo.osgi.start>XXX</argeo.osgi.start>
+								<argeo.osgi.bundles>
+									${basedir}/target;in=*.jar,
+								</argeo.osgi.bundles>
+							</systemProperties>
+						</configuration>
+					</execution>
 				</executions>
 			</plugin>
 			<plugin>
@@ -121,32 +142,6 @@
 					</arguments>
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>org.argeo.maven.plugins</groupId>
-				<artifactId>maven-argeo-osgi-plugin</artifactId>
-				<version>${version.maven-argeo-osgi}</version>
-				<executions>
-					<execution>
-						<id>check-osgi</id>
-						<phase>test</phase>
-						<goals>
-							<goal>equinox</goal>
-						</goals>
-						<configuration>
-							<useDependencies>false</useDependencies>
-							<onlyCheck>true</onlyCheck>
-							<argsToAppend>
-								<arg>-clean</arg>
-							</argsToAppend>
-							<systemProperties>
-								<argeo.osgi.bundles>
-									${basedir}/target;in=*.jar,
-								</argeo.osgi.bundles>
-							</systemProperties>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
 		</plugins>
 	</build>
 	<dependencies>
@@ -171,18 +166,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>
@@ -195,11 +178,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