Remove bundles conflicting with Commons v1.2

[gpl/argeo-slc.git] / dep / org.argeo.slc.dep.backend / pom.xml

diff --git a/dep/org.argeo.slc.dep.backend/pom.xml b/dep/org.argeo.slc.dep.backend/pom.xml
index a7f962f58589f1eef05f576b4966748d3a747d5d..1f3626588a3d1dbc0f28440eaafc65a1fcdc4b48 100644 (file)
--- 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.9-SNAPSHOT</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.9-SNAPSHOT</version>
+                       <version>1.1.12-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.slc.support.simple</artifactId>
-                       <version>1.1.9-SNAPSHOT</version>
+                       <version>1.1.12-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.slc.support.ant</artifactId>
-                       <version>1.1.9-SNAPSHOT</version>
+                       <version>1.1.12-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.slc.support.jcr</artifactId>
-                       <version>1.1.9-SNAPSHOT</version>
+                       <version>1.1.12-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.slc.support.equinox</artifactId>
-                       <version>1.1.9-SNAPSHOT</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.9-SNAPSHOT</version>
+                       <version>1.1.12-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.slc.agent.jcr</artifactId>
-                       <version>1.1.9-SNAPSHOT</version>
+                       <version>1.1.12-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.slc.node.jackrabbit</artifactId>
-                       <version>1.1.9-SNAPSHOT</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.9-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.9-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.9-SNAPSHOT</version>
-               </dependency>
-
-               <!-- Launcher -->
-               <dependency>
-                       <groupId>org.argeo.slc</groupId>
-                       <artifactId>org.argeo.slc.launcher</artifactId>
-                       <version>1.1.9-SNAPSHOT</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,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 -->