X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=c0edf6c4df218ef3a7d5c69a3a17b279f8c86219;hb=8e7c19c1facf69e17bc57694f1143da05d166a26;hp=e143ba9e950bb92825daf789c5ded58eb22251fd;hpb=72788789268d2ac01dcb817d134c057307ba6de8;p=lgpl%2Fargeo-commons.git

diff --git a/pom.xml b/pom.xml
index e143ba9e9..c0edf6c4d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,45 +6,42 @@
 	<parent>
 		<groupId>org.argeo.maven</groupId>
 		<artifactId>argeo-osgi-parent</artifactId>
-		<version>2.1.2</version>
+		<version>2.1.7</version>
 	</parent>
 	<groupId>org.argeo.commons</groupId>
 	<artifactId>argeo-commons</artifactId>
-	<version>2.1.89-SNAPSHOT</version>
+	<version>2.3-SNAPSHOT</version>
 	<name>Argeo Commons</name>
 	<packaging>pom</packaging>
-	<!-- <url>http://repo.argeo.org/data/docs/argeo-2.1/site/argeo-commons/</url> -->
+	<url>http://www.argeo.org/</url>
 	<properties>
+		<version.context>unstable</version.context>
 		<version.argeo-tp>2.1.27</version.argeo-tp>
-		<!-- RPM -->
-		<argeo.rpm.release>7</argeo.rpm.release>
-		<argeo.rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-2/el7</argeo.rpm.stagingRepository>
-		<project.scm.id>code.argeo.org</project.scm.id>
 	</properties>
 	<modules>
 		<!-- Base -->
+		<module>org.argeo.init</module>
 		<module>org.argeo.util</module>
-		<module>org.argeo.enterprise</module>
-		<module>org.argeo.jcr</module>
-		<module>org.argeo.osgi.boot</module>
-		<module>org.argeo.core</module>
-		<!-- Eclipse -->
-		<module>org.argeo.eclipse.ui</module>
-		<module>org.argeo.eclipse.ui.rap</module>
+		<!-- API -->
+		<module>org.argeo.api.acr</module>
+		<module>org.argeo.api.cms</module>
 		<!-- CMS -->
-		<module>org.argeo.api</module>
-		<module>org.argeo.maintenance</module>
+		<module>org.argeo.cms.tp</module>
 		<module>org.argeo.cms</module>
-		<module>org.argeo.cms.ui.theme</module>
+		<module>org.argeo.cms.pgsql</module>
+		<module>org.argeo.cms.servlet</module>
+		<module>org.argeo.cms.jcr</module>
+		<!-- CMS UX -->
+		<module>org.argeo.cms.swt</module>
 		<module>org.argeo.cms.ui</module>
-		<module>org.argeo.cms.ui.rap</module>
-		<!-- CMS E4 -->
 		<module>org.argeo.cms.e4</module>
-		<module>org.argeo.cms.e4.rap</module>
+		<!-- Eclipse RAP/RCP specific -->
+		<module>rcp</module>
+		<module>rap</module>
 		<!-- Distribution -->
 		<module>dep</module>
-		<module>demo</module>
 		<module>dist</module>
+		<module>sdk</module>
 	</modules>
 	<scm>
 		<connection>scm:git:http://git.argeo.org/lgpl/argeo-commons.git</connection>
@@ -100,6 +97,11 @@
 					<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>
@@ -124,23 +126,18 @@
 	<distributionManagement>
 		<repository>
 			<id>staging</id>
-			<url>dav:https://forge.argeo.org/data/java/argeo-2.1/</url>
+			<url>dav:https://forge.argeo.org/data/java/argeo-2.3</url>
 			<uniqueVersion>false</uniqueVersion>
 		</repository>
-		<snapshotRepository>
-			<id>staging</id>
-			<url>file:///srv/javafactory/argeo-2.1</url>
-			<uniqueVersion>true</uniqueVersion>
-		</snapshotRepository>
 		<site>
 			<id>staging</id>
-			<url>file:///srv/docfactory/argeo-2.1/site/argeo-commons/</url>
+			<url>file:///srv/docfactory/argeo-2.3/site/argeo-commons/</url>
 		</site>
 	</distributionManagement>
 	<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>never</updatePolicy>
@@ -151,15 +148,15 @@
 			</snapshots>
 		</repository>
 		<repository>
-			<id>argeo-snapshots</id>
-			<url>http://snapshots.argeo.org/data/java/argeo-2.1/</url>
+			<id>argeo-unstable</id>
+			<url>http://forge.argeo.org/data/java/argeo-2.3/</url>
 			<releases>
-				<enabled>false</enabled>
-			</releases>
-			<snapshots>
 				<enabled>true</enabled>
-				<updatePolicy>always</updatePolicy>
+				<updatePolicy>never</updatePolicy>
 				<checksumPolicy>warn</checksumPolicy>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
 			</snapshots>
 		</repository>
 		<!-- Disable Maven default repository -->
@@ -241,27 +238,4 @@
 			</plugin>
 		</plugins>
 	</reporting>
-	<profiles>
-		<profile>
-			<id>localrepo</id>
-			<repositories>
-				<repository>
-					<id>argeo</id>
-					<url>http://localhost:7080/data/java/argeo-2.1</url>
-					<releases>
-						<enabled>true</enabled>
-						<updatePolicy>daily</updatePolicy>
-						<checksumPolicy>warn</checksumPolicy>
-					</releases>
-				</repository>
-			</repositories>
-			<distributionManagement>
-				<repository>
-					<id>staging</id>
-					<url>dav:http://localhost:7080/data/java/argeo-2.1/</url>
-					<uniqueVersion>false</uniqueVersion>
-				</repository>
-			</distributionManagement>
-		</profile>
-	</profiles>
 </project>