X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=6d1b5ae960f192a7b7903e3fcc55bcd541e4b636;hb=a9ce97f6a85ea103fb3807ef19423d5b71555100;hp=63333f51922d621c1f8e41de80e31ab78d0a2169;hpb=ab889ab5796be35e70d1f95b04b8ce78929f94e7;p=gpl%2Fargeo-slc.git

diff --git a/pom.xml b/pom.xml
index 63333f519..6d1b5ae96 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,43 +1,43 @@
-<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.maven</groupId>
 		<artifactId>argeo-osgi-parent</artifactId>
-		<version>2.1.2</version>
+		<version>2.1.8</version>
 	</parent>
 	<groupId>org.argeo.slc</groupId>
 	<artifactId>argeo-slc</artifactId>
 	<packaging>pom</packaging>
 	<name>Argeo SLC</name>
-	<version>2.1.17-SNAPSHOT</version>
+	<version>2.3-SNAPSHOT</version>
 	<properties>
+		<version.context>unstable</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.89-SNAPSHOT</version.argeo-commons>
+		<version.argeo-commons>2.3.5</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/argeo</argeo.rpm.stagingRepository>
+		<developmentCycle.slc>2.3</developmentCycle.slc>
+		<version.argeo-commons-legacy>2.3.1</version.argeo-commons-legacy>
 	</properties>
 	<modules>
-		<!-- Desktop -->
-		<module>rcp</module>
-
-		<!-- Legacy UI -->
-		<module>legacy</module>
+		<!-- SLC framework -->
+		<module>org.argeo.slc.api</module>
+		<module>org.argeo.slc.factory</module>
+		<module>org.argeo.slc.runtime</module>
+		<module>org.argeo.slc.jcr</module>
+		<module>org.argeo.slc.repo</module>
+		<module>org.argeo.slc.rpmfactory</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>
@@ -57,6 +57,34 @@
 			<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>
+				<!-- Make sure JTA is not used anymore -->
+				<exclusion>
+					<groupId>org.argeo.tp.javax</groupId>
+					<artifactId>javax.transaction-api</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+	</dependencies>
 	<dependencyManagement>
 		<dependencies>
 			<dependency>
@@ -85,43 +113,56 @@
 	<repositories>
 		<repository>
 			<id>argeo</id>
-			<url>http://repo.argeo.org/data/java/argeo-2.1/</url>
+			<url>http://forge.argeo.org/data/java/argeo-2.1/</url>
 			<releases>
 				<enabled>true</enabled>
 				<updatePolicy>daily</updatePolicy>
 				<checksumPolicy>warn</checksumPolicy>
 			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
 		</repository>
 		<repository>
 			<id>argeo-extras</id>
-			<url>http://repo.argeo.org/data/java/argeo-extras-2.1/</url>
+			<url>http://forge.argeo.org/data/java/argeo-extras-2.1/</url>
 			<releases>
 				<enabled>true</enabled>
 				<updatePolicy>daily</updatePolicy>
 				<checksumPolicy>warn</checksumPolicy>
 			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
+		<repository>
+			<id>argeo-unstable</id>
+			<url>http://forge.argeo.org/data/java/argeo-2.3/</url>
+			<releases>
+				<enabled>true</enabled>
+				<updatePolicy>never</updatePolicy>
+				<checksumPolicy>warn</checksumPolicy>
+			</releases>
+			<snapshots>
+				<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>
 			<id>staging</id>
-			<url>file:///srv/docfactory/argeo-2.1/site/argeo-slc/</url>
+			<url>file:///srv/docfactory/argeo-2.3/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>