X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=integration-tests%2Forg.argeo.slc.it.webapp%2Fpom.xml;h=449acadb31e5aadffdb0c19e66e0b3169685aa00;hb=ddf608d7eaf27926d747a9e92f3527a6982db37f;hp=8464e034bb2e938310e462973ee94bd21565ca7c;hpb=3f86e5c908d7db1d85e3f12b0798104654a1e12b;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 8464e034b..449acadb3 100644 --- a/integration-tests/org.argeo.slc.it.webapp/pom.xml +++ b/integration-tests/org.argeo.slc.it.webapp/pom.xml @@ -1,11 +1,10 @@ - + 4.0.0 - org.argeo.slc.it - argeo-slc-it - 0.11.3-SNAPSHOT - .. + org.argeo.slc.server + deploy + 0.11.4-SNAPSHOT + ../../server/org.argeo.slc.siteserver org.argeo.slc.it.webapp jar @@ -29,7 +28,10 @@ -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, @@ -78,18 +80,11 @@ - - org.argeo.slc.server - bundles - ${project.version} - pom - org.argeo.slc.runtime org.argeo.slc.support.equinox - org.argeo.slc.runtime