X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=demo%2Fmodules%2Fpom.xml;h=105634e930f0a91272196c475be5100d980394cc;hb=b36c62642bd0db11b3133b369cc026fd4b7a1ec6;hp=ad1e44b896e33680d136fd3e13539c7142261843;hpb=2599d7187ce8b15ef9b9c6e0bf3292bf25cf9a46;p=gpl%2Fargeo-slc.git

diff --git a/demo/modules/pom.xml b/demo/modules/pom.xml
index ad1e44b89..105634e93 100644
--- a/demo/modules/pom.xml
+++ b/demo/modules/pom.xml
@@ -1,11 +1,10 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.argeo.slc</groupId>
-		<!-- Note: parent is SLC Lib -->
-		<artifactId>lib</artifactId>
-		<version>1.1.4-SNAPSHOT</version>
+		<artifactId>demo</artifactId>
+		<version>2.3-SNAPSHOT</version>
+		<relativePath>..</relativePath>
 	</parent>
 	<groupId>org.argeo.slc.demo</groupId>
 	<artifactId>modules</artifactId>
@@ -14,9 +13,64 @@
 	<modules>
 		<module>org.argeo.slc.demo.ant</module>
 		<module>org.argeo.slc.demo.basic</module>
-		<module>org.argeo.slc.demo.det</module>
-		<module>org.argeo.slc.demo.detached</module>
-		<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>
+		<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>
+							org.springframework.cglib.proxy,
+							org.springframework.cglib.core,
+							org.springframework.cglib.reflect,
+							org.aopalliance.aop,
+							org.argeo.slc.primitive,
+							org.argeo.slc.attachment,
+							org.argeo.slc.runtime,
+							org.argeo.slc.runtime.test,
+							org.argeo.slc.core.execution,
+							org.argeo.slc.core.execution.tasks,
+							org.argeo.slc.core.test,
+							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>2.3-SNAPSHOT</version>
+			<type>pom</type>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.slc</groupId>
+			<artifactId>org.argeo.slc.dep.backend</artifactId>
+			<version>2.3-SNAPSHOT</version>
+			<type>pom</type>
+			<optional>true</optional>
+		</dependency>
+	</dependencies>
 </project>