X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=integration-tests%2Forg.argeo.slc.it.webapp%2Fpom.xml;h=fbe7005ad15e59d9033da7388b478109d39eb05d;hb=94f7f66d8aa4f9c3510c215045964bad85208cc8;hp=321687592ccc9303b3966e160e55dcd48f493a29;hpb=376dd74de6d9a78215754483ac463573fdf8ab65;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 321687592..fbe7005ad 100644
--- a/integration-tests/org.argeo.slc.it.webapp/pom.xml
+++ b/integration-tests/org.argeo.slc.it.webapp/pom.xml
@@ -1,10 +1,9 @@
-<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</groupId>
 		<artifactId>integration-tests</artifactId>
-		<version>0.12.2-SNAPSHOT</version>
+		<version>0.13.0-SNAPSHOT</version>
 	</parent>
 	<groupId>org.argeo.slc.it</groupId>
 	<artifactId>org.argeo.slc.it.webapp</artifactId>
@@ -23,16 +22,32 @@
 					<systemProperties>
 						<argeo.osgi.bundles>
 							${basedir}/../../demo/site;in=*;ex=target;ex=pom.xml;ex=.*,
+						</argeo.osgi.bundles>
+						<!--
+							<argeo.osgi.bundles>
+							${basedir}/../../demo/site;in=*;ex=target;ex=pom.xml;ex=.*,
 							${basedir}/../../modules/server;in=*;ex=target;ex=pom.xml;ex=.*,
 							${basedir}/../../modules/agent;in=*;ex=target;ex=pom.xml;ex=.*
-						</argeo.osgi.bundles>
+							</argeo.osgi.bundles>
+						-->
+						<!--
+							<argeo.osgi.start> org.springframework.osgi.extender,
+							org.argeo.slc.server.main, org.argeo.slc.server.hsqldb,
+							org.argeo.slc.server.hibernate, org.argeo.slc.ria,
+							org.argeo.slc.agent, org.argeo.slc.agent.jms </argeo.osgi.start>
+						-->
 						<argeo.osgi.start>
 							org.springframework.osgi.extender,
+							org.argeo.server.ads.server,
+							org.argeo.slc.server.jackrabbit.derby,
+							org.argeo.slc.server.jcr,
 							org.argeo.slc.server.main,
-							org.argeo.slc.server.hsqldb,
 							org.argeo.slc.ria,
 							org.argeo.slc.agent,
-							org.argeo.slc.agent.jms							
+							org.argeo.slc.agent.jms,
+							org.argeo.slc.demo.minimal,
+							org.argeo.slc.demo.basic,
+							org.argeo.slc.demo.ant						
 						</argeo.osgi.start>
 					</systemProperties>
 				</configuration>
@@ -78,37 +93,11 @@
 		</plugins>
 	</build>
 	<dependencies>
-		<dependency>
-			<groupId>org.argeo.commons.osgi</groupId>
-			<artifactId>org.argeo.osgi.boot</artifactId>
-			<version>${version.argeo-commons}</version>
-		</dependency>
-
 		<dependency>
 			<groupId>org.argeo.slc.dep</groupId>
-			<artifactId>org.argeo.slc.dep.server</artifactId>
+			<artifactId>org.argeo.slc.dep.sdk</artifactId>
 			<version>${project.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>org.argeo.slc.dep</groupId>
-			<artifactId>org.argeo.slc.dep.agent</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-
-		<!-- Security -->
-		<dependency>
-			<groupId>org.argeo.commons.security</groupId>
-			<artifactId>org.argeo.security.dep.ads</artifactId>
-			<version>${version.argeo-commons}</version>
-			<type>pom</type>
-		</dependency>
-
-		<!-- RIA -->
-		<dependency>
-			<groupId>org.argeo.slc.server</groupId>
-			<artifactId>org.argeo.slc.ria</artifactId>
-		</dependency>
-
 		<!-- Unit Tests -->
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>