X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=integration-tests%2Forg.argeo.slc.it.webapp%2Fpom.xml;h=c1ba1a27a1edd4ec8260e46729ed81ef44a41fd0;hb=7274972217cf5bb6772e8833c5723a5f9544ddb5;hp=738b29e7723cbf82fc48a108d76282d710147cb3;hpb=8d1e596bfe9a7d037d3cea59fe6fb4a6b7f955af;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 738b29e77..c1ba1a27a 100644
--- a/integration-tests/org.argeo.slc.it.webapp/pom.xml
+++ b/integration-tests/org.argeo.slc.it.webapp/pom.xml
@@ -2,10 +2,10 @@
 	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</groupId>
-		<artifactId>argeo-slc</artifactId>
-		<version>0.11.2-SNAPSHOT</version>
-		<relativePath>../../org.argeo.slc</relativePath>
+		<groupId>org.argeo.slc.it</groupId>
+		<artifactId>argeo-slc-it</artifactId>
+		<version>0.11.3-SNAPSHOT</version>
+		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.slc.it.webapp</artifactId>
 	<packaging>jar</packaging>
@@ -23,8 +23,6 @@
 							<goal>copy-dependencies</goal>
 						</goals>
 						<configuration>
-							<includeArtifactIds>org.argeo.slc.webapp</includeArtifactIds>
-							<stripVersion>true</stripVersion>
 							<overWriteReleases>true</overWriteReleases>
 							<overWriteSnapshots>true</overWriteSnapshots>
 						</configuration>
@@ -50,72 +48,34 @@
 					</execution>
 				</executions>
 			</plugin>
-			<plugin>
-				<groupId>org.mortbay.jetty</groupId>
-				<artifactId>maven-jetty-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>start-jetty</id>
-						<phase>pre-integration-test</phase>
-						<goals>
-							<goal>run-war</goal>
-						</goals>
-						<configuration>
-							<daemon>true</daemon>
-						</configuration>
-					</execution>
-					<execution>
-						<id>stop-jetty</id>
-						<phase>post-integration-test</phase>
-						<goals>
-							<goal>stop</goal>
-						</goals>
-					</execution>
-				</executions>
-				<configuration>
-					<webApp>${project.build.directory}/dependency/org.argeo.slc.webapp.war</webApp>
-					<scanIntervalSeconds>0</scanIntervalSeconds>
-					<webDefaultXml>../../org.argeo.slc.webapp/src/main/config/jetty/webdefault.xml</webDefaultXml>
-					<jettyConfig>../../org.argeo.slc.webapp/src/main/config/jetty/jetty-test.xml</jettyConfig>
-				</configuration>
-			</plugin>
 		</plugins>
 	</build>
 	<dependencies>
+		<!--  Server -->
 		<dependency>
-			<groupId>org.argeo.slc</groupId>
-			<artifactId>org.argeo.slc.webapp</artifactId>
+			<groupId>org.argeo.slc.server</groupId>
+			<artifactId>bundles</artifactId>
 			<version>${project.version}</version>
-			<type>war</type>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.launcher</artifactId>
-			<version>${project.version}</version>
-			<scope>test</scope>
+			<type>pom</type>
 		</dependency>
+
+		<!-- TEST -->
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.support.ant</artifactId>
-			<version>${project.version}</version>
+			<artifactId>org.argeo.slc.support.equinox</artifactId>
+			<classifier>tests</classifier>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.support.ant</artifactId>
-			<version>${project.version}</version>
+			<groupId>org.springframework.osgi</groupId>
+			<artifactId>org.springframework.osgi.test</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.support.ws.client</artifactId>
-			<version>${project.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>javax.activation</groupId>
-			<artifactId>com.springsource.javax.activation</artifactId>
+			<artifactId>org.argeo.slc.osgiboot</artifactId>
 			<scope>test</scope>
 		</dependency>
+
 	</dependencies>
 </project>
\ No newline at end of file