Move SLF4J implementation from Commons to SLC

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

diff --git a/pom.xml b/pom.xml
index 68da924b8fccc99fd78cb1d909ca42b8ed9ec383..dbccb64e629768f8ef4aa8275360c732b25160d2 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
        <parent>
                <groupId>org.argeo.maven</groupId>
                <artifactId>argeo-osgi-parent</artifactId>
-               <version>2.1.4-SNAPSHOT</version>
+               <version>2.1.7</version>
        </parent>
        <groupId>org.argeo.slc</groupId>
        <artifactId>argeo-slc</artifactId>
@@ -11,16 +11,14 @@
        <name>Argeo SLC</name>
        <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.3-SNAPSHOT</version.argeo-commons>
 
-               <version.slc>2.3-SNAPSHOT</version.slc>
                <developmentCycle.startDate>2015-02-12</developmentCycle.startDate>
                <developmentCycle.slc>2.3</developmentCycle.slc>
-               <version.argeo-commons-legacy>2.1.86</version.argeo-commons-legacy>
-
-               <argeo.rpm.stagingRepository>/srv/rpmfactory/unstable/argeo-osgi-2/argeo</argeo.rpm.stagingRepository>
+               <version.argeo-commons-legacy>2.3-SNAPSHOT</version.argeo-commons-legacy>
        </properties>
        <modules>
                <!-- SLC framework -->
@@ -28,17 +26,17 @@
                <module>org.argeo.slc.runtime</module>
                <module>org.argeo.slc.jcr</module>
                <module>org.argeo.slc.repo</module>
-               <module>org.argeo.slc.factory</module>
+               <module>org.argeo.slc.rpmfactory</module>
                
                <!-- CMS extensions -->
                <module>cms</module>
 
-               <!-- Legacy -->
-               <module>legacy</module>
-
                <!-- Distribution -->
                <module>dep</module>
                <module>ide</module>
+
+               <!-- Legacy -->
+               <module>legacy</module>
        </modules>
        <url>http://projects.argeo.org/slc/</url>
        <scm>
@@ -78,6 +76,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>
@@ -161,20 +164,4 @@
                        <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.3</url>
-                                       <releases>
-                                               <enabled>true</enabled>
-                                               <updatePolicy>daily</updatePolicy>
-                                               <checksumPolicy>warn</checksumPolicy>
-                                       </releases>
-                               </repository>
-                       </repositories>
-               </profile>
-       </profiles>
 </project>