Adapt to Argeo TP v2.1.20

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

diff --git a/pom.xml b/pom.xml
index 02ed6fde292e62b13fd1f0d92e3ef61290bf381f..7493ec80e5bf9b69b5bd5225b70bbd7774fabe16 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,16 +1,17 @@
 <?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>
        <groupId>org.argeo.commons</groupId>
        <artifactId>argeo-commons</artifactId>
-       <version>2.1.69</version>
+       <version>2.1.71-SNAPSHOT</version>
        <name>Argeo Commons</name>
        <packaging>pom</packaging>
        <properties>
-               <version.argeo-commons>2.1.69</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>
@@ -46,7 +47,7 @@
                <connection>scm:git:http://git.argeo.org/apache2/argeo-commons.git</connection>
                <url>http://git.argeo.org/?p=apache2/argeo-commons.git;a=summary</url>
                <developerConnection>scm:git:https://code.argeo.org/git/apache2/argeo-commons.git</developerConnection>
-               <tag>argeo-commons-2.1.69</tag>
+               <tag>HEAD</tag>
        </scm>
        <inceptionYear>2007</inceptionYear>
        <licenses>
@@ -110,6 +111,7 @@ limitations under the License.
                                        <exclude>build.properties</exclude>
                                        <exclude>*.bnd</exclude>
                                        <exclude>*.target</exclude>
+                                       <exclude>**/*.xcf</exclude>
                                </excludes>
                        </resource>
                </resources>
@@ -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>
@@ -504,8 +513,10 @@ limitations under the License.
                                                                </goals>
                                                                <configuration>
                                                                        <target>
-                                                                               <copy todir="${argeo.rpm.stagingRepository}" quiet="true" failonerror="false">
-                                                                                       <fileset dir="${project.build.directory}/rpm" includes="*/RPMS/**/*.rpm" />
+                                                                               <copy todir="${argeo.rpm.stagingRepository}" quiet="true"
+                                                                                       failonerror="false">
+                                                                                       <fileset dir="${project.build.directory}/rpm"
+                                                                                               includes="*/RPMS/**/*.rpm" />
                                                                                        <flattenmapper />
                                                                                </copy>
                                                                        </target>
@@ -530,8 +541,10 @@ limitations under the License.
                                                                </goals>
                                                                <configuration>
                                                                        <target>
-                                                                               <copy todir="${argeo.rpm.stagingRepository}" quiet="true" failonerror="false">
-                                                                                       <fileset dir="${project.build.directory}/rpm" includes="*/RPMS/**/*.rpm" />
+                                                                               <copy todir="${argeo.rpm.stagingRepository}" quiet="true"
+                                                                                       failonerror="false">
+                                                                                       <fileset dir="${project.build.directory}/rpm"
+                                                                                               includes="*/RPMS/**/*.rpm" />
                                                                                        <flattenmapper />
                                                                                </copy>
                                                                        </target>