X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=a82726ca6ed7dbafe55729c47323c8cb154fece7;hb=fbc8548c95a91bb8e4866ab02d0e0fb4aea4239e;hp=2dc8806d55b64a2a716fe9b76773d0923be73973;hpb=b43c971a708ea0ec686bb33a4bcca58ee5837406;p=gpl%2Fargeo-slc.git

diff --git a/pom.xml b/pom.xml
index 2dc8806d5..a82726ca6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,25 +1,36 @@
-<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>2.1.76-SNAPSHOT</version>
+		<groupId>org.argeo.maven</groupId>
+		<artifactId>argeo-osgi-parent</artifactId>
+		<version>2.1.2</version>
 	</parent>
 	<groupId>org.argeo.slc</groupId>
 	<artifactId>argeo-slc</artifactId>
 	<packaging>pom</packaging>
 	<name>Argeo SLC</name>
-	<version>2.1.15-SNAPSHOT</version>
+	<version>2.1.17-SNAPSHOT</version>
 	<properties>
-		<version.slc>2.1.15</version.slc>
+		<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.88-SNAPSHOT</version.argeo-commons>
+		
+		<version.slc>2.1.17-SNAPSHOT</version.slc>
 		<developmentCycle.startDate>2015-02-12</developmentCycle.startDate>
 		<developmentCycle.slc>2.1</developmentCycle.slc>
+		<version.argeo-commons-legacy>2.1.86-SNAPSHOT</version.argeo-commons-legacy>
+
+		<argeo.rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-2/el7</argeo.rpm.stagingRepository>
 	</properties>
 	<modules>
-		<!-- Runtime -->
 		<module>org.argeo.slc.api</module>
-		<module>org.argeo.slc.core</module>
-		<module>org.argeo.slc.unit</module>
+		<module>org.argeo.slc.runtime</module>
+		<module>org.argeo.slc.jcr</module>
+
+		<!-- Runtime -->
+		<module>org.argeo.slc.spring</module>
 		<module>org.argeo.slc.support</module>
 		<module>org.argeo.slc.repo</module>
 		<module>org.argeo.slc.factory</module>
@@ -33,15 +44,21 @@
 		<!-- E4 -->
 		<module>org.argeo.slc.e4</module>
 
-		<!-- UI -->
+		<!-- Desktop -->
+		<module>rcp</module>
+
+		<!-- Legacy UI -->
+		<module>legacy</module>
 		<module>org.argeo.slc.client.ui</module>
 		<module>org.argeo.slc.client.ui.dist</module>
 		<module>org.argeo.slc.client.rap</module>
 
+		<!-- Distribution -->
 		<module>lib</module>
 		<module>dep</module>
 		<module>dist</module>
 		<module>demo</module>
+		<module>ide</module>
 	</modules>
 	<url>http://projects.argeo.org/slc/</url>
 	<scm>
@@ -100,6 +117,54 @@ limitations under the License.
 			</roles>
 		</developer>
 	</developers>
+	<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>
+				<groupId>org.argeo.tp</groupId>
+				<artifactId>argeo-tp</artifactId>
+				<version>${version.argeo-tp}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+			<dependency>
+				<groupId>org.argeo.tp</groupId>
+				<artifactId>argeo-tp-rap-e4</artifactId>
+				<version>${version.argeo-tp}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+			<dependency>
+				<groupId>org.argeo.tp.extras</groupId>
+				<artifactId>argeo-tp-extras</artifactId>
+				<version>${version.argeo-tp-extras}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
 	<repositories>
 		<repository>
 			<id>argeo</id>
@@ -110,6 +175,15 @@ limitations under the License.
 				<checksumPolicy>warn</checksumPolicy>
 			</releases>
 		</repository>
+		<repository>
+			<id>argeo-extras</id>
+			<url>http://repo.argeo.org/data/java/argeo-extras-2.1/</url>
+			<releases>
+				<enabled>true</enabled>
+				<updatePolicy>daily</updatePolicy>
+				<checksumPolicy>warn</checksumPolicy>
+			</releases>
+		</repository>
 	</repositories>
 	<reporting>
 		<plugins>
@@ -184,4 +258,20 @@ limitations under the License.
 			<url>file:///srv/docfactory/argeo-2.1/site/argeo-slc/</url>
 		</site>
 	</distributionManagement>
+	<profiles>
+		<profile>
+			<id>localrepo</id>
+			<repositories>
+				<repository>
+					<id>argeo-extras</id>
+					<url>http://localhost:7080/data/java/argeo-extras-2.1</url>
+					<releases>
+						<enabled>true</enabled>
+						<updatePolicy>daily</updatePolicy>
+						<checksumPolicy>warn</checksumPolicy>
+					</releases>
+				</repository>
+			</repositories>
+		</profile>
+	</profiles>
 </project>