[maven-release-plugin] copy for tag argeo-slc-all-0.11.3

[gpl/argeo-slc.git] / integration-tests / org.argeo.slc.it.webapp / pom.xml

diff --git a/integration-tests/org.argeo.slc.it.webapp/pom.xml b/integration-tests/org.argeo.slc.it.webapp/pom.xml
index b2f369655c8743c75bd6a174227753ed22165afd..2b69a79e69bbf979baa946971ff677065cdcc585 100644 (file)
--- a/integration-tests/org.argeo.slc.it.webapp/pom.xml
+++ b/integration-tests/org.argeo.slc.it.webapp/pom.xml
@@ -1,27 +1,16 @@
-<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.it</groupId>
-               <artifactId>argeo-slc-it</artifactId>
-               <version>0.11.3-SNAPSHOT</version>
-               <relativePath>..</relativePath>
+               <groupId>org.argeo.slc.server</groupId>
+               <artifactId>deploy</artifactId>
+               <version>0.11.3</version>
+               <relativePath>../../server/org.argeo.slc.siteserver</relativePath>
        </parent>
        <artifactId>org.argeo.slc.it.webapp</artifactId>
        <packaging>jar</packaging>
        <name>Argeo SLC Web Application Integration Tests</name>
        <build>
                <plugins>
-                       <!--
-                               <plugin> <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-dependency-plugin</artifactId> <executions>
-                               <execution> <id>copy-dependencies</id>
-                               <phase>pre-integration-test</phase> <goals>
-                               <goal>copy-dependencies</goal> </goals> <configuration>
-                               <overWriteReleases>true</overWriteReleases>
-                               <overWriteSnapshots>true</overWriteSnapshots> </configuration>
-                               </execution> </executions> </plugin>
-                       -->
                        <plugin>
                                <groupId>org.argeo.slc.maven</groupId>
                                <artifactId>maven-argeo-osgi-plugin</artifactId>
@@ -39,7 +28,10 @@
                                                                <arg>-clean</arg>
                                                        </argsToAppend>
                                                        <systemProperties>
-                                                               <slc.osgi.bundles>${basedir}/../../demo/site;in=*;ex=target</slc.osgi.bundles>
+                                                               <slc.osgi.bundles>
+                                                                       ${basedir}/../../demo/site;in=*;ex=target,
+                                                                       ${basedir}/../../server/org.argeo.slc.siteserver/bundles;in=*
+                                                               </slc.osgi.bundles>
                                                                <slc.osgi.start>
                                                                        org.argeo.dep.osgi.catalina.start,
                                                                        org.springframework.osgi.extender,
@@ -88,23 +80,15 @@
        </build>
        <dependencies>
                <!--  Server -->
-               <dependency>
-                       <groupId>org.argeo.slc.server</groupId>
-                       <artifactId>bundles</artifactId>
-                       <version>${project.version}</version>
-                       <type>pom</type>
-               </dependency>
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.support.equinox</artifactId>
                </dependency>
 
-
                <!-- TEST -->
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.server</artifactId>
-                       <classifier>tests</classifier>
                        <scope>test</scope>
                </dependency>
                <dependency>