X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=66c6f47c19a4aedb096a0996e255335bd1b29f04;hb=0312bc5985da332ebbf702435f2e176da4febc25;hp=cd2011cf6c34f7cba9ac9b666fa3134758d5da7c;hpb=845871e2c75bd4bf4a9cf6e8c16f0a650d91c4b8;p=lgpl%2Fargeo-commons.git

diff --git a/pom.xml b/pom.xml
index cd2011cf6..66c6f47c1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,19 +1,21 @@
 <?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.71</version>
+	<version>2.1.74-SNAPSHOT</version>
 	<name>Argeo Commons</name>
 	<packaging>pom</packaging>
 	<properties>
-		<version.argeo-commons>2.1.71</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>
 		<!-- RPM -->
 		<argeo.rpm.release>7</argeo.rpm.release>
-		<argeo.rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-2-staging/7/x86_64</argeo.rpm.stagingRepository>
+		<argeo.rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-2/el7</argeo.rpm.stagingRepository>
 		<!-- Encoding, see http://is.gd/mvn_source_encoding -->
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.scm.id>code.argeo.org</project.scm.id>
@@ -31,7 +33,11 @@
 		<module>org.argeo.node.api</module>
 		<module>org.argeo.maintenance</module>
 		<module>org.argeo.cms</module>
+		<module>org.argeo.cms.ui.theme</module>
 		<module>org.argeo.cms.ui</module>
+		<!-- CMS E4 -->
+		<module>org.argeo.cms.e4</module>
+		<module>org.argeo.cms.e4.rap</module>
 		<!-- CMS Workbench -->
 		<module>org.argeo.cms.ui.workbench</module>
 		<module>org.argeo.cms.ui.workbench.rap</module>
@@ -39,15 +45,18 @@
 		<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>
 		<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.71</tag>
+		<tag>HEAD</tag>
 	</scm>
 	<inceptionYear>2007</inceptionYear>
 	<licenses>
@@ -263,6 +272,7 @@ limitations under the License.
 						<!-- <copyTo>${argeo.rpm.stagingRepository}</copyTo> -->
 						<defaultDirMode>755</defaultDirMode>
 						<defaultFileMode>644</defaultFileMode>
+						<autoRequires>false</autoRequires>
 					</configuration>
 				</plugin>
 				<plugin>
@@ -607,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>
@@ -633,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>