Try to fix issue with bundles version

[gpl/argeo-slc.git] / demo / pom.xml

diff --git a/demo/pom.xml b/demo/pom.xml
index 7265e29fca6d6c69cf628e7d1b29f63942d14070..6feb43f5027b5358b2259a9b8c412343cd11eb68 100644 (file)
--- a/demo/pom.xml
+++ b/demo/pom.xml
@@ -19,12 +19,53 @@
                        <plugin>
                                <groupId>org.argeo.slc.maven</groupId>
                                <artifactId>maven-argeo-osgi-plugin</artifactId>
+                               <version>${version.maven-argeo-osgi}</version>
                                <configuration>
+                                       <argsToAppend>
+                                               <arg>-clean</arg>
+                                               <arg>-noExit</arg>
+                                       </argsToAppend>
                                        <systemProperties>
                                                <slc.osgi.bundles>${basedir}/site;in=*;ex=**/.svn/**,${basedir}/../server/org.argeo.slc.siteserver/bundles;in=*;ex=**/.svn/**</slc.osgi.bundles>
                                        </systemProperties>
                                </configuration>
                        </plugin>
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-dependency-plugin</artifactId>
+                               <executions>
+                                       <execution>
+                                               <id>copy-dependencies</id>
+                                               <phase>pre-integration-test</phase>
+                                               <goals>
+                                                       <goal>copy-dependencies</goal>
+                                               </goals>
+                                               <configuration>
+                                                       <includeScope>compile</includeScope>
+                                                       <includeTypes>jar</includeTypes>
+                                               </configuration>
+                                       </execution>
+                               </executions>
+                       </plugin>
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-surefire-plugin</artifactId>
+                               <configuration>
+                                       <skipTests>true</skipTests>
+                               </configuration>
+                               <executions>
+                                       <execution>
+                                               <id>surefire-it</id>
+                                               <phase>integration-test</phase>
+                                               <goals>
+                                                       <goal>test</goal>
+                                               </goals>
+                                               <configuration>
+                                                       <skipTests>false</skipTests>
+                                               </configuration>
+                                       </execution>
+                               </executions>
+                       </plugin>
                </plugins>
        </build>
        <dependencies>
@@ -35,15 +76,23 @@
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.osgiboot</artifactId>
-                       <version>${project.version}</version>
                </dependency>
                <!--  Server -->
                <dependency>
                        <groupId>org.argeo.slc.server</groupId>
                        <artifactId>bundles</artifactId>
-                       <version>${project.version}</version>
                        <type>pom</type>
                </dependency>
+
+               <!--  TESTS -->
+               <dependency>
+                       <groupId>org.argeo.slc.runtime</groupId>
+                       <artifactId>org.argeo.slc.support.equinox</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.slc.runtime</groupId>
+                       <artifactId>org.argeo.slc.osgiboot</artifactId>
+               </dependency>
        </dependencies>
 
        <profiles>
@@ -58,10 +107,8 @@
                                                        <execDir>target/exec/server</execDir>
                                                        <jvmArgs>
                                                                <jvmArg>-Xmx256m</jvmArg>
-                                                               <!--
-                                                                       <jvmArg>-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=8000</jvmArg>
-                                                               -->
                                                        </jvmArgs>
+                                                       <debug>0</debug>
                                                        <systemProperties>
                                                                <slc.osgi.start>
                                                                        org.argeo.dep.osgi.catalina.start,
@@ -76,6 +123,7 @@
                                                                        org.argeo.slc.webapp,
                                                                        org.argeo.slc.ria
                                                                </slc.osgi.start>
+                                                               <!--  <slc.osgiboot.debug>true</slc.osgiboot.debug>-->
                                                        </systemProperties>
                                                </configuration>
                                        </plugin>
@@ -102,8 +150,7 @@
                                                                        org.springframework.osgi.extender,
                                                                        org.argeo.slc.support.equinox,
                                                                        org.argeo.slc.agent,
-                                                                       org.argeo.slc.demo.basic,
-                                                                       org.argeo.slc.demo.manager
+                                                                       org.argeo.slc.demo.basic
                                                                </slc.osgi.start>
                                                        </systemProperties>
                                                </configuration>