X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=dist%2Fslc%2Fpom.xml;h=dc8e5908c07b913712b12ee52d96787c02e89e5c;hb=0ff5ef37d236965bc6c1e5e1af9315e9be86d962;hp=5ea9cb0a1b050c2f3c6d56c61c3a611e09028a00;hpb=b4b471ffcf78d045e99504464d530a7eaccb9ef6;p=gpl%2Fargeo-slc.git

diff --git a/dist/slc/pom.xml b/dist/slc/pom.xml
index 5ea9cb0a1..dc8e5908c 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>1.1.17</version>
+		<version>2.1.9</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>1.1.17</version>
+					<version>2.1.9</version>
 					<type>pom</type>
 				</dependency>
 
@@ -66,19 +67,19 @@
 				<dependency>
 					<groupId>org.argeo.slc</groupId>
 					<artifactId>org.argeo.slc.lib.jcr</artifactId>
-					<version>1.1.17</version>
+					<version>2.1.9</version>
 				</dependency>
 				<dependency>
 					<groupId>org.argeo.slc</groupId>
 					<artifactId>org.argeo.slc.lib.repo</artifactId>
-					<version>1.1.17</version>
+					<version>2.1.9</version>
 				</dependency>
 
 				<!-- Launcher -->
 				<dependency>
 					<groupId>org.argeo.slc</groupId>
 					<artifactId>org.argeo.slc.launcher</artifactId>
-					<version>1.1.17</version>
+					<version>2.1.9</version>
 					<!-- <type>tar.gz</type> -->
 					<!-- <classifier>base</classifier> -->
 				</dependency>
@@ -134,10 +135,34 @@
 											<directoryIncluded>false</directoryIncluded>
 											<sources>
 												<source>
-													<location>src/main/rpm/usr/bin</location>
+													<location>rpm/usr/bin</location>
 												</source>
 											</sources>
 										</mapping>
+										<!-- <mapping> -->
+										<!-- <directory>/usr/sbin</directory> -->
+										<!-- <username>root</username> -->
+										<!-- <groupname>root</groupname> -->
+										<!-- <filemode>755</filemode> -->
+										<!-- <directoryIncluded>false</directoryIncluded> -->
+										<!-- <sources> -->
+										<!-- <source> -->
+										<!-- <location>rpm/usr/sbin</location> -->
+										<!-- </source> -->
+										<!-- </sources> -->
+										<!-- </mapping> -->
+										<!-- <mapping> -->
+										<!-- <directory>/usr/lib/systemd/system</directory> -->
+										<!-- <username>root</username> -->
+										<!-- <groupname>root</groupname> -->
+										<!-- <filemode>644</filemode> -->
+										<!-- <directoryIncluded>false</directoryIncluded> -->
+										<!-- <sources> -->
+										<!-- <source> -->
+										<!-- <location>rpm/usr/lib/systemd/system</location> -->
+										<!-- </source> -->
+										<!-- </sources> -->
+										<!-- </mapping> -->
 										<mapping>
 											<directory>/etc/init.d</directory>
 											<username>root</username>
@@ -146,7 +171,7 @@
 											<directoryIncluded>false</directoryIncluded>
 											<sources>
 												<source>
-													<location>src/main/rpm/etc/init.d</location>
+													<location>rpm/etc/init.d</location>
 												</source>
 											</sources>
 										</mapping>
@@ -159,7 +184,7 @@
 											<directoryIncluded>false</directoryIncluded>
 											<sources>
 												<source>
-													<location>src/main/rpm/etc/slc</location>
+													<location>rpm/etc/slc</location>
 												</source>
 											</sources>
 										</mapping>
@@ -171,7 +196,7 @@
 											<directoryIncluded>false</directoryIncluded>
 											<sources>
 												<source>
-													<location>src/main/rpm/etc/slc-cl</location>
+													<location>rpm/etc/slc-cl</location>
 												</source>
 											</sources>
 										</mapping>
@@ -191,33 +216,32 @@
 											</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>
-												</source>
-											</sources>
-										</mapping>
+										<!-- <mapping> -->
+										<!-- <directory>/var/lib/slc/.m2</directory> -->
+										<!-- <username>slc</username> -->
+										<!-- <groupname>slc</groupname> -->
+										<!-- <filemode>600</filemode> -->
+										<!-- <directoryIncluded>false</directoryIncluded> -->
+										<!-- <sources> -->
+										<!-- <source> -->
+										<!-- <location>rpm/var/lib/slc/.m2</location> -->
+										<!-- </source> -->
+										<!-- </sources> -->
+										<!-- </mapping> -->
 									</mappings>
 									<preinstallScriptlet>
-										<scriptFile>src/main/scripts/preinstall-${rpm.release}</scriptFile>
+										<scriptFile>rpm/scripts/preinstall</scriptFile>
 									</preinstallScriptlet>
 									<postinstallScriptlet>
-										<scriptFile>src/main/scripts/postinstall</scriptFile>
+										<scriptFile>rpm/scripts/postinstall</scriptFile>
 									</postinstallScriptlet>
 									<preremoveScriptlet>
-										<scriptFile>src/main/scripts/preremove-${rpm.release}</scriptFile>
+										<scriptFile>rpm/scripts/preremove</scriptFile>
 									</preremoveScriptlet>
 									<requires>
-										<require>slc-libs</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>