From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 13 Jan 2010 11:03:21 +0000 (+0000)
Subject: Improve SDK
X-Git-Tag: argeo-slc-2.1.7~1471
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=0757e6ae5c3ae9cec09dc2d04242dc9af3dee189;p=gpl%2Fargeo-slc.git

Improve SDK

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

diff --git a/dep/org.argeo.slc.dep.agent/pom.xml b/dep/org.argeo.slc.dep.agent/pom.xml
index ebc60d171..e16780730 100644
--- a/dep/org.argeo.slc.dep.agent/pom.xml
+++ b/dep/org.argeo.slc.dep.agent/pom.xml
@@ -51,7 +51,7 @@
 			<groupId>org.argeo.slc.runtime</groupId>
 			<artifactId>org.argeo.slc.launcher</artifactId>
 		</dependency>
-		
+
 		<!--  Spring -->
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -63,14 +63,6 @@
 			<groupId>org.custommonkey.xmlunit</groupId>
 			<artifactId>com.springsource.org.custommonkey.xmlunit</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.argeo.dep.jacob</groupId>
-			<artifactId>org.argeo.dep.jacob</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.dep.jacob</groupId>
-			<artifactId>org.argeo.dep.jacob.win32.x86</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.apache.bsf</groupId>
 			<artifactId>com.springsource.org.apache.bsf</artifactId>
@@ -111,6 +103,15 @@
 			<artifactId>com.springsource.javax.resource</artifactId>
 		</dependency>
 
+		<!-- Jacob (will be removed soon) -->
+		<dependency>
+			<groupId>org.argeo.dep.jacob</groupId>
+			<artifactId>org.argeo.dep.jacob</artifactId>
+		</dependency>
+		<!--
+			<dependency> <groupId>org.argeo.dep.jacob</groupId>
+			<artifactId>org.argeo.dep.jacob.win32.x86</artifactId> </dependency>
+		-->
 		<!--
 			Languages <dependency> <groupId>org.codehaus.groovy</groupId>
 			<artifactId>com.springsource.org.codehaus.groovy</artifactId>
diff --git a/dist/org.argeo.slc.sdk/pom.xml b/dist/org.argeo.slc.sdk/pom.xml
index 3f91ce63d..a3f50e511 100644
--- a/dist/org.argeo.slc.sdk/pom.xml
+++ b/dist/org.argeo.slc.sdk/pom.xml
@@ -121,7 +121,32 @@
 					</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>