X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=6f6f6851c1673188238984ecb6550673b2624d4a;hb=afcb7dc42178b5181f9136509019708eead980f4;hp=4d5512c01f94a62e6e60d62fef0d6be3f0d812d1;hpb=10c753195037a614105ab53659149b92781c38d9;p=gpl%2Fargeo-slc.git

diff --git a/pom.xml b/pom.xml
index 4d5512c01..6f6f6851c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,9 +3,9 @@
 	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.82</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>
@@ -13,17 +13,23 @@
 	<name>Argeo SLC</name>
 	<version>2.1.17-SNAPSHOT</version>
 	<properties>
+		<version.argeo-tp>2.1.27</version.argeo-tp>
+		<version.argeo-commons>2.1.86-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-tp-extras>2.1.13</version.argeo-tp-extras>
+
+		<version.argeo-commons-legacy>2.1.86-SNAPSHOT</version.argeo-commons-legacy>
 	</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>
@@ -37,11 +43,16 @@
 		<!-- 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>
@@ -105,8 +116,45 @@ 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>