X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=dist%2Fargeo-node%2Fpom.xml;h=dda7589b9fed34c056cdc35112ec1d128e6a1d7f;hb=1e024d33db42b069fe2cab1b50a9f35deee9fa05;hp=250596db7dd08a06f1e1a97a883e0ea9d43007d7;hpb=8e6b382cfdcef01e4c8dcd13709df0fad0f3b35a;p=lgpl%2Fargeo-commons.git

diff --git a/dist/argeo-node/pom.xml b/dist/argeo-node/pom.xml
index 250596db7..dda7589b9 100644
--- a/dist/argeo-node/pom.xml
+++ b/dist/argeo-node/pom.xml
@@ -1,10 +1,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>
 	<parent>
 		<groupId>org.argeo.commons</groupId>
-		<version>2.1.84-SNAPSHOT</version>
+		<version>2.3-SNAPSHOT</version>
 		<artifactId>dist</artifactId>
 		<relativePath>..</relativePath>
 	</parent>
@@ -15,16 +13,26 @@
 		<profile>
 			<id>dist</id>
 			<dependencies>
+				<dependency>
+					<groupId>org.argeo.commons</groupId>
+					<artifactId>org.argeo.dep.cms.client</artifactId>
+					<version>2.3-SNAPSHOT</version>
+				</dependency>
+				<dependency>
+					<groupId>org.argeo.commons</groupId>
+					<artifactId>org.argeo.dep.cms.node</artifactId>
+					<version>2.3-SNAPSHOT</version>
+				</dependency>
 				<dependency>
 					<groupId>org.argeo.commons</groupId>
 					<artifactId>org.argeo.dep.cms.e4.rap</artifactId>
-					<version>2.1.84-SNAPSHOT</version>
+					<version>2.3-SNAPSHOT</version>
 				</dependency>
 				<dependency>
 					<groupId>org.argeo.commons</groupId>
 					<artifactId>osgi-boot</artifactId>
 					<type>zip</type>
-					<version>2.1.84-SNAPSHOT</version>
+					<version>2.3-SNAPSHOT</version>
 				</dependency>
 			</dependencies>
 			<build>
@@ -33,7 +41,7 @@
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-assembly-plugin</artifactId>
 						<configuration>
-							<finalName>argeo-node-${project.version}</finalName>
+							<finalName>argeo-node-${version.released}${buildId}</finalName>
 							<appendAssemblyId>false</appendAssemblyId>
 							<descriptors>
 								<descriptor>assembly/cms-e4-rap.xml</descriptor>
@@ -67,12 +75,14 @@
 									<goal>rpm</goal>
 								</goals>
 								<configuration>
-									<name>argeo-node</name>
+									<name>argeo-node${argeo.rpm.suffix}</name>
+									<projversion>${version.released}</projversion>
+									<release>${maven.build.timestamp}</release>
 									<mappings>
 										<mapping>
 											<directory>/etc/argeo</directory>
 											<username>root</username>
-											<groupname>wheel</groupname>
+											<groupname>root</groupname>
 											<filemode>640</filemode>
 											<configuration>noreplace</configuration>
 											<directoryIncluded>false</directoryIncluded>
@@ -82,10 +92,23 @@
 												</source>
 											</sources>
 										</mapping>
+										<mapping>
+											<directory>/etc/argeo.d</directory>
+											<username>root</username>
+											<groupname>root</groupname>
+											<filemode>644</filemode>
+											<configuration>noreplace</configuration>
+											<directoryIncluded>false</directoryIncluded>
+											<sources>
+												<source>
+													<location>base/etc/argeo.d</location>
+												</source>
+											</sources>
+										</mapping>
 										<mapping>
 											<directory>/etc/argeo/conf.d</directory>
 											<username>root</username>
-											<groupname>wheel</groupname>
+											<groupname>root</groupname>
 											<filemode>640</filemode>
 											<configuration>noreplace</configuration>
 											<directoryIncluded>false</directoryIncluded>
@@ -129,6 +152,21 @@
 												</source>
 											</sources>
 										</mapping>
+										<mapping>
+											<directory>/usr/lib/systemd/user</directory>
+											<username>root</username>
+											<groupname>root</groupname>
+											<filemode>644</filemode>
+											<directoryIncluded>false</directoryIncluded>
+											<sources>
+												<source>
+													<location>rpm/usr/lib/systemd/user</location>
+													<includes>
+														<include>*.service</include>
+													</includes>
+												</source>
+											</sources>
+										</mapping>
 										<mapping>
 											<directory>/usr/sbin</directory>
 											<username>root</username>
@@ -145,12 +183,9 @@
 											</sources>
 										</mapping>
 									</mappings>
-									<!-- <preinstallScriptlet> -->
-									<!-- <scriptFile>rpm/scripts/preinstall</scriptFile> -->
-									<!-- </preinstallScriptlet> -->
 									<requires>
-										<require>argeo-cms-node</require>
-										<require>osgi-boot</require>
+										<require>argeo-cms-node${argeo.rpm.suffix}</require>
+										<require>argeo-osgi-boot${argeo.rpm.suffix}</require>
 										<!-- do not explicitely require java -->
 									</requires>
 								</configuration>