X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=dist%2Forg.argeo.slc.sdk%2Fpom.xml;h=3622be9a1cb98117446ba6b0f0f3ddb91aaaf69e;hb=3a957806bec803913184f917d2ea2c5b2274df4c;hp=98113caf5d08fb86f9a783a075e093e19a615dfc;hpb=6dc26cb368e82de0f0541659c349c453b568e199;p=gpl%2Fargeo-slc.git

diff --git a/dist/org.argeo.slc.sdk/pom.xml b/dist/org.argeo.slc.sdk/pom.xml
index 98113caf5..3622be9a1 100644
--- a/dist/org.argeo.slc.sdk/pom.xml
+++ b/dist/org.argeo.slc.sdk/pom.xml
@@ -1,10 +1,9 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.argeo.slc</groupId>
 		<artifactId>dep</artifactId>
-		<version>0.12.1-SNAPSHOT</version>
+		<version>0.12.1</version>
 	</parent>
 	<groupId>org.argeo.slc.dist</groupId>
 	<artifactId>org.argeo.slc.sdk</artifactId>
@@ -36,7 +35,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 +46,25 @@
 						<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>
+								<argeo.osgi.bundles>
+									${basedir}/target;in=*.jar,
+								</argeo.osgi.bundles>
+							</systemProperties>
+						</configuration>
+					</execution>
 				</executions>
 			</plugin>
 			<plugin>
@@ -121,7 +139,6 @@
 					</arguments>
 				</configuration>
 			</plugin>
-
 		</plugins>
 	</build>
 	<dependencies>
@@ -131,24 +148,22 @@
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.slc.server</groupId>
-			<artifactId>org.argeo.slc.ria</artifactId>
+			<groupId>org.argeo.slc.dep</groupId>
+			<artifactId>org.argeo.slc.dep.detached</artifactId>
+			<version>${project.version}</version>
 		</dependency>
-
-		<!-- Modules -->
 		<dependency>
-			<groupId>org.argeo.slc.modules</groupId>
-			<artifactId>org.argeo.slc.modules.agent.bundles</artifactId>
+			<groupId>org.argeo.slc.runtime</groupId>
+			<artifactId>org.argeo.slc.unit</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>
+			<groupId>org.argeo.slc.server</groupId>
+			<artifactId>org.argeo.slc.ria</artifactId>
 		</dependency>
 
+		<!-- Modules -->
+
 		<!-- Launcher -->
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
@@ -160,11 +175,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