X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=demo%2Fmodules%2Fpom.xml;h=cf5b3699bad41df8a891882643c4245569c5c45a;hb=936a7c5493687bacf7ae9032787d8d2c1481732e;hp=fbb6114829fd6150a1fc4a518eebaae46d8fc05b;hpb=43a3c649ad953ccda587141f3c73b43fedf46813;p=gpl%2Fargeo-slc.git

diff --git a/demo/modules/pom.xml b/demo/modules/pom.xml
index fbb611482..cf5b3699b 100644
--- a/demo/modules/pom.xml
+++ b/demo/modules/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.argeo.slc</groupId>
 		<artifactId>demo</artifactId>
-		<version>1.1.4-SNAPSHOT</version>
+		<version>2.1.1-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<groupId>org.argeo.slc.demo</groupId>
@@ -14,9 +14,9 @@
 	<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>
@@ -26,20 +26,6 @@
 		</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>
@@ -49,10 +35,9 @@
 						<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.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,
@@ -64,7 +49,8 @@
 							org.springframework.aop.scope,
 							org.springframework.beans.factory.config,
 							org.springframework.core.io,
-							${additionalImports.slc-lib}
+							${additionalImports.slc-lib},
+							*
 						</Import-Package>
 					</instructions>
 				</configuration>
@@ -75,13 +61,13 @@
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.dep.minimal</artifactId>
-			<version>1.1.4-SNAPSHOT</version>
+			<version>2.1.1-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>
+			<version>2.1.1-SNAPSHOT</version>
 			<type>pom</type>
 			<optional>true</optional>
 		</dependency>