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

diff --git a/dist/slc/pom.xml b/dist/slc/pom.xml
index 828a60439..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>2.1.5</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>2.1.5</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>2.1.1-SNAPSHOT</version>
+					<version>2.1.9</version>
 				</dependency>
 				<dependency>
 					<groupId>org.argeo.slc</groupId>
 					<artifactId>org.argeo.slc.lib.repo</artifactId>
-					<version>2.1.1-SNAPSHOT</version>
+					<version>2.1.9</version>
 				</dependency>
 
 				<!-- Launcher -->
 				<dependency>
 					<groupId>org.argeo.slc</groupId>
 					<artifactId>org.argeo.slc.launcher</artifactId>
-					<version>2.1.1-SNAPSHOT</version>
+					<version>2.1.9</version>
 					<!-- <type>tar.gz</type> -->
 					<!-- <classifier>base</classifier> -->
 				</dependency>
@@ -88,31 +89,31 @@
 			<id>rpmbuild</id>
 			<build>
 				<plugins>
-<!-- 					<plugin> -->
-<!-- 						<groupId>org.apache.maven.plugins</groupId> -->
-<!-- 						<artifactId>maven-dependency-plugin</artifactId> -->
-<!-- 						<executions> -->
-<!-- 							<execution> -->
-<!-- 								<id>copy-dependencies-rpm</id> -->
-<!-- 								<phase>package</phase> -->
-<!-- 								<goals> -->
-<!-- 									<goal>copy</goal> -->
-<!-- 								</goals> -->
-<!-- 								<configuration> -->
-<!-- 									<includeTypes>jar</includeTypes> -->
-<!-- 									<stripVersion>true</stripVersion> -->
-<!-- 									<outputDirectory>${project.build.directory}/boot</outputDirectory> -->
-<!-- 									<artifactItems> -->
-<!-- 										<artifactItem> -->
-<!-- 											<groupId>org.argeo.slc</groupId> -->
-<!-- 											<artifactId>org.argeo.slc.launcher</artifactId> -->
-<!-- 											<version>${project.version}</version> -->
-<!-- 										</artifactItem> -->
-<!-- 									</artifactItems> -->
-<!-- 								</configuration> -->
-<!-- 							</execution> -->
-<!-- 						</executions> -->
-<!-- 					</plugin> -->
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-dependency-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>copy-dependencies-rpm</id>
+								<phase>package</phase>
+								<goals>
+									<goal>copy</goal>
+								</goals>
+								<configuration>
+									<includeTypes>jar</includeTypes>
+									<stripVersion>true</stripVersion>
+									<outputDirectory>${project.build.directory}/boot</outputDirectory>
+									<artifactItems>
+										<artifactItem>
+											<groupId>org.argeo.slc</groupId>
+											<artifactId>org.argeo.slc.launcher</artifactId>
+											<version>${project.version}</version>
+										</artifactItem>
+									</artifactItems>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
 					<plugin>
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>rpm-maven-plugin</artifactId>
@@ -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,53 +196,52 @@
 											<directoryIncluded>false</directoryIncluded>
 											<sources>
 												<source>
-													<location>src/main/rpm/etc/slc-cl</location>
+													<location>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>
+											<directory>/usr/share/osgi/boot</directory>
+											<username>root</username>
+											<groupname>root</groupname>
+											<filemode>644</filemode>
 											<directoryIncluded>false</directoryIncluded>
 											<sources>
 												<source>
-													<location>src/main/rpm/var/lib/slc/.m2</location>
+													<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>rpm/var/lib/slc/.m2</location> -->
+										<!-- </source> -->
+										<!-- </sources> -->
+										<!-- </mapping> -->
 									</mappings>
 									<preinstallScriptlet>
-										<scriptFile>src/main/scripts/preinstall</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</scriptFile>
+										<scriptFile>rpm/scripts/preremove</scriptFile>
 									</preremoveScriptlet>
 									<requires>
 										<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>