[maven-release-plugin] prepare release argeo-slc-0.11.4

[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 e31674babeb93187710b23529c7856804c5908da..1fd0f28cd7e813d2ba5a1a12d510caf6fa27b06b 100644 (file)
--- a/integration-tests/org.argeo.slc.it.webapp/pom.xml
+++ b/integration-tests/org.argeo.slc.it.webapp/pom.xml
@@ -1,21 +1,40 @@
-<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.it</groupId>
-               <artifactId>argeo-slc-it</artifactId>
-               <version>0.11.3-SNAPSHOT</version>
-               <relativePath>..</relativePath>
+               <groupId>org.argeo.slc</groupId>
+               <artifactId>integration-tests</artifactId>
+               <version>0.11.4</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>
+       <name>SLC Integration Tests Web Application</name>
        <build>
                <plugins>
                        <plugin>
-                               <groupId>org.argeo.slc.maven</groupId>
+                               <groupId>org.argeo.maven.plugins</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;ex=pom.xml,
+                                                       ${basedir}/../../modules/server;in=*;ex=target;ex=pom.xml,
+                                                       ${basedir}/../../modules/agent;in=*;ex=target;ex=pom.xml
+                                               </slc.osgi.bundles>
+                                               <slc.osgi.start>
+                                                       org.springframework.osgi.extender,
+                                                       org.argeo.slc.server.main,
+                                                       org.argeo.slc.server.hsqldb,
+                                                       org.argeo.slc.ria,
+                                                       org.argeo.slc.agent,                                                            
+                                                       org.argeo.slc.agent.jms                                                 
+                                               </slc.osgi.start>
+                                       </systemProperties>
+                               </configuration>
                                <executions>
                                        <execution>
                                                <id>equinox-start</id>
@@ -25,28 +44,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>
@@ -80,27 +77,26 @@
                </plugins>
        </build>
        <dependencies>
-               <!--  Server -->
                <dependency>
-                       <groupId>org.argeo.slc.server</groupId>
-                       <artifactId>deploy</artifactId>
-                       <type>pom</type>
+                       <groupId>org.argeo.slc.dep</groupId>
+                       <artifactId>org.argeo.slc.dep.server</artifactId>
+                       <version>${project.version}</version>
                </dependency>
                <dependency>
-                       <groupId>org.argeo.slc.runtime</groupId>
-                       <artifactId>org.argeo.slc.support.equinox</artifactId>
+                       <groupId>org.argeo.slc.dep</groupId>
+                       <artifactId>org.argeo.slc.dep.agent</artifactId>
+                       <version>${project.version}</version>
                </dependency>
-
-
-               <!-- TEST -->
+               <!-- RIA -->
                <dependency>
-                       <groupId>org.argeo.slc.runtime</groupId>
-                       <artifactId>org.argeo.slc.server</artifactId>
-                       <scope>test</scope>
+                       <groupId>org.argeo.slc.server</groupId>
+                       <artifactId>org.argeo.slc.ria</artifactId>
                </dependency>
+
+               <!-- Unit Tests -->
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
-                       <artifactId>org.argeo.slc.osgiboot</artifactId>
+                       <artifactId>org.argeo.slc.unit</artifactId>
                        <scope>test</scope>
                </dependency>
        </dependencies>