Revert to standard BND consumer policy

[lgpl/argeo-commons.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 143a3ea5a449d360d24180871673dae761580401..d988fc8cd3a683c3ac815d7c81ae392795af2541 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,10 +1,12 @@
 <?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.6</version>
+               <version>2.1.7</version>
        </parent>
        <groupId>org.argeo.commons</groupId>
        <artifactId>argeo-commons</artifactId>
@@ -18,26 +20,24 @@
        </properties>
        <modules>
                <!-- Base -->
-               <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>
+               <module>org.argeo.init</module>
+               <module>org.argeo.util</module>
+               <!-- API -->
+               <module>org.argeo.api.uuid</module>
+               <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</module>
-               <module>org.argeo.cms.ui.theme</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>
+               <module>org.argeo.cms.pgsql</module>
+               <!-- CMS SWT -->
+               <module>eclipse</module>
+               <!-- CMS JCR -->
+               <module>jcr</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>
@@ -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>