From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 14 Mar 2013 14:38:32 +0000 (+0000)
Subject: Remove bundles conflicting with Commons v1.2
X-Git-Tag: argeo-slc-2.1.7~407
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=dab62aa9e8931f455e95711b348b4f961c7d91ce;p=gpl%2Fargeo-slc.git

Remove bundles conflicting with Commons v1.2

git-svn-id: https://svn.argeo.org/slc/trunk@6133 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/dep/org.argeo.slc.dep.backend/pom.xml b/dep/org.argeo.slc.dep.backend/pom.xml
index f2b4fc2dd..1f3626588 100644
--- a/dep/org.argeo.slc.dep.backend/pom.xml
+++ b/dep/org.argeo.slc.dep.backend/pom.xml
@@ -1,4 +1,5 @@
-<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>
@@ -96,7 +97,7 @@
 			<artifactId>org.argeo.slc.server.repo.webapp</artifactId>
 			<version>1.1.12-SNAPSHOT</version>
 		</dependency>
-		
+
 		<!-- Node -->
 		<dependency>
 			<groupId>org.argeo.commons.security</groupId>
@@ -226,8 +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.tmatesoft.svn</include>
 													<include>org.argeo.tp:org.redline_rpm</include>
 													<!-- Ant -->