X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=lib%2Fpom.xml;h=081128c2619f83d55449f518ac9a1279fe6a8d2d;hb=cfed07239f093d6ed83017fe27caf775cd8515af;hp=b53cc94477a2e9ece5c7ae4b47db3f2856cdbed8;hpb=2599d7187ce8b15ef9b9c6e0bf3292bf25cf9a46;p=gpl%2Fargeo-slc.git

diff --git a/lib/pom.xml b/lib/pom.xml
index b53cc9447..081128c26 100644
--- a/lib/pom.xml
+++ b/lib/pom.xml
@@ -1,16 +1,21 @@
-<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>argeo-slc</artifactId>
-		<version>1.1.4-SNAPSHOT</version>
+		<version>2.1.18-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>lib</artifactId>
 	<packaging>pom</packaging>
 	<name>SLC Standard Libs</name>
 	<description>SLC execution modules for generic tasks, to be used as parent pom</description>
+	<modules>
+		<module>org.argeo.slc.lib.build</module>
+		<module>org.argeo.slc.lib.jcr</module>
+		<module>org.argeo.slc.lib.repo</module>
+		<module>org.argeo.slc.lib.rpmfactory</module>
+	</modules>
 	<properties>
 		<additionalImports.slc-lib>
 			com.jcraft.jsch;resolution:=optional,
@@ -18,20 +23,20 @@
 		</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>
+<!-- 		<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>
@@ -41,22 +46,23 @@
 						<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.springframework.cglib.proxy;resolution:="optional",
+							org.springframework.cglib.core;resolution:="optional",
+							org.springframework.cglib.reflect;resolution:="optional",
+							org.aopalliance.aop;resolution:="optional",
+							org.argeo.slc.runtime,
+							org.argeo.slc.core.execution;resolution:="optional",
+							org.argeo.slc.core.execution.tasks;resolution:="optional",
 							org.argeo.slc.execution,
-							org.argeo.slc.osgi,
+							org.argeo.slc.osgi;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,
-							${additionalImports.slc-lib}
+							org.springframework.aop;resolution:="optional",
+							org.springframework.aop.framework;resolution:="optional",
+							org.springframework.aop.scope;resolution:="optional",
+							org.springframework.beans.factory.config;resolution:="optional",
+							org.springframework.core.io;resolution:="optional",
+							${additionalImports.slc-lib},
+							*
 						</Import-Package>
 					</instructions>
 				</configuration>
@@ -67,15 +73,8 @@
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.dep.minimal</artifactId>
-			<version>1.1.4-SNAPSHOT</version>
+			<version>2.1.18-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>