[maven-release-plugin] prepare for next development iteration

[gpl/argeo-slc.git] / demo / pom.xml

diff --git a/demo/pom.xml b/demo/pom.xml
index eecd2551310910f53e400ea2de1644b60df4146d..b3aa651758892fadb4efa5c2a125d643cfa24995 100644 (file)
--- a/demo/pom.xml
+++ b/demo/pom.xml
@@ -3,7 +3,7 @@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>argeo-slc</artifactId>
-               <version>0.12.2-SNAPSHOT</version>
+               <version>1.1.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <groupId>org.argeo.slc</groupId>
@@ -11,14 +11,13 @@
        <packaging>pom</packaging>
        <name>SLC Demo</name>
        <modules>
-               <module>site</module>
+               <module>modules</module>
        </modules>
        <build>
                <plugins>
                        <plugin>
                                <groupId>org.argeo.maven.plugins</groupId>
                                <artifactId>maven-argeo-osgi-plugin</artifactId>
-                               <version>${version.maven-argeo-osgi}</version>
                                <configuration>
                                        <argsToAppend>
                                                <arg>-clean</arg>
@@ -37,19 +36,11 @@
                                                <artifactId>maven-argeo-osgi-plugin</artifactId>
                                                <configuration>
                                                        <execDir>target/exec/server</execDir>
+                                                       <systemPropertiesFile>server.properties</systemPropertiesFile>
                                                        <systemProperties>
-                                                               <argeo.osgi.start>
-                                                                       org.springframework.osgi.extender,
-                                                                       org.argeo.server.ads.server,
-                                                                       org.argeo.slc.server.hsqldb,
-                                                                       org.argeo.slc.server.hibernate,
-                                                                       org.argeo.slc.server.main,
-                                                                       org.argeo.slc.ria
-                                                               </argeo.osgi.start>
+                                                               <log4j.configuration>file:${basedir}/log4j.properties</log4j.configuration>
                                                                <argeo.osgi.bundles>
-                                                                       ${basedir}/site;in=*;ex=pom.xml;ex=target,
                                                                        ${basedir}/../modules/server;in=*;ex=pom.xml;ex=target;ex=.*,
-                                                                       ${basedir}/../modules/agent;in=*;ex=pom.xml;ex=target
                                                                </argeo.osgi.bundles>
                                                        </systemProperties>
                                                </configuration>
@@ -60,7 +51,7 @@
                                <dependency>
                                        <groupId>org.argeo.slc.dep</groupId>
                                        <artifactId>org.argeo.slc.dep.server</artifactId>
-                                       <version>${project.version}</version>
+                                       <version>${version.slc}</version>
                                </dependency>
                                <dependency>
                                        <groupId>org.argeo.slc.server</groupId>
@@ -78,18 +69,11 @@
                                                <artifactId>maven-argeo-osgi-plugin</artifactId>
                                                <configuration>
                                                        <execDir>target/exec/server</execDir>
+                                                       <systemPropertiesFile>server_jcr.properties</systemPropertiesFile>
                                                        <systemProperties>
-                                                               <argeo.osgi.start>
-                                                                       org.springframework.osgi.extender,
-                                                                       org.argeo.server.ads.server,
-                                                                       org.argeo.slc.server.jcr,
-                                                                       org.argeo.slc.server.main,
-                                                                       org.argeo.slc.ria
-                                                               </argeo.osgi.start>
+                                                               <log4j.configuration>file:${basedir}/log4j.properties</log4j.configuration>
                                                                <argeo.osgi.bundles>
-                                                                       ${basedir}/site;in=*;ex=pom.xml;ex=target,
                                                                        ${basedir}/../modules/server;in=*;ex=pom.xml;ex=target;ex=.*,
-                                                                       ${basedir}/../modules/agent;in=*;ex=pom.xml;ex=target
                                                                </argeo.osgi.bundles>
                                                        </systemProperties>
                                                </configuration>
@@ -100,7 +84,7 @@
                                <dependency>
                                        <groupId>org.argeo.slc.dep</groupId>
                                        <artifactId>org.argeo.slc.dep.server</artifactId>
-                                       <version>${project.version}</version>
+                                       <version>${version.slc}</version>
                                </dependency>
                                <dependency>
                                        <groupId>org.argeo.slc.server</groupId>
@@ -118,13 +102,8 @@
                                                <artifactId>maven-argeo-osgi-plugin</artifactId>
                                                <configuration>
                                                        <execDir>target/exec/agent</execDir>
+                                                       <systemPropertiesFile>agent.properties</systemPropertiesFile>
                                                        <systemProperties>
-                                                               <argeo.osgi.start>
-                                                                       org.springframework.osgi.extender,
-                                                                       org.argeo.slc.support.equinox,
-                                                                       org.argeo.slc.agent,
-                                                                       org.argeo.slc.agent.jms
-                                                               </argeo.osgi.start>
                                                                <argeo.osgi.bundles>
                                                                        ${basedir}/site;in=*;ex=pom.xml;ex=target,
                                                                        ${basedir}/../modules/agent;in=*;ex=pom.xml;ex=target
@@ -138,7 +117,39 @@
                                <dependency>
                                        <groupId>org.argeo.slc.dep</groupId>
                                        <artifactId>org.argeo.slc.dep.agent</artifactId>
-                                       <version>${project.version}</version>
+                                       <version>${version.slc}</version>
+                               </dependency>
+                               <dependency>
+                                       <groupId>org.argeo.slc.dep</groupId>
+                                       <artifactId>org.argeo.slc.dep.agent.extras</artifactId>
+                                       <version>${version.slc}</version>
+                               </dependency>
+                       </dependencies>
+               </profile>
+               <profile>
+                       <id>slc_gis_position</id>
+                       <build>
+                               <plugins>
+                                       <plugin>
+                                               <groupId>org.argeo.maven.plugins</groupId>
+                                               <artifactId>maven-argeo-osgi-plugin</artifactId>
+                                               <configuration>
+                                                       <execDir>target/exec/agent</execDir>
+                                                       <systemPropertiesFile>slc_gis_position.properties</systemPropertiesFile>
+                                                       <systemProperties>
+                                                               <argeo.osgi.bundles>
+                                                                       ${basedir}/../modules/gis;in=*;ex=pom.xml;ex=target
+                                                               </argeo.osgi.bundles>
+                                                       </systemProperties>
+                                               </configuration>
+                                       </plugin>
+                               </plugins>
+                       </build>
+                       <dependencies>
+                               <dependency>
+                                       <groupId>org.argeo.slc.dep</groupId>
+                                       <artifactId>org.argeo.slc.dep.gis</artifactId>
+                                       <version>${version.slc}</version>
                                </dependency>
                        </dependencies>
                </profile>
@@ -172,7 +183,7 @@
                                <dependency>
                                        <groupId>org.argeo.slc.dep</groupId>
                                        <artifactId>org.argeo.slc.dep.detached</artifactId>
-                                       <version>${project.version}</version>
+                                       <version>${version.slc}</version>
                                </dependency>
                                <dependency>
                                        <groupId>net.sourceforge.mx4j</groupId>
@@ -221,8 +232,7 @@
                        <dependencies>
                                <dependency>
                                        <groupId>org.argeo.slc.dep</groupId>
-                                       <artifactId>org.argeo.slc.dep.server</artifactId>
-                                       <version>${project.version}</version>
+                                       <version>${version.slc}</version>
                                </dependency>
                                <dependency>
                                        <groupId>org.argeo.slc.server</groupId>