X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=blobdiff_plain;f=dist%2Fargeo-office%2Fpom.xml;h=9eb09454c309e84b05ec3c2c0d04c9f6bf14849e;hp=0cf70b9a2239ad67937f5ddcf0dbae3ee56dc5aa;hb=1a04602878fdeb3fafcd7a812001bd98f08ce92a;hpb=6ab918c8088898d24f1e7e2966a7b702f20371a5

diff --git a/dist/argeo-office/pom.xml b/dist/argeo-office/pom.xml
index 0cf70b9..9eb0945 100644
--- a/dist/argeo-office/pom.xml
+++ b/dist/argeo-office/pom.xml
@@ -1,16 +1,26 @@
-<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.suite</groupId>
 		<artifactId>dist</artifactId>
-		<version>0.1.13-SNAPSHOT</version>
+		<version>2.1.15-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>argeo-office</artifactId>
 	<packaging>pom</packaging>
 	<name>Argeo Office</name>
+	<dependencies>
+		<dependency>
+			<groupId>org.argeo.suite</groupId>
+			<artifactId>org.argeo.suite.standard</artifactId>
+			<version>2.1.15-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.suite</groupId>
+			<artifactId>org.argeo.suite.tracker</artifactId>
+			<version>2.1.15-SNAPSHOT</version>
+		</dependency>
+	</dependencies>
 	<profiles>
 		<profile>
 			<id>dist</id>
@@ -18,7 +28,7 @@
 				<dependency>
 					<groupId>org.argeo.suite</groupId>
 					<artifactId>org.argeo.suite.dep.e4.rap</artifactId>
-					<version>0.1.13-SNAPSHOT</version>
+					<version>2.1.15-SNAPSHOT</version>
 				</dependency>
 				<dependency>
 					<groupId>org.argeo.commons</groupId>
@@ -62,6 +72,23 @@
 			<id>rpmbuild</id>
 			<build>
 				<plugins>
+					<plugin>
+						<artifactId>maven-assembly-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>prepare-source</id>
+								<phase>package</phase>
+								<goals>
+									<goal>single</goal>
+								</goals>
+								<configuration>
+									<descriptorRefs>
+										<descriptorRef>a2-source</descriptorRef>
+									</descriptorRefs>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
 					<plugin>
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>rpm-maven-plugin</artifactId>
@@ -76,15 +103,15 @@
 									<name>argeo-office</name>
 									<mappings>
 										<mapping>
-											<directory>/etc/node/conf.d</directory>
+											<directory>/etc/argeo/conf.d</directory>
 											<username>root</username>
-											<groupname>node</groupname>
+											<groupname>argeo</groupname>
 											<filemode>640</filemode>
 											<configuration>noreplace</configuration>
 											<directoryIncluded>false</directoryIncluded>
 											<sources>
 												<source>
-													<location>base/etc/node/conf.d</location>
+													<location>base/etc/argeo/conf.d</location>
 													<includes>
 														<include>*.ini</include>
 														<include>*.txt</include>
@@ -92,8 +119,24 @@
 												</source>
 											</sources>
 										</mapping>
+										<mapping>
+											<directory>/usr/share/osgi</directory>
+											<username>root</username>
+											<groupname>root</groupname>
+											<filemode>644</filemode>
+											<directoryIncluded>true</directoryIncluded>
+											<sources>
+												<source>
+													<location>${project.build.directory}/${project.artifactId}-${project.version}-a2-source</location>
+													<includes>
+														<include>**/*.jar</include>
+													</includes>
+												</source>
+											</sources>
+										</mapping>
 									</mappings>
 									<requires>
+										<require>argeo-node</require>
 										<require>argeo-suite-e4-rap</require>
 									</requires>
 								</configuration>