@update:79; Wait for one agent

[gpl/argeo-slc.git] / integration-tests / org.argeo.slc.it.webapp / pom.xml

diff --git a/integration-tests/org.argeo.slc.it.webapp/pom.xml b/integration-tests/org.argeo.slc.it.webapp/pom.xml
index 2b69a79e69bbf979baa946971ff677065cdcc585..ef22873797e2a08bab81fdea3e7934521509cf64 100644 (file)
--- a/integration-tests/org.argeo.slc.it.webapp/pom.xml
+++ b/integration-tests/org.argeo.slc.it.webapp/pom.xml
@@ -1,11 +1,17 @@
-<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.server</groupId>
-               <artifactId>deploy</artifactId>
-               <version>0.11.3</version>
-               <relativePath>../../server/org.argeo.slc.siteserver</relativePath>
+               <!--
+                       <groupId>org.argeo.slc.server</groupId>
+                       <artifactId>deploy</artifactId> <version>0.11.4-SNAPSHOT</version>
+                       <relativePath>../../server/org.argeo.slc.siteserver</relativePath>
+               -->
+               <groupId>org.argeo.slc</groupId>
+               <artifactId>integration-tests</artifactId>
+               <version>0.11.4-SNAPSHOT</version>
        </parent>
+       <groupId>org.argeo.slc.it</groupId>
        <artifactId>org.argeo.slc.it.webapp</artifactId>
        <packaging>jar</packaging>
        <name>Argeo SLC Web Application Integration Tests</name>
@@ -15,6 +21,31 @@
                                <groupId>org.argeo.slc.maven</groupId>
                                <artifactId>maven-argeo-osgi-plugin</artifactId>
                                <version>${version.maven-argeo-osgi}</version>
+                               <configuration>
+                                       <argsToAppend>
+                                               <arg>-clean</arg>
+                                       </argsToAppend>
+                                       <systemProperties>
+                                               <slc.osgi.bundles>
+                                                       ${basedir}/../../demo/site;in=*;ex=target,
+                                                       ${basedir}/../../server/org.argeo.slc.siteserver/bundles;in=*
+                                                               </slc.osgi.bundles>
+                                               <slc.osgi.start>
+                                                       org.argeo.dep.osgi.catalina.start,
+                                                       org.springframework.osgi.extender,
+                                                       org.springframework.osgi.web.extender,
+                                                       org.springframework.osgi.samples.simplewebapp,
+                                                       org.argeo.slc.server.activemq,
+                                                       org.argeo.slc.server.hsqldb,
+                                                       org.argeo.slc.server.hibernate,
+                                                       org.argeo.slc.server.services,
+                                                       org.argeo.slc.server.jms,
+                                                       org.argeo.slc.webapp,
+                                                       org.argeo.slc.ria,
+                                                       org.argeo.slc.agent                                                             
+                                                               </slc.osgi.start>
+                                       </systemProperties>
+                               </configuration>
                                <executions>
                                        <execution>
                                                <id>equinox-start</id>
@@ -24,28 +55,6 @@
                                                </goals>
                                                <configuration>
                                                        <wait>false</wait>
-                                                       <argsToAppend>
-                                                               <arg>-clean</arg>
-                                                       </argsToAppend>
-                                                       <systemProperties>
-                                                               <slc.osgi.bundles>
-                                                                       ${basedir}/../../demo/site;in=*;ex=target,
-                                                                       ${basedir}/../../server/org.argeo.slc.siteserver/bundles;in=*
-                                                               </slc.osgi.bundles>
-                                                               <slc.osgi.start>
-                                                                       org.argeo.dep.osgi.catalina.start,
-                                                                       org.springframework.osgi.extender,
-                                                                       org.springframework.osgi.web.extender,
-                                                                       org.springframework.osgi.samples.simplewebapp,
-                                                                       org.argeo.slc.server.activemq,
-                                                                       org.argeo.slc.server.hsqldb,
-                                                                       org.argeo.slc.server.hibernate,
-                                                                       org.argeo.slc.server.services,
-                                                                       org.argeo.slc.server.jms,
-                                                                       org.argeo.slc.webapp,
-                                                                       org.argeo.slc.ria                                                               
-                                                               </slc.osgi.start>
-                                                       </systemProperties>
                                                </configuration>
                                        </execution>
                                        <execution>
@@ -84,7 +93,11 @@
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.support.equinox</artifactId>
                </dependency>
-
+               <dependency>
+                       <groupId>org.argeo.slc.dep</groupId>
+                       <artifactId>org.argeo.slc.dep.server</artifactId>
+                       <version>${project.version}</version>
+               </dependency>
                <!-- TEST -->
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>