From: Mathieu Baudier <mbaudier@argeo.org>
Date: Fri, 26 Oct 2012 16:30:00 +0000 (+0000)
Subject: Fix demo pom
X-Git-Tag: argeo-slc-2.1.7~581
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=43a3c649ad953ccda587141f3c73b43fedf46813;p=gpl%2Fargeo-slc.git

Fix demo pom

git-svn-id: https://svn.argeo.org/slc/trunk@5661 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/demo/modules/pom.xml b/demo/modules/pom.xml
index ad1e44b89..fbb611482 100644
--- a/demo/modules/pom.xml
+++ b/demo/modules/pom.xml
@@ -3,9 +3,9 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.argeo.slc</groupId>
-		<!-- Note: parent is SLC Lib -->
-		<artifactId>lib</artifactId>
+		<artifactId>demo</artifactId>
 		<version>1.1.4-SNAPSHOT</version>
+		<relativePath>..</relativePath>
 	</parent>
 	<groupId>org.argeo.slc.demo</groupId>
 	<artifactId>modules</artifactId>
@@ -19,4 +19,71 @@
 		<module>org.argeo.slc.demo.maven</module>
 		<module>org.argeo.slc.demo.minimal</module>
 	</modules>
+	<properties>
+		<additionalImports.slc-lib>
+			com.jcraft.jsch;resolution:=optional,
+			org.apache.commons.exec;resolution:=optional,
+		</additionalImports.slc-lib>
+	</properties>
+	<build>
+		<resources>
+			<resource>
+				<directory>.</directory>
+				<includes>
+					<include>**</include>
+				</includes>
+				<excludes>
+					<exclude>.*</exclude>
+					<exclude>.*/**</exclude>
+					<exclude>pom.xml</exclude>
+					<exclude>build.properties</exclude>
+				</excludes>
+			</resource>
+		</resources>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<configuration>
+					<instructions>
+						<SLC-ExecutionModule>default</SLC-ExecutionModule>
+						<!-- Minimal imports + some optional convenience imports -->
+						<Import-Package>
+							*,
+							net.sf.cglib.core,
+							net.sf.cglib.proxy,
+							net.sf.cglib.reflect,
+							org.aopalliance.aop,
+							org.argeo.slc.core.execution,
+							org.argeo.slc.core.execution.tasks,
+							org.argeo.slc.execution,
+							org.argeo.slc.osgi,
+							org.argeo.slc.test,
+							org.springframework.aop,
+							org.springframework.aop.framework,
+							org.springframework.aop.scope,
+							org.springframework.beans.factory.config,
+							org.springframework.core.io,
+							${additionalImports.slc-lib}
+						</Import-Package>
+					</instructions>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+	<dependencies>
+		<dependency>
+			<groupId>org.argeo.slc</groupId>
+			<artifactId>org.argeo.slc.dep.minimal</artifactId>
+			<version>1.1.4-SNAPSHOT</version>
+			<type>pom</type>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.slc</groupId>
+			<artifactId>org.argeo.slc.dep.backend</artifactId>
+			<version>1.1.4-SNAPSHOT</version>
+			<type>pom</type>
+			<optional>true</optional>
+		</dependency>
+	</dependencies>
 </project>