X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=6e41168a3edaae03253d3510d487f0756ee80f60;hb=c7cbd71ffe624ac95a76037086d3448b898565e4;hp=f504340bff0aa003b79664cf4226673bae484ac7;hpb=c3dbe275147ce8f2069848ef4142d425a35c29d6;p=lgpl%2Fargeo-commons.git

diff --git a/pom.xml b/pom.xml
index f504340bf..6e41168a3 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.72-SNAPSHOT</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,7 +45,9 @@
 		<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>
 	</modules>
@@ -263,6 +271,7 @@ limitations under the License.
 						<!-- <copyTo>${argeo.rpm.stagingRepository}</copyTo> -->
 						<defaultDirMode>755</defaultDirMode>
 						<defaultFileMode>644</defaultFileMode>
+						<autoRequires>false</autoRequires>
 					</configuration>
 				</plugin>
 				<plugin>
@@ -607,8 +616,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 +644,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>