X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=dep%2Forg.argeo.slc.dep.backend%2Fpom.xml;h=1f3626588a3d1dbc0f28440eaafc65a1fcdc4b48;hb=dab62aa9e8931f455e95711b348b4f961c7d91ce;hp=af6d785c0ca561218900dbb180ad939f7236a3ed;hpb=6b4bb310a0887d5ce1ad97ec03168c9c941e8351;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 af6d785c0..1f3626588 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.5</version>
+		<version>1.1.12-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.slc.dep.backend</artifactId>
@@ -40,70 +41,61 @@
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.core</artifactId>
-			<version>1.1.5</version>
+			<version>1.1.12-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.support.simple</artifactId>
-			<version>1.1.5</version>
+			<version>1.1.12-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.support.ant</artifactId>
-			<version>1.1.5</version>
+			<version>1.1.12-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.support.jcr</artifactId>
-			<version>1.1.5</version>
+			<version>1.1.12-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.support.equinox</artifactId>
-			<version>1.1.5</version>
+			<version>1.1.12-SNAPSHOT</version>
 		</dependency>
 
 		<!-- SLC Agent Modules -->
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.agent</artifactId>
-			<version>1.1.5</version>
+			<version>1.1.12-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.agent.jcr</artifactId>
-			<version>1.1.5</version>
+			<version>1.1.12-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.node.jackrabbit</artifactId>
-			<version>1.1.5</version>
+			<version>1.1.12-SNAPSHOT</version>
 		</dependency>
 
 		<!-- SLC Repo -->
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.repo</artifactId>
-			<version>1.1.5</version>
+			<version>1.1.12-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.server.repo</artifactId>
-			<version>1.1.5</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.5</version>
-		</dependency>
-
-		<!-- Launcher -->
-		<dependency>
-			<groupId>org.argeo.slc</groupId>
-			<artifactId>org.argeo.slc.launcher</artifactId>
-			<version>1.1.5</version>
-			<type>tar.gz</type>
-			<classifier>base</classifier>
+			<version>1.1.12-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Node -->
@@ -112,6 +104,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>
@@ -227,10 +227,6 @@
 													<include>org.argeo.tp:org.aspectj.runtime</include>
 													<include>org.argeo.tp:org.aspectj.weaver</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 -->
@@ -241,7 +237,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>