Adapt to changes in Spring and OSGi (mostly generics)

[gpl/argeo-slc.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 532f92839e4769beec8726b5ebb58ba3acae1e49..b3f1eff57cc3cf690aba4b388d57e5d07bafc56c 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,36 +1,53 @@
-<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.commons</groupId>
                <artifactId>argeo-commons</artifactId>
-               <version>1.2.3</version>
+               <version>2.1.18-SNAPSHOT</version>
        </parent>
        <groupId>org.argeo.slc</groupId>
        <artifactId>argeo-slc</artifactId>
        <packaging>pom</packaging>
        <name>Argeo SLC</name>
-       <description>SLC is a framework integrating various build, deployment and testing technologies in order to build specific application life cycle management systems.</description>
-       <version>2.1.0</version>
+       <version>2.1.1-SNAPSHOT</version>
        <properties>
                <developmentCycle.slc>2.1</developmentCycle.slc>
-               <developmentCycle.startDate>2015-026-12</developmentCycle.startDate>
-               <version.slc>2.1.0</version.slc>
+               <developmentCycle.startDate>2015-02-12</developmentCycle.startDate>
+               <version.slc>2.1.1-SNAPSHOT</version.slc>
+               <!-- Libraries versions -->
+               <version.argeo-tp-extras>2.1.5</version.argeo-tp-extras>
        </properties>
        <modules>
-               <module>runtime</module>
-               <module>modules</module>
-               <module>plugins</module>
-               <module>lib</module>
+               <!-- Runtime -->
+               <module>org.argeo.slc.api</module>
+               <module>org.argeo.slc.core</module>
+               <module>org.argeo.slc.unit</module>
+               <module>org.argeo.slc.support</module>
+               <module>org.argeo.slc.repo</module>
+               <module>org.argeo.slc.factory</module>
+
+               <!-- Modules -->
+               <module>org.argeo.slc.agent</module>
+               <module>org.argeo.slc.node.jackrabbit</module>
+               <module>org.argeo.slc.agent.jcr</module>
+               <module>org.argeo.slc.server.repo</module>
+
+               <!-- UI -->
+               <module>org.argeo.slc.client.ui</module>
+               <!-- <module>org.argeo.slc.client.ui.dist</module> -->
+               <module>org.argeo.slc.client.rap</module>
+
+               <!-- <module>lib</module> -->
                <module>dep</module>
-               <module>archetypes</module>
-               <module>dist</module>
+               <!-- <module>dist</module> -->
                <module>demo</module>
        </modules>
        <url>http://projects.argeo.org/slc/</url>
        <scm>
-               <connection>scm:svn:https://svn.argeo.org/slc/tags/argeo-slc-2.1.0</connection>
-               <developerConnection>scm:svn:https://svn.argeo.org/slc/tags/argeo-slc-2.1.0</developerConnection>
-               <url>https://svn.argeo.org/slc/tags/argeo-slc-2.1.0</url>
+               <connection>scm:svn:https://svn.argeo.org/slc/trunk</connection>
+               <developerConnection>scm:svn:https://svn.argeo.org/slc/trunk</developerConnection>
+               <url>https://svn.argeo.org/slc/trunk</url>
        </scm>
        <inceptionYear>2007</inceptionYear>
        <licenses>
@@ -106,7 +123,16 @@ limitations under the License.
        <repositories>
                <repository>
                        <id>argeo-commons</id>
-                       <url>http://repo.argeo.org/data/public/java/argeo-commons-1.2</url>
+                       <url>http://repo.argeo.org/data/public/java/argeo-commons-2.1</url>
+                       <releases>
+                               <enabled>true</enabled>
+                               <updatePolicy>daily</updatePolicy>
+                               <checksumPolicy>warn</checksumPolicy>
+                       </releases>
+               </repository>
+               <repository>
+                       <id>argeo-tp-extras</id>
+                       <url>https://forge.argeo.org/data/public/java/argeo-tp-extras-2.1</url>
                        <releases>
                                <enabled>true</enabled>
                                <updatePolicy>daily</updatePolicy>
@@ -114,6 +140,14 @@ limitations under the License.
                        </releases>
                </repository>
        </repositories>
+       <dependencies>
+               <dependency>
+                       <groupId>org.argeo.tp.extras</groupId>
+                       <artifactId>argeo-tp-extras</artifactId>
+                       <version>${version.argeo-tp-extras}</version>
+                       <scope>provided</scope>
+               </dependency>
+       </dependencies>
        <distributionManagement>
                <repository>
                        <id>staging</id>
@@ -128,6 +162,26 @@ limitations under the License.
        <profiles>
                <profile>
                        <id>localrepo</id>
+                       <repositories>
+                               <repository>
+                                       <id>argeo-tp</id>
+                                       <url>http://localhost:7080/data/public/java/argeo-tp-${developmentCycle.argeo-commons}/</url>
+                                       <releases>
+                                               <enabled>true</enabled>
+                                               <updatePolicy>daily</updatePolicy>
+                                               <checksumPolicy>warn</checksumPolicy>
+                                       </releases>
+                               </repository>
+                               <repository>
+                                       <id>argeo-tp-extras</id>
+                                       <url>http://localhost:7080/data/public/java/argeo-tp-extras-2.1</url>
+                                       <releases>
+                                               <enabled>true</enabled>
+                                               <updatePolicy>daily</updatePolicy>
+                                               <checksumPolicy>warn</checksumPolicy>
+                                       </releases>
+                               </repository>
+                       </repositories>
                        <distributionManagement>
                                <repository>
                                        <id>staging</id>