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 ebc60d1712f259fa3a18e062eeeada3ed9a50f39..e16780730fb246e9f1d56f9305303ac59f777e1f 100644 (file)
--- 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 3f91ce63d7459cea2f3a31c088a49f8c641a302f..a3f50e51177d7da05595bff71aef5cf450f5e3c1 100644 (file)
--- 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>