X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=integration-tests%2Forg.argeo.slc.it.webapp%2Fpom.xml;h=1c86dba39b475f0355c1a4368b7e6ec2967a3cd6;hb=05f3f8d7c67bffd535ecbf5aa575eb9d41a435b4;hp=1e4b8c4d3523a39c4c9c61f76f3aa17b85415243;hpb=8fe8a185d7b0c64fe9a790e7242f174f4bdd8aa1;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 1e4b8c4d3..1c86dba39 100644
--- a/integration-tests/org.argeo.slc.it.webapp/pom.xml
+++ b/integration-tests/org.argeo.slc.it.webapp/pom.xml
@@ -1,9 +1,10 @@
-<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</version>
+		<version>0.13.1-SNAPSHOT</version>
 	</parent>
 	<groupId>org.argeo.slc.it</groupId>
 	<artifactId>org.argeo.slc.it.webapp</artifactId>
@@ -16,32 +17,24 @@
 				<artifactId>maven-argeo-osgi-plugin</artifactId>
 				<version>${version.maven-argeo-osgi}</version>
 				<configuration>
+					<useDependencies>false</useDependencies>
 					<argsToAppend>
 						<arg>-clean</arg>
 					</argsToAppend>
 					<systemProperties>
 						<argeo.osgi.bundles>
 							${basedir}/../../demo/site;in=*;ex=target;ex=pom.xml;ex=.*,
+							${project.build.directory}/lib;in=*.jar,
 						</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.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.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.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.h2,
+							org.argeo.slc.server.hibernate,
 							org.argeo.slc.ria,
 							org.argeo.slc.agent,
 							org.argeo.slc.agent.jms,
@@ -49,6 +42,7 @@
 							org.argeo.slc.demo.basic,
 							org.argeo.slc.demo.ant						
 						</argeo.osgi.start>
+						<argeo.server.port.http>7080</argeo.server.port.http>
 					</systemProperties>
 				</configuration>
 				<executions>
@@ -90,19 +84,45 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>copy-dependencies</id>
+						<phase>process-resources</phase>
+						<goals>
+							<goal>copy-dependencies</goal>
+						</goals>
+						<configuration>
+							<includeTypes>jar</includeTypes>
+							<outputDirectory>${project.build.directory}/lib</outputDirectory>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<artifactId>maven-jar-plugin</artifactId>
+				<configuration>
+					<archive>
+						<manifestFile>META-INF/MANIFEST.MF</manifestFile>
+					</archive>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 	<dependencies>
 		<dependency>
 			<groupId>org.argeo.slc.dep</groupId>
-			<artifactId>org.argeo.slc.dep.sdk</artifactId>
-			<version>${project.version}</version>
+			<artifactId>org.argeo.slc.dep.sdk.rcp</artifactId>
+			<version>${version.slc}</version>
 		</dependency>
 		<!-- Unit Tests -->
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
 			<artifactId>org.argeo.slc.unit</artifactId>
 			<scope>test</scope>
+			<version>${version.slc}</version>
 		</dependency>
 	</dependencies>
 </project>
\ No newline at end of file