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

diff --git a/dist/slc/pom.xml b/dist/slc/pom.xml
index 4b624fe82..b1fab9625 100644
--- a/dist/slc/pom.xml
+++ b/dist/slc/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.argeo.slc</groupId>
 		<artifactId>dist</artifactId>
-		<version>1.1.13</version>
+		<version>2.1.6-SNAPSHOT</version>
 	</parent>
 	<artifactId>slc</artifactId>
 	<packaging>pom</packaging>
@@ -58,7 +58,7 @@
 				<dependency>
 					<groupId>org.argeo.slc</groupId>
 					<artifactId>org.argeo.slc.dep.backend</artifactId>
-					<version>1.1.13</version>
+					<version>2.1.6-SNAPSHOT</version>
 					<type>pom</type>
 				</dependency>
 
@@ -66,19 +66,19 @@
 				<dependency>
 					<groupId>org.argeo.slc</groupId>
 					<artifactId>org.argeo.slc.lib.jcr</artifactId>
-					<version>1.1.13</version>
+					<version>2.1.1-SNAPSHOT</version>
 				</dependency>
 				<dependency>
 					<groupId>org.argeo.slc</groupId>
 					<artifactId>org.argeo.slc.lib.repo</artifactId>
-					<version>1.1.13</version>
+					<version>2.1.1-SNAPSHOT</version>
 				</dependency>
 
 				<!-- Launcher -->
 				<dependency>
 					<groupId>org.argeo.slc</groupId>
 					<artifactId>org.argeo.slc.launcher</artifactId>
-					<version>1.1.13</version>
+					<version>2.1.1-SNAPSHOT</version>
 					<!-- <type>tar.gz</type> -->
 					<!-- <classifier>base</classifier> -->
 				</dependency>
@@ -88,31 +88,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>
@@ -175,21 +175,21 @@
 												</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>
+<!-- 										<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>
@@ -205,16 +205,16 @@
 										</mapping>
 									</mappings>
 									<preinstallScriptlet>
-										<scriptFile>src/main/scripts/preinstall-${rpm.release}</scriptFile>
+										<scriptFile>src/main/scripts/preinstall</scriptFile>
 									</preinstallScriptlet>
 									<postinstallScriptlet>
 										<scriptFile>src/main/scripts/postinstall</scriptFile>
 									</postinstallScriptlet>
 									<preremoveScriptlet>
-										<scriptFile>src/main/scripts/preremove-${rpm.release}</scriptFile>
+										<scriptFile>src/main/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> -->