[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 ed5c980c59e37638b3e7ff10133f5eb4c7154dbd..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>
@@ -52,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>
@@ -72,6 +71,7 @@
                                                        <execDir>target/exec/server</execDir>
                                                        <systemPropertiesFile>server_jcr.properties</systemPropertiesFile>
                                                        <systemProperties>
+                                                               <log4j.configuration>file:${basedir}/log4j.properties</log4j.configuration>
                                                                <argeo.osgi.bundles>
                                                                        ${basedir}/../modules/server;in=*;ex=pom.xml;ex=target;ex=.*,
                                                                </argeo.osgi.bundles>
@@ -84,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>
@@ -117,12 +117,12 @@
                                <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>${project.version}</version>
+                                       <version>${version.slc}</version>
                                </dependency>
                        </dependencies>
                </profile>
@@ -149,7 +149,7 @@
                                <dependency>
                                        <groupId>org.argeo.slc.dep</groupId>
                                        <artifactId>org.argeo.slc.dep.gis</artifactId>
-                                       <version>${project.version}</version>
+                                       <version>${version.slc}</version>
                                </dependency>
                        </dependencies>
                </profile>
@@ -183,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>
@@ -232,7 +232,7 @@
                        <dependencies>
                                <dependency>
                                        <groupId>org.argeo.slc.dep</groupId>
-                                       <version>${project.version}</version>
+                                       <version>${version.slc}</version>
                                </dependency>
                                <dependency>
                                        <groupId>org.argeo.slc.server</groupId>