X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=integration-tests%2Forg.argeo.slc.it.webapp%2Fpom.xml;h=b9879ddab142bfc436a8bd578b4bff1d0d871c26;hb=42482a0aebe0e054e7416103fd793c81d12e81d9;hp=615e7247124c7f3a8bf9be9444979856acdcaeb4;hpb=f8df8e7d6e4862354ffcc60df76a642e49f5eada;p=gpl%2Fargeo-slc.git

diff --git a/integration-tests/org.argeo.slc.it.webapp/pom.xml b/integration-tests/org.argeo.slc.it.webapp/pom.xml
index 615e72471..b9879ddab 100644
--- a/integration-tests/org.argeo.slc.it.webapp/pom.xml
+++ b/integration-tests/org.argeo.slc.it.webapp/pom.xml
@@ -2,26 +2,22 @@
 	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.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>
 	<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 +31,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 +50,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>
@@ -89,28 +87,19 @@
 	</build>
 	<dependencies>
 		<!--  Server -->
-		<dependency>
-			<groupId>org.argeo.slc.server</groupId>
-			<artifactId>bundles</artifactId>
-			<version>${project.version}</version>
-			<type>pom</type>
-		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
 			<artifactId>org.argeo.slc.support.equinox</artifactId>
 		</dependency>
-
-
-		<!-- TEST -->
 		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.support.equinox</artifactId>
-			<classifier>tests</classifier>
-			<scope>test</scope>
+			<groupId>org.argeo.slc.dep</groupId>
+			<artifactId>org.argeo.slc.dep.server</artifactId>
+			<version>${project.version}</version>
 		</dependency>
+		<!-- TEST -->
 		<dependency>
-			<groupId>org.springframework.osgi</groupId>
-			<artifactId>org.springframework.osgi.test</artifactId>
+			<groupId>org.argeo.slc.runtime</groupId>
+			<artifactId>org.argeo.slc.server</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -118,6 +107,5 @@
 			<artifactId>org.argeo.slc.osgiboot</artifactId>
 			<scope>test</scope>
 		</dependency>
-
 	</dependencies>
 </project>
\ No newline at end of file