X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=inline;f=integration-tests%2Forg.argeo.slc.it.webapp%2Fpom.xml;h=4a34d3a5be816af2e1a82488e47b2c91dd6c75ea;hb=a1b71d4abc3b36d052d827e9356a3f9ba4c5cf6d;hp=4ee9f57315b35e57ab2e68ff7e7f7ca47499334f;hpb=434838d201764c72889b2cd524fefe4dd76da3f8;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 4ee9f5731..4a34d3a5b 100644
--- a/integration-tests/org.argeo.slc.it.webapp/pom.xml
+++ b/integration-tests/org.argeo.slc.it.webapp/pom.xml
@@ -2,26 +2,16 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
4.0.0
- org.argeo.slc.it
- argeo-slc-it
+ org.argeo.slc.server
+ deploy
0.11.3-SNAPSHOT
- ..
+ ../../server/org.argeo.slc.siteserver
org.argeo.slc.it.webapp
jar
Argeo SLC Web Application Integration Tests
-
org.argeo.slc.maven
maven-argeo-osgi-plugin
@@ -35,12 +25,14 @@
false
- 5000
-clean
- ${basedir}/../../demo/site;in=*;ex=target
+
+ ${basedir}/../../demo/site;in=*;ex=target,
+ ${basedir}/../../server/org.argeo.slc.siteserver/bundles;in=*
+
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
@@ -89,28 +81,15 @@
-
- org.argeo.slc.server
- bundles
- ${project.version}
- pom
-
org.argeo.slc.runtime
org.argeo.slc.support.equinox
-
org.argeo.slc.runtime
- org.argeo.slc.support.equinox
- tests
- test
-
-
- org.springframework.osgi
- org.springframework.osgi.test
+ org.argeo.slc.server
test
@@ -118,6 +97,5 @@
org.argeo.slc.osgiboot
test
-
\ No newline at end of file