Re-integrate Argeo RCP into Argeo Commons

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

diff --git a/pom.xml b/pom.xml
index 07d54c5864b63d8dadf215d0aa1bef80fd5fb851..66c6f47c19a4aedb096a0996e255335bd1b29f04 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,7 @@
 <?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>
@@ -7,7 +9,7 @@
        <name>Argeo Commons</name>
        <packaging>pom</packaging>
        <properties>
-               <version.argeo-commons>2.1.73</version.argeo-commons>
+               <version.argeo-commons>2.1.74-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-tp>2.1.20</version.argeo-tp>
@@ -43,10 +45,12 @@
                <module>org.argeo.ext.jackrabbit</module>
                <module>org.argeo.ext.rap.ui.workbench</module>
                <!-- Distribution -->
+               <module>maven</module>
                <module>dep</module>
                <module>demo</module>
                <module>doc</module>
                <module>dist</module>
+               <module>rcp</module>
        </modules>
        <scm>
                <connection>scm:git:http://git.argeo.org/apache2/argeo-commons.git</connection>
@@ -268,6 +272,7 @@ limitations under the License.
                                                <!-- <copyTo>${argeo.rpm.stagingRepository}</copyTo> -->
                                                <defaultDirMode>755</defaultDirMode>
                                                <defaultFileMode>644</defaultFileMode>
+                                               <autoRequires>false</autoRequires>
                                        </configuration>
                                </plugin>
                                <plugin>
@@ -612,8 +617,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>
@@ -638,8 +645,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>