Adapt to Argeo TP v2.1.20

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

diff --git a/pom.xml b/pom.xml
index 55b6d8ab462e6bd76ae3d9587aa8fa50379ac3b4..7493ec80e5bf9b69b5bd5225b70bbd7774fabe16 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -4,14 +4,14 @@
        <modelVersion>4.0.0</modelVersion>
        <groupId>org.argeo.commons</groupId>
        <artifactId>argeo-commons</artifactId>
-       <version>2.1.69-SNAPSHOT</version>
+       <version>2.1.71-SNAPSHOT</version>
        <name>Argeo Commons</name>
        <packaging>pom</packaging>
        <properties>
-               <version.argeo-commons>2.1.69-SNAPSHOT</version.argeo-commons>
+               <version.argeo-commons>2.1.71-SNAPSHOT</version.argeo-commons>
                <developmentCycle.argeo-commons>2.1</developmentCycle.argeo-commons>
                <developmentCycle.argeo-commons.startDate>2012-12-19</developmentCycle.argeo-commons.startDate>
-               <version.argeo-distribution>2.1.17</version.argeo-distribution>
+               <version.argeo-distribution>2.1.20</version.argeo-distribution>
                <!-- RPM -->
                <argeo.rpm.release>7</argeo.rpm.release>
                <argeo.rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-2-staging/7/x86_64</argeo.rpm.stagingRepository>
@@ -40,6 +40,7 @@
                <module>org.argeo.ext.rap.ui.workbench</module>
                <!-- Distribution -->
                <module>dep</module>
+               <module>doc</module>
                <module>dist</module>
        </modules>
        <scm>
@@ -110,6 +111,7 @@ limitations under the License.
                                        <exclude>build.properties</exclude>
                                        <exclude>*.bnd</exclude>
                                        <exclude>*.target</exclude>
+                                       <exclude>**/*.xcf</exclude>
                                </excludes>
                        </resource>
                </resources>
@@ -376,7 +378,7 @@ limitations under the License.
                                <artifactId>maven-site-plugin</artifactId>
                                <inherited>false</inherited>
                                <configuration>
-                                       <skip>true</skip>
+                                       <skip>false</skip>
                                </configuration>
                        </plugin>
                        <plugin>
@@ -409,6 +411,13 @@ limitations under the License.
                                <type>pom</type>
                                <scope>import</scope>
                        </dependency>
+                       <dependency>
+                               <groupId>org.argeo.tp</groupId>
+                               <artifactId>argeo-tp-rap-e4</artifactId>
+                               <version>${version.argeo-distribution}</version>
+                               <type>pom</type>
+                               <scope>import</scope>
+                       </dependency>
                </dependencies>
        </dependencyManagement>
        <repositories>
@@ -470,7 +479,7 @@ limitations under the License.
                        <repositories>
                                <repository>
                                        <id>argeo</id>
-                                       <url>http://localhost:7080/data/java/argeo-${developmentCycle.argeo-commons}</url>
+                                       <url>http://localhost:7080/data/java/argeo-2.1</url>
                                        <releases>
                                                <enabled>true</enabled>
                                                <updatePolicy>daily</updatePolicy>
@@ -482,6 +491,7 @@ limitations under the License.
                                <repository>
                                        <id>staging</id>
                                        <url>dav:http://localhost:7080/data/java/argeo-${developmentCycle.argeo-commons}</url>
+                                       <uniqueVersion>false</uniqueVersion>
                                </repository>
                                <site>
                                        <id>staging</id>