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 e031eb95d9b6feed637392b97a3005f65380a556..1c86dba39b475f0355c1a4368b7e6ec2967a3cd6 100644 (file)
--- a/integration-tests/org.argeo.slc.it.webapp/pom.xml
+++ b/integration-tests/org.argeo.slc.it.webapp/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>integration-tests</artifactId>
-               <version>0.12.2-SNAPSHOT</version>
+               <version>0.13.1-SNAPSHOT</version>
        </parent>
        <groupId>org.argeo.slc.it</groupId>
        <artifactId>org.argeo.slc.it.webapp</artifactId>
@@ -17,35 +17,32 @@
                                <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.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                                                 
+                                                       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>
@@ -87,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