X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=dist%2Fargeo-node%2Fpom.xml;h=c8967dd90b85ead9f7e4e7da897cec730286bfd5;hb=22047343f757477c053115f6e88701985f4c071b;hp=52ffd5a5344320efdff84e15fcaf84e4a7f212c2;hpb=dd543bb5e3fd7b3489776e136f8cd1a1716869ad;p=lgpl%2Fargeo-commons.git

diff --git a/dist/argeo-node/pom.xml b/dist/argeo-node/pom.xml
index 52ffd5a53..c8967dd90 100644
--- a/dist/argeo-node/pom.xml
+++ b/dist/argeo-node/pom.xml
@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.argeo.commons</groupId>
-		<version>2.1.89-SNAPSHOT</version>
+		<version>2.3.5</version>
 		<artifactId>dist</artifactId>
 		<relativePath>..</relativePath>
 	</parent>
@@ -16,28 +16,23 @@
 				<dependency>
 					<groupId>org.argeo.commons</groupId>
 					<artifactId>org.argeo.dep.cms.client</artifactId>
-					<version>2.1.89-SNAPSHOT</version>
+					<version>2.3-SNAPSHOT</version>
 				</dependency>
 				<dependency>
 					<groupId>org.argeo.commons</groupId>
 					<artifactId>org.argeo.dep.cms.node</artifactId>
-					<version>2.1.89-SNAPSHOT</version>
+					<version>2.3.5</version>
 				</dependency>
 				<dependency>
 					<groupId>org.argeo.commons</groupId>
 					<artifactId>org.argeo.dep.cms.e4.rap</artifactId>
-					<version>2.1.89-SNAPSHOT</version>
-				</dependency>
-				<dependency>
-					<groupId>org.argeo.commons</groupId>
-					<artifactId>org.argeo.dep.cms.sdk</artifactId>
-					<version>2.1.89-SNAPSHOT</version>
+					<version>2.3.5</version>
 				</dependency>
 				<dependency>
 					<groupId>org.argeo.commons</groupId>
 					<artifactId>osgi-boot</artifactId>
 					<type>zip</type>
-					<version>2.1.89-SNAPSHOT</version>
+					<version>2.3.5</version>
 				</dependency>
 			</dependencies>
 			<build>
@@ -46,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}</finalName>
 							<appendAssemblyId>false</appendAssemblyId>
 							<descriptors>
 								<descriptor>assembly/cms-e4-rap.xml</descriptor>
@@ -80,12 +75,12 @@
 									<goal>rpm</goal>
 								</goals>
 								<configuration>
-									<name>argeo-node</name>
+									<name>argeo-node${argeo.rpm.suffix}</name>
 									<mappings>
 										<mapping>
 											<directory>/etc/argeo</directory>
 											<username>root</username>
-											<groupname>wheel</groupname>
+											<groupname>root</groupname>
 											<filemode>640</filemode>
 											<configuration>noreplace</configuration>
 											<directoryIncluded>false</directoryIncluded>
@@ -95,10 +90,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>
@@ -142,6 +150,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>
@@ -159,8 +182,8 @@
 										</mapping>
 									</mappings>
 									<requires>
-										<require>argeo-cms-node</require>
-										<require>osgi-boot</require>
+										<require>argeo-cms-node${argeo.rpm.suffix}</require>
+										<require>argeo-init${argeo.rpm.suffix}</require>
 										<!-- do not explicitely require java -->
 									</requires>
 								</configuration>