Fix broken dependencies

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

diff --git a/demo/pom.xml b/demo/pom.xml
index 37ab5507c4acb171a8a2eeca28880586753b3a54..ed5c980c59e37638b3e7ff10133f5eb4c7154dbd 100644 (file)
--- a/demo/pom.xml
+++ b/demo/pom.xml
@@ -39,10 +39,9 @@
                                                        <execDir>target/exec/server</execDir>
                                                        <systemPropertiesFile>server.properties</systemPropertiesFile>
                                                        <systemProperties>
+                                                               <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>
@@ -74,9 +73,7 @@
                                                        <systemPropertiesFile>server_jcr.properties</systemPropertiesFile>
                                                        <systemProperties>
                                                                <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>
@@ -122,6 +119,11 @@
                                        <artifactId>org.argeo.slc.dep.agent</artifactId>
                                        <version>${project.version}</version>
                                </dependency>
+                               <dependency>
+                                       <groupId>org.argeo.slc.dep</groupId>
+                                       <artifactId>org.argeo.slc.dep.agent.extras</artifactId>
+                                       <version>${project.version}</version>
+                               </dependency>
                        </dependencies>
                </profile>
                <profile>
@@ -136,7 +138,6 @@
                                                        <systemPropertiesFile>slc_gis_position.properties</systemPropertiesFile>
                                                        <systemProperties>
                                                                <argeo.osgi.bundles>
-                                                                       ${basedir}/site;in=*;ex=pom.xml;ex=target,
                                                                        ${basedir}/../modules/gis;in=*;ex=pom.xml;ex=target
                                                                </argeo.osgi.bundles>
                                                        </systemProperties>
@@ -147,7 +148,7 @@
                        <dependencies>
                                <dependency>
                                        <groupId>org.argeo.slc.dep</groupId>
-                                       <artifactId>org.argeo.slc.dep.sdk</artifactId>
+                                       <artifactId>org.argeo.slc.dep.gis</artifactId>
                                        <version>${project.version}</version>
                                </dependency>
                        </dependencies>
@@ -231,7 +232,6 @@
                        <dependencies>
                                <dependency>
                                        <groupId>org.argeo.slc.dep</groupId>
-                                       <artifactId>org.argeo.slc.dep.server</artifactId>
                                        <version>${project.version}</version>
                                </dependency>
                                <dependency>