Adapt to change in Argeo Commons

[gpl/argeo-suite.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 7161191b04af7f0e2c02167a76d46f09efdb99aa..3e6d7c489259f1123ad0073ffa61639351cce59d 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,11 +1,9 @@
-<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.6</version>
+               <version>2.1.7</version>
        </parent>
        <groupId>org.argeo.suite</groupId>
        <artifactId>argeo-suite</artifactId>
@@ -18,30 +16,29 @@
                <!-- Dependencies -->
                <version.argeo-tp>2.1.27</version.argeo-tp>
                <version.argeo-commons>2.3-SNAPSHOT</version.argeo-commons>
-               <version.argeo-suite-icons>2.3.1</version.argeo-suite-icons>
-               <!-- <version.argeo-rcp>2.3-SNAPSHOT</version.argeo-rcp> -->
+               <version.argeo-suite-icons>2.3-SNAPSHOT</version.argeo-suite-icons>
                <git.rw />
        </properties>
        <modules>
                <!-- Entity Framework -->
-               <module>org.argeo.entity.api</module>
-               <module>org.argeo.entity.core</module>
-               <module>org.argeo.entity.ui</module>
+               <module>org.argeo.app.api</module>
+<!--           <module>org.argeo.entity.core</module> -->
+<!--           <module>org.argeo.entity.ui</module> -->
 
                <!-- Argeo Suite -->
-               <module>org.argeo.suite.core</module>
-               <module>org.argeo.suite.ui</module>
-               <module>org.argeo.suite.ui.rap</module>
-               <module>org.argeo.suite.theme.default</module>
+               <module>org.argeo.app.core</module>
+               <module>org.argeo.app.ui</module>
+               <module>org.argeo.app.ui.rap</module>
+               <module>org.argeo.app.theme.default</module>
 
                <!-- Functional areas -->
-               <module>org.argeo.people.ui</module>
-               <module>org.argeo.library.ui</module>
-               <module>org.argeo.geo.ui</module>
-               <module>org.argeo.publishing.ui</module>
-               <module>org.argeo.support.xforms</module>
-               <module>org.argeo.support.odk</module>
-               <module>org.argeo.support.geonames</module>
+<!--           <module>org.argeo.people.ui</module> -->
+<!--           <module>org.argeo.library.ui</module> -->
+<!--           <module>org.argeo.geo.ui</module> -->
+               <module>org.argeo.app.servlet.publish</module>
+<!--           <module>org.argeo.support.xforms</module> -->
+               <module>org.argeo.app.servlet.odk</module>
+<!--           <module>org.argeo.support.geonames</module> -->
 
                <!-- Packaging -->
                <module>dep</module>
@@ -85,6 +82,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>