User ${version.slc} instead of ${project.version}

[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 4ee9f57315b35e57ab2e68ff7e7f7ca47499334f..1c86dba39b475f0355c1a4368b7e6ec2967a3cd6 100644 (file)
--- a/integration-tests/org.argeo.slc.it.webapp/pom.xml
+++ b/integration-tests/org.argeo.slc.it.webapp/pom.xml
@@ -2,30 +2,49 @@
        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</groupId>
+               <artifactId>integration-tests</artifactId>
+               <version>0.13.1-SNAPSHOT</version>
        </parent>
+       <groupId>org.argeo.slc.it</groupId>
        <artifactId>org.argeo.slc.it.webapp</artifactId>
        <packaging>jar</packaging>
-       <name>Argeo SLC Web Application Integration Tests</name>
+       <name>SLC Integration Tests Web Application</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>
+                               <groupId>org.argeo.maven.plugins</groupId>
                                <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.h2,
+                                                       org.argeo.slc.server.hibernate,
+                                                       org.argeo.slc.ria,
+                                                       org.argeo.slc.agent,
+                                                       org.argeo.slc.agent.jms,
+                                                       org.argeo.slc.demo.minimal,
+                                                       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>
                                        <execution>
                                                <id>equinox-start</id>
@@ -35,26 +54,6 @@
                                                </goals>
                                                <configuration>
                                                        <wait>false</wait>
-                                                       <pause>5000</pause>
-                                                       <argsToAppend>
-                                                               <arg>-clean</arg>
-                                                       </argsToAppend>
-                                                       <systemProperties>
-                                                               <slc.osgi.bundles>${basedir}/../../demo/site;in=*;ex=target</slc.osgi.bundles>
-                                                               <slc.osgi.start>
-                                                                       org.argeo.dep.osgi.catalina.start,
-                                                                       org.springframework.osgi.extender,
-                                                                       org.springframework.osgi.web.extender,
-                                                                       org.springframework.osgi.samples.simplewebapp,
-                                                                       org.argeo.slc.server.activemq,
-                                                                       org.argeo.slc.server.hsqldb,
-                                                                       org.argeo.slc.server.hibernate,
-                                                                       org.argeo.slc.server.services,
-                                                                       org.argeo.slc.server.jms,
-                                                                       org.argeo.slc.webapp,
-                                                                       org.argeo.slc.ria
-                                                               </slc.osgi.start>
-                                                       </systemProperties>
                                                </configuration>
                                        </execution>
                                        <execution>
@@ -85,39 +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>
-               <!--  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>
+                       <groupId>org.argeo.slc.dep</groupId>
+                       <artifactId>org.argeo.slc.dep.sdk.rcp</artifactId>
+                       <version>${version.slc}</version>
                </dependency>
-
-
-               <!-- TEST -->
+               <!-- Unit Tests -->
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
-                       <artifactId>org.argeo.slc.support.equinox</artifactId>
-                       <classifier>tests</classifier>
+                       <artifactId>org.argeo.slc.unit</artifactId>
                        <scope>test</scope>
+                       <version>${version.slc}</version>
                </dependency>
-               <dependency>
-                       <groupId>org.springframework.osgi</groupId>
-                       <artifactId>org.springframework.osgi.test</artifactId>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.slc.runtime</groupId>
-                       <artifactId>org.argeo.slc.osgiboot</artifactId>
-                       <scope>test</scope>
-               </dependency>
-
        </dependencies>
 </project>
\ No newline at end of file