X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=demo%2Fmodules%2Fpom.xml;h=4d08eb9343461ad69d225b976b7278e83e3e11df;hb=eafbb773311edce4044f5a6cbe6d3b343adbd98d;hp=c8cf864311591dde35d68e7f72c86b63d3fb1297;hpb=cc62743f351e03634604fdd4b66e6e0feebfe02b;p=gpl%2Fargeo-slc.git

diff --git a/demo/modules/pom.xml b/demo/modules/pom.xml
index c8cf86431..4d08eb934 100644
--- a/demo/modules/pom.xml
+++ b/demo/modules/pom.xml
@@ -1,10 +1,9 @@
-<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>
 		<artifactId>demo</artifactId>
-		<version>0.13.2-SNAPSHOT</version>
+		<version>2.1.7</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<groupId>org.argeo.slc.demo</groupId>
@@ -14,25 +13,18 @@
 	<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.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>
-		<resources>
-			<resource>
-				<directory>.</directory>
-				<includes>
-					<include>**</include>
-				</includes>
-				<excludes>
-					<exclude>.*</exclude>
-					<exclude>pom.xml</exclude>
-					<exclude>build.properties</exclude>
-				</excludes>
-			</resource>
-		</resources>
 		<plugins>
 			<plugin>
 				<groupId>org.apache.felix</groupId>
@@ -40,46 +32,43 @@
 				<configuration>
 					<instructions>
 						<SLC-ExecutionModule>default</SLC-ExecutionModule>
-						<!-- Minimal imports -->
+						<!-- Minimal imports + some optional convenience imports -->
 						<Import-Package>
-							*,
-							net.sf.cglib.core;resolution:=optional,
-							net.sf.cglib.proxy;resolution:=optional,
-							net.sf.cglib.reflect;resolution:=optional,
+							org.springframework.cglib.proxy,
+							org.springframework.cglib.core,
+							org.springframework.cglib.reflect,
 							org.aopalliance.aop,
 							org.argeo.slc.core.execution,
 							org.argeo.slc.core.execution.tasks,
-							org.argeo.slc.core.structure.tree;resolution:=optional,
 							org.argeo.slc.execution,
 							org.argeo.slc.osgi,
-							org.argeo.slc.test;resolution:=optional,
-							org.argeo.slc.structure;resolution:=optional,
+							org.argeo.slc.test,
 							org.springframework.aop,
 							org.springframework.aop.framework,
 							org.springframework.aop.scope,
 							org.springframework.beans.factory.config,
-							org.springframework.core.io,						
+							org.springframework.core.io,
+							${additionalImports.slc-lib},
+							*
 						</Import-Package>
 					</instructions>
 				</configuration>
 			</plugin>
-			<plugin>
-				<artifactId>maven-clean-plugin</artifactId>
-				<configuration>
-					<filesets>
-						<fileset>
-							<directory>META-INF</directory>
-							<includes>
-								<include>MANIFEST.MF</include>
-							</includes>
-						</fileset>
-					</filesets>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-			</plugin>
 		</plugins>
 	</build>
+	<dependencies>
+		<dependency>
+			<groupId>org.argeo.slc</groupId>
+			<artifactId>org.argeo.slc.dep.minimal</artifactId>
+			<version>2.1.7</version>
+			<type>pom</type>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.slc</groupId>
+			<artifactId>org.argeo.slc.dep.backend</artifactId>
+			<version>2.1.7</version>
+			<type>pom</type>
+			<optional>true</optional>
+		</dependency>
+	</dependencies>
 </project>