X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=dep%2Forg.argeo.slc.dep.backend%2Fpom.xml;h=36ad10770f67fb8e3725ab7a719d970d0cc21e50;hb=e1ff0632d22efe6b4d1772c04258b6101cfcc04e;hp=6b4417ca65cbc905b86838c22b959c18535861a2;hpb=e43cd90b0d352e7aa4623637cd866546c6d3f2a1;p=gpl%2Fargeo-slc.git

diff --git a/dep/org.argeo.slc.dep.backend/pom.xml b/dep/org.argeo.slc.dep.backend/pom.xml
index 6b4417ca6..36ad10770 100644
--- a/dep/org.argeo.slc.dep.backend/pom.xml
+++ b/dep/org.argeo.slc.dep.backend/pom.xml
@@ -1,9 +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>
 		<artifactId>dep</artifactId>
-		<version>1.1.3-SNAPSHOT</version>
+		<version>1.1.12-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.slc.dep.backend</artifactId>
@@ -11,6 +12,15 @@
 	<description>Shared by RAP and pure server</description>
 	<build>
 		<plugins>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<configuration>
+					<instructions>
+						<SLC-ModularDistribution>default</SLC-ModularDistribution>
+					</instructions>
+				</configuration>
+			</plugin>
 			<plugin>
 				<groupId>org.argeo.maven.plugins</groupId>
 				<artifactId>maven-argeo-osgi-plugin</artifactId>
@@ -27,74 +37,53 @@
 		</plugins>
 	</build>
 	<dependencies>
-		<!-- SLC Agent -->
-		<dependency>
-			<groupId>org.argeo.slc</groupId>
-			<artifactId>org.argeo.slc.core</artifactId>
-			<version>1.1.3-SNAPSHOT</version>
-		</dependency>
+		<!-- Base -->
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
-			<artifactId>org.argeo.slc.support.simple</artifactId>
-			<version>1.1.3-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.slc</groupId>
-			<artifactId>org.argeo.slc.support.ant</artifactId>
-			<version>1.1.3-SNAPSHOT</version>
+			<artifactId>org.argeo.slc.dep.minimal</artifactId>
+			<version>1.1.12-SNAPSHOT</version>
+			<type>pom</type>
 		</dependency>
+
+		<!-- SLC Libs -->
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
-			<artifactId>org.argeo.slc.support.jcr</artifactId>
-			<version>1.1.3-SNAPSHOT</version>
+			<artifactId>org.argeo.slc.lib.repo</artifactId>
+			<version>1.1.12-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
-			<artifactId>org.argeo.slc.support.equinox</artifactId>
-			<version>1.1.3-SNAPSHOT</version>
+			<artifactId>org.argeo.slc.lib.jcr</artifactId>
+			<version>1.1.12-SNAPSHOT</version>
 		</dependency>
 
-		<!-- SLC Agent Modules -->
+		<!-- Extensions -->
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
-			<artifactId>org.argeo.slc.agent</artifactId>
-			<version>1.1.3-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.slc</groupId>
-			<artifactId>org.argeo.slc.agent.jcr</artifactId>
-			<version>1.1.3-SNAPSHOT</version>
+			<artifactId>org.argeo.slc.support.simple</artifactId>
+			<version>1.1.12-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
-			<artifactId>org.argeo.slc.node.jackrabbit</artifactId>
-			<version>1.1.3-SNAPSHOT</version>
+			<artifactId>org.argeo.slc.support.ant</artifactId>
+			<version>1.1.12-SNAPSHOT</version>
 		</dependency>
 
 		<!-- SLC Repo -->
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.repo</artifactId>
-			<version>1.1.3-SNAPSHOT</version>
+			<version>1.1.12-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.server.repo</artifactId>
-			<version>1.1.3-SNAPSHOT</version>
+			<version>1.1.12-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.server.repo.webapp</artifactId>
-			<version>1.1.3-SNAPSHOT</version>
-		</dependency>
-
-		<!-- Launcher -->
-		<dependency>
-			<groupId>org.argeo.slc</groupId>
-			<artifactId>org.argeo.slc.launcher</artifactId>
-			<version>1.1.3-SNAPSHOT</version>
-			<type>tar.gz</type>
-			<classifier>base</classifier>
+			<version>1.1.12-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Node -->
@@ -103,6 +92,14 @@
 			<artifactId>org.argeo.security.dep.node</artifactId>
 			<version>${version.argeo-commons}</version>
 			<type>pom</type>
+			<exclusions>
+				<exclusion>
+					<!-- Workaround for bug where catalina start add non slf4j logging to 
+						dependencies -->
+					<groupId>org.argeo.tp</groupId>
+					<artifactId>org.apache.commons.logging</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 	</dependencies>
 	<profiles>
@@ -163,7 +160,6 @@
 								</goals>
 								<configuration>
 									<name>slc-libs</name>
-									<copyright>2011 Argeo</copyright>
 									<mappings>
 										<mapping>
 											<directory>/usr/share/osgi</directory>
@@ -218,11 +214,8 @@
 													<!-- Core -->
 													<include>org.argeo.tp:org.aspectj.runtime</include>
 													<include>org.argeo.tp:org.aspectj.weaver</include>
+													<include>org.argeo.tp:net.sf.cglib</include>
 													<!-- Simple -->
-													<include>org.argeo.tp:com.jcraft.jsch</include>
-													<include>org.argeo.tp:org.quartz</include>
-													<include>org.argeo.tp:org.springframework.context.support</include>
-													<include>org.argeo.tp:javax.mail</include>
 													<include>org.argeo.tp:org.tmatesoft.svn</include>
 													<include>org.argeo.tp:org.redline_rpm</include>
 													<!-- Ant -->
@@ -233,7 +226,6 @@
 													<!-- Maven -->
 													<include>org.argeo.tp:org.sonatype.aether</include>
 													<!-- Misc -->
-													<include>org.argeo.tp:jxl</include>
 													<include>org.argeo.tp:biz.aQute.bndlib</include>
 												</includes>
 											</dependency>