Merge remote-tracking branch 'origin/master' into testing

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

diff --git a/pom.xml b/pom.xml
index 9431b2d668805394b0add9f7e8c24451732ca8e3..661b19441c5e571ba67898ce0db3eb21a4bd3001 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -3,36 +3,40 @@
        <parent>
                <groupId>org.argeo.maven</groupId>
                <artifactId>argeo-osgi-parent</artifactId>
-               <version>2.1.3</version>
+               <version>2.1.4-SNAPSHOT</version>
        </parent>
        <groupId>org.argeo.slc</groupId>
        <artifactId>argeo-slc</artifactId>
        <packaging>pom</packaging>
        <name>Argeo SLC</name>
-       <version>2.1.18-SNAPSHOT</version>
+       <version>2.1-SNAPSHOT</version>
        <properties>
+               <version.context>testing</version.context>
                <version.argeo-tp>2.1.27</version.argeo-tp>
                <version.argeo-tp-extras>2.1.13</version.argeo-tp-extras>
-               <version.argeo-commons>2.1.104-SNAPSHOT</version.argeo-commons>
+               <version.argeo-commons>2.1-SNAPSHOT</version.argeo-commons>
 
-               <version.slc>2.1.18-SNAPSHOT</version.slc>
                <developmentCycle.startDate>2015-02-12</developmentCycle.startDate>
                <developmentCycle.slc>2.1</developmentCycle.slc>
-               <version.argeo-commons-legacy>2.1.86</version.argeo-commons-legacy>
-
-               <argeo.rpm.stagingRepository>/srv/rpmfactory/testing/argeo-osgi-2/argeo</argeo.rpm.stagingRepository>
+               <version.argeo-commons-legacy>2.1.87-SNAPSHOT</version.argeo-commons-legacy>
        </properties>
        <modules>
-               <!-- Legacy UI -->
-               <module>legacy</module>
+               <!-- SLC framework -->
+               <module>org.argeo.slc.api</module>
+               <module>org.argeo.slc.runtime</module>
+               <module>org.argeo.slc.jcr</module>
+               <module>org.argeo.slc.repo</module>
+               <module>org.argeo.slc.factory</module>
+               
+               <!-- CMS extensions -->
                <module>cms</module>
 
                <!-- Distribution -->
-               <module>lib</module>
                <module>dep</module>
-               <module>dist</module>
-               <module>demo</module>
                <module>ide</module>
+
+               <!-- Legacy -->
+               <module>legacy</module>
        </modules>
        <url>http://projects.argeo.org/slc/</url>
        <scm>
@@ -52,6 +56,29 @@
                        <distribution>repo</distribution>
                </license>
        </licenses>
+       <dependencies>
+               <dependency>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>argeo-tp</artifactId>
+                       <version>${version.argeo-tp}</version>
+                       <scope>provided</scope>
+                       <exclusions>
+                               <exclusion>
+                                       <groupId>org.argeo.tp.apache</groupId>
+                                       <artifactId>org.apache.xerces</artifactId>
+                               </exclusion>
+                               <!-- Avoid slf4j implementations lurking in the classpath. -->
+                               <exclusion>
+                                       <groupId>org.argeo.tp.sdk</groupId>
+                                       <artifactId>biz.aQute.bndlib</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.argeo.tp.misc</groupId>
+                                       <artifactId>slf4j.osgi</artifactId>
+                               </exclusion>
+                       </exclusions>
+               </dependency>
+       </dependencies>
        <dependencyManagement>
                <dependencies>
                        <dependency>
@@ -102,6 +129,17 @@
                                <enabled>false</enabled>
                        </snapshots>
                </repository>
+               <!-- Disable Maven default repository -->
+               <repository>
+                       <id>central</id>
+                       <url>http://repo1.maven.org/maven2</url>
+                       <releases>
+                               <enabled>false</enabled>
+                       </releases>
+                       <snapshots>
+                               <enabled>false</enabled>
+                       </snapshots>
+               </repository>
        </repositories>
        <distributionManagement>
                <site>