X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=dist%2Fslc%2Fpom.xml;h=89a25e573f4a8a340955778140a28c6e7cef5735;hb=86af208bcfdf5fb5aeb277233c855cc2f3cfa9b4;hp=b1fab962592964baec93d78cedd4ab4680f122dc;hpb=e29e07c77dc1f30b43dd3b8b442df20c42bdec54;p=gpl%2Fargeo-slc.git

diff --git a/dist/slc/pom.xml b/dist/slc/pom.xml
index b1fab9625..89a25e573 100644
--- a/dist/slc/pom.xml
+++ b/dist/slc/pom.xml
@@ -3,7 +3,8 @@
 	<parent>
 		<groupId>org.argeo.slc</groupId>
 		<artifactId>dist</artifactId>
-		<version>2.1.6-SNAPSHOT</version>
+		<version>2.1.14-SNAPSHOT</version>
+		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>slc</artifactId>
 	<packaging>pom</packaging>
@@ -58,7 +59,7 @@
 				<dependency>
 					<groupId>org.argeo.slc</groupId>
 					<artifactId>org.argeo.slc.dep.backend</artifactId>
-					<version>2.1.6-SNAPSHOT</version>
+					<version>2.1.14-SNAPSHOT</version>
 					<type>pom</type>
 				</dependency>
 
@@ -66,19 +67,19 @@
 				<dependency>
 					<groupId>org.argeo.slc</groupId>
 					<artifactId>org.argeo.slc.lib.jcr</artifactId>
-					<version>2.1.1-SNAPSHOT</version>
+					<version>2.1.14-SNAPSHOT</version>
 				</dependency>
 				<dependency>
 					<groupId>org.argeo.slc</groupId>
 					<artifactId>org.argeo.slc.lib.repo</artifactId>
-					<version>2.1.1-SNAPSHOT</version>
+					<version>2.1.14-SNAPSHOT</version>
 				</dependency>
 
 				<!-- Launcher -->
 				<dependency>
 					<groupId>org.argeo.slc</groupId>
 					<artifactId>org.argeo.slc.launcher</artifactId>
-					<version>2.1.1-SNAPSHOT</version>
+					<version>2.1.14-SNAPSHOT</version>
 					<!-- <type>tar.gz</type> -->
 					<!-- <classifier>base</classifier> -->
 				</dependency>
@@ -118,106 +119,35 @@
 						<artifactId>rpm-maven-plugin</artifactId>
 						<executions>
 							<execution>
-								<id>rpm-slc</id>
+								<id>rpm</id>
 								<phase>package</phase>
 								<goals>
 									<goal>rpm</goal>
 								</goals>
 								<configuration>
-									<name>slc</name>
+									<name>slc-repo</name>
 									<mappings>
 										<mapping>
-											<directory>/usr/bin</directory>
+											<directory>/etc/argeo/conf.d</directory>
 											<username>root</username>
-											<groupname>root</groupname>
-											<filemode>755</filemode>
-											<directoryIncluded>false</directoryIncluded>
-											<sources>
-												<source>
-													<location>src/main/rpm/usr/bin</location>
-												</source>
-											</sources>
-										</mapping>
-										<mapping>
-											<directory>/etc/init.d</directory>
-											<username>root</username>
-											<groupname>root</groupname>
-											<filemode>755</filemode>
-											<directoryIncluded>false</directoryIncluded>
-											<sources>
-												<source>
-													<location>src/main/rpm/etc/init.d</location>
-												</source>
-											</sources>
-										</mapping>
-										<mapping>
-											<directory>/etc/slc</directory>
-											<username>root</username>
-											<groupname>slc</groupname>
+											<groupname>argeo</groupname>
 											<filemode>640</filemode>
 											<configuration>noreplace</configuration>
 											<directoryIncluded>false</directoryIncluded>
 											<sources>
 												<source>
-													<location>src/main/rpm/etc/slc</location>
-												</source>
-											</sources>
-										</mapping>
-										<mapping>
-											<directory>/etc/slc-cl</directory>
-											<username>root</username>
-											<groupname>root</groupname>
-											<filemode>644</filemode>
-											<directoryIncluded>false</directoryIncluded>
-											<sources>
-												<source>
-													<location>src/main/rpm/etc/slc-cl</location>
-												</source>
-											</sources>
-										</mapping>
-<!-- 										<mapping> -->
-<!-- 											<directory>/usr/share/osgi/boot</directory> -->
-<!-- 											<username>root</username> -->
-<!-- 											<groupname>root</groupname> -->
-<!-- 											<filemode>644</filemode> -->
-<!-- 											<directoryIncluded>false</directoryIncluded> -->
-<!-- 											<sources> -->
-<!-- 												<source> -->
-<!-- 													<location>${project.build.directory}/boot</location> -->
-<!-- 													<includes> -->
-<!-- 														<include>org.argeo.slc.launcher.jar</include> -->
-<!-- 													</includes> -->
-<!-- 												</source> -->
-<!-- 											</sources> -->
-<!-- 										</mapping> -->
-										<!-- Maven (even if not installed) -->
-										<mapping>
-											<directory>/var/lib/slc/.m2</directory>
-											<username>slc</username>
-											<groupname>slc</groupname>
-											<filemode>600</filemode>
-											<directoryIncluded>false</directoryIncluded>
-											<sources>
-												<source>
-													<location>src/main/rpm/var/lib/slc/.m2</location>
+													<location>rpm/etc/argeo/conf.d</location>
+													<includes>
+														<include>*.ini</include>
+														<include>*.txt</include>
+													</includes>
 												</source>
 											</sources>
 										</mapping>
 									</mappings>
-									<preinstallScriptlet>
-										<scriptFile>src/main/scripts/preinstall</scriptFile>
-									</preinstallScriptlet>
-									<postinstallScriptlet>
-										<scriptFile>src/main/scripts/postinstall</scriptFile>
-									</postinstallScriptlet>
-									<preremoveScriptlet>
-										<scriptFile>src/main/scripts/preremove</scriptFile>
-									</preremoveScriptlet>
 									<requires>
+										<require>argeo-node</require>
 										<require>slc-platform</require>
-										<require>osgi-boot</require>
-										<!-- do not require java so that it can be installed on Ubuntu -->
-										<!-- <require>java-1.6.0-openjdk</require> -->
 									</requires>
 								</configuration>
 							</execution>