Use deploy instaed of bundles

[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 615e7247124c7f3a8bf9be9444979856acdcaeb4..e31674babeb93187710b23529c7856804c5908da 100644 (file)
--- a/integration-tests/org.argeo.slc.it.webapp/pom.xml
+++ b/integration-tests/org.argeo.slc.it.webapp/pom.xml
@@ -12,16 +12,6 @@
        <name>Argeo SLC Web Application Integration Tests</name>
        <build>
                <plugins>
-                       <!--
-                               <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>
-                               <overWriteReleases>true</overWriteReleases>
-                               <overWriteSnapshots>true</overWriteSnapshots> </configuration>
-                               </execution> </executions> </plugin>
-                       -->
                        <plugin>
                                <groupId>org.argeo.slc.maven</groupId>
                                <artifactId>maven-argeo-osgi-plugin</artifactId>
@@ -35,12 +25,14 @@
                                                </goals>
                                                <configuration>
                                                        <wait>false</wait>
-                                                       <pause>30000</pause>
                                                        <argsToAppend>
                                                                <arg>-clean</arg>
                                                        </argsToAppend>
                                                        <systemProperties>
-                                                               <slc.osgi.bundles>${basedir}/../../demo/site;in=*;ex=target</slc.osgi.bundles>
+                                                               <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,
@@ -52,7 +44,7 @@
                                                                        org.argeo.slc.server.services,
                                                                        org.argeo.slc.server.jms,
                                                                        org.argeo.slc.webapp,
-                                                                       org.argeo.slc.ria
+                                                                       org.argeo.slc.ria                                                               
                                                                </slc.osgi.start>
                                                        </systemProperties>
                                                </configuration>
@@ -91,8 +83,7 @@
                <!--  Server -->
                <dependency>
                        <groupId>org.argeo.slc.server</groupId>
-                       <artifactId>bundles</artifactId>
-                       <version>${project.version}</version>
+                       <artifactId>deploy</artifactId>
                        <type>pom</type>
                </dependency>
                <dependency>
@@ -104,13 +95,7 @@
                <!-- TEST -->
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
-                       <artifactId>org.argeo.slc.support.equinox</artifactId>
-                       <classifier>tests</classifier>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.springframework.osgi</groupId>
-                       <artifactId>org.springframework.osgi.test</artifactId>
+                       <artifactId>org.argeo.slc.server</artifactId>
                        <scope>test</scope>
                </dependency>
                <dependency>
@@ -118,6 +103,5 @@
                        <artifactId>org.argeo.slc.osgiboot</artifactId>
                        <scope>test</scope>
                </dependency>
-
        </dependencies>
 </project>
\ No newline at end of file