X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=619b9a73e7f5c5c00efb71d0e588333d381d91fb;hb=f9efbe5228615951dd8482a4582aa24e00c10ce5;hp=bb0b488ff935eb5da81c7d4c968aad96e4ef4b86;hpb=89e16df73ff0a4778bdeca3efe185c4f385f8fda;p=lgpl%2Fargeo-commons.git

diff --git a/pom.xml b/pom.xml
index bb0b488ff..619b9a73e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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.5</version>
+		<version>2.1.7</version>
 	</parent>
 	<groupId>org.argeo.commons</groupId>
 	<artifactId>argeo-commons</artifactId>
-	<version>2.3.2</version>
+	<version>2.3-SNAPSHOT</version>
 	<name>Argeo Commons</name>
 	<packaging>pom</packaging>
 	<url>http://www.argeo.org/</url>
@@ -18,23 +20,21 @@
 	</properties>
 	<modules>
 		<!-- Base -->
+		<module>org.argeo.init</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>
 		<!-- 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.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>rap</module>
 		<!-- Distribution -->
 		<module>dep</module>
 		<module>demo</module>
@@ -45,8 +45,8 @@
 		<connection>scm:git:http://git.argeo.org/lgpl/argeo-commons.git</connection>
 		<url>http://git.argeo.org/?p=lgpl/argeo-commons.git;a=summary</url>
 		<developerConnection>scm:git:https://code.argeo.org/git/lgpl/argeo-commons.git</developerConnection>
-	  <tag>argeo-commons-2.3.2</tag>
-  </scm>
+		<tag>HEAD</tag>
+	</scm>
 	<organization>
 		<name>Argeo GmbH</name>
 	</organization>
@@ -95,6 +95,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>