Adapt to changes in Argeo Commons.

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

diff --git a/pom.xml b/pom.xml
index 6403dce9935739ba9d670614716ce9e9b8736374..2a1a10ae258db6e362cf12a1d04b55590dcfc717 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,44 +1,43 @@
-<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.commons</groupId>
-               <artifactId>argeo-commons</artifactId>
-               <version>2.1.74-SNAPSHOT</version>
+               <groupId>org.argeo.maven</groupId>
+               <artifactId>argeo-osgi-parent</artifactId>
+               <version>2.1.2</version>
        </parent>
        <groupId>org.argeo.suite</groupId>
        <artifactId>argeo-suite</artifactId>
        <packaging>pom</packaging>
        <name>Argeo Suite</name>
        <description />
-       <version>0.1.13-SNAPSHOT</version>
+       <version>2.1.16-SNAPSHOT</version>
        <properties>
-               <version.argeo-suite>0.1.13-SNAPSHOT</version.argeo-suite>
-               <developmentCycle.argeo-suite>0.1</developmentCycle.argeo-suite>
-               <version.argeo-connect>2.1.79-SNAPSHOT</version.argeo-connect>
-               <version.argeo-tp-extras>2.1.10</version.argeo-tp-extras>
+               <version.argeo-suite>2.1.16-SNAPSHOT</version.argeo-suite>
+               <!-- Dependencies -->
+               <version.argeo-tp>2.1.27</version.argeo-tp>
+               <version.argeo-tp-extras>2.1.13</version.argeo-tp-extras>
+               <version.argeo-commons>2.1.88-SNAPSHOT</version.argeo-commons>
+               <version.argeo-connect>2.1.82-SNAPSHOT</version.argeo-connect>
+               <version.argeo-slc>2.1.17-SNAPSHOT</version.argeo-slc>
+
+               <argeo.rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-2-gpl/el7</argeo.rpm.stagingRepository>
                <git.rw />
        </properties>
        <modules>
-               <!-- Web -->
-               <module>org.argeo.suite.web</module>
-               <module>org.argeo.suite.apps.web</module>
-
                <!-- Eclipse 4 -->
                <module>org.argeo.suite.cms</module>
                <module>org.argeo.suite.e4</module>
                <module>org.argeo.suite.e4.rap</module>
                <module>org.argeo.suite.standard</module>
-               
+
                <!-- Apps -->
+               <module>library</module>
+               <module>systems</module>
                <module>org.argeo.suite.tracker</module>
 
-               <!-- Workbench -->
-               <module>org.argeo.suite.apps</module>
-               <module>org.argeo.suite.workbench.rap</module>
-
                <module>dep</module>
                <module>dist</module>
+               <module>lib</module>
        </modules>
        <scm>
                <connection>scm:git:http://git.argeo.org/gpl/argeo-suite.git</connection>
@@ -94,19 +93,45 @@ which are used as well as that of the covered work.]]>
                        </roles>
                </developer>
        </developers>
-<!--   <build> -->
-<!--           <plugins> -->
-<!--                   <plugin> -->
-<!--                           <artifactId>maven-javadoc-plugin</artifactId> -->
-<!--                           <version>2.10.4</version> -->
-<!--                           <configuration> -->
-<!--                                   <skip>true</skip> -->
-<!--                           </configuration> -->
-<!--                   </plugin> -->
-<!--           </plugins> -->
-<!--   </build> -->
+       <dependencies>
+               <dependency>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>argeo-tp</artifactId>
+                       <version>${version.argeo-tp}</version>
+                       <scope>provided</scope>
+                       <exclusions>
+                               <exclusion>
+                                       <groupId>org.argeo.tp.apache</groupId>
+                                       <artifactId>org.apache.xerces</artifactId>
+                               </exclusion>
+                               <!-- Avoid slf4j implementations lurking in the classpath. -->
+                               <exclusion>
+                                       <groupId>org.argeo.tp.sdk</groupId>
+                                       <artifactId>biz.aQute.bndlib</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.argeo.tp.misc</groupId>
+                                       <artifactId>slf4j.osgi</artifactId>
+                               </exclusion>
+                       </exclusions>
+               </dependency>
+       </dependencies>
        <dependencyManagement>
                <dependencies>
+                       <dependency>
+                               <groupId>org.argeo.tp</groupId>
+                               <artifactId>argeo-tp</artifactId>
+                               <version>${version.argeo-tp}</version>
+                               <type>pom</type>
+                               <scope>import</scope>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.argeo.tp</groupId>
+                               <artifactId>argeo-tp-rap-e4</artifactId>
+                               <version>${version.argeo-tp}</version>
+                               <type>pom</type>
+                               <scope>import</scope>
+                       </dependency>
                        <dependency>
                                <groupId>org.argeo.tp.extras</groupId>
                                <artifactId>argeo-tp-extras</artifactId>
@@ -116,15 +141,6 @@ which are used as well as that of the covered work.]]>
                        </dependency>
                </dependencies>
        </dependencyManagement>
-<!--   <dependencies> -->
-<!--           <dependency> -->
-<!--                   <groupId>org.argeo.tp</groupId> -->
-<!--                   <artifactId>argeo-tp-rap-e3</artifactId> -->
-<!--                   <version>${version.argeo-tp}</version> -->
-<!--                   <type>pom</type> -->
-<!--                   <scope>provided</scope> -->
-<!--           </dependency> -->
-<!--   </dependencies> -->
        <repositories>
                <repository>
                        <id>argeo</id>
@@ -145,13 +161,6 @@ which are used as well as that of the covered work.]]>
                        </releases>
                </repository>
        </repositories>
-       <distributionManagement>
-               <repository>
-                       <id>staging</id>
-                       <url>dav:https://forge.argeo.org/data/java/argeo-extras-2.1</url>
-                       <uniqueVersion>false</uniqueVersion>
-               </repository>
-       </distributionManagement>
        <reporting>
                <plugins>
                        <plugin>
@@ -196,7 +205,7 @@ which are used as well as that of the covered work.]]>
                                        </reportSet>
                                        <reportSet>
                                                <id>javadoc</id>
-                                               <reports></reports>
+                                               <reports />
                                        </reportSet>
                                </reportSets>
                        </plugin>
@@ -213,10 +222,16 @@ which are used as well as that of the covered work.]]>
                                        </reportSet>
                                        <reportSet>
                                                <id>jxr</id>
-                                               <reports></reports>
+                                               <reports />
                                        </reportSet>
                                </reportSets>
                        </plugin>
                </plugins>
        </reporting>
+       <distributionManagement>
+               <site>
+                       <id>staging</id>
+                       <url>file:///srv/docfactory/argeo-2.1/site/argeo-suite/</url>
+               </site>
+       </distributionManagement>
 </project>