X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=dist%2Fslc%2Fpom.xml;h=872fdc712ee9ac75f8888e565027df25018d91ec;hb=refs%2Ftags%2Fargeo-slc-2.1.16;hp=9d5bc10f8d53270903394cfe2cbbdc061f7d745c;hpb=b0f8ff176ddf73677888e068adbae2df14577a98;p=gpl%2Fargeo-slc.git

diff --git a/dist/slc/pom.xml b/dist/slc/pom.xml
index 9d5bc10f8..872fdc712 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>2.1.8</version>
+		<version>2.1.16</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>slc</artifactId>
@@ -59,7 +59,7 @@
 				<dependency>
 					<groupId>org.argeo.slc</groupId>
 					<artifactId>org.argeo.slc.dep.backend</artifactId>
-					<version>2.1.8</version>
+					<version>2.1.16</version>
 					<type>pom</type>
 				</dependency>
 
@@ -67,19 +67,19 @@
 				<dependency>
 					<groupId>org.argeo.slc</groupId>
 					<artifactId>org.argeo.slc.lib.jcr</artifactId>
-					<version>2.1.8</version>
+					<version>2.1.16</version>
 				</dependency>
 				<dependency>
 					<groupId>org.argeo.slc</groupId>
 					<artifactId>org.argeo.slc.lib.repo</artifactId>
-					<version>2.1.8</version>
+					<version>2.1.16</version>
 				</dependency>
 
 				<!-- Launcher -->
 				<dependency>
 					<groupId>org.argeo.slc</groupId>
 					<artifactId>org.argeo.slc.launcher</artifactId>
-					<version>2.1.8</version>
+					<version>2.1.16</version>
 					<!-- <type>tar.gz</type> -->
 					<!-- <classifier>base</classifier> -->
 				</dependency>
@@ -89,159 +89,65 @@
 			<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>
 						<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>
-											<username>root</username>
-											<groupname>root</groupname>
-											<filemode>755</filemode>
-											<directoryIncluded>false</directoryIncluded>
-											<sources>
-												<source>
-													<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>
-											<groupname>root</groupname>
-											<filemode>755</filemode>
-											<directoryIncluded>false</directoryIncluded>
-											<sources>
-												<source>
-													<location>rpm/etc/init.d</location>
-												</source>
-											</sources>
-										</mapping>
-										<mapping>
-											<directory>/etc/slc</directory>
+											<directory>/etc/argeo/conf.d</directory>
 											<username>root</username>
-											<groupname>slc</groupname>
+											<groupname>argeo</groupname>
 											<filemode>640</filemode>
 											<configuration>noreplace</configuration>
 											<directoryIncluded>false</directoryIncluded>
 											<sources>
 												<source>
-													<location>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>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>
+													<location>rpm/etc/argeo/conf.d</location>
 													<includes>
-														<include>org.argeo.slc.launcher.jar</include>
+														<include>*.ini</include>
+														<include>*.txt</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>rpm/scripts/preinstall</scriptFile>
-									</preinstallScriptlet>
-									<postinstallScriptlet>
-										<scriptFile>rpm/scripts/postinstall</scriptFile>
-									</postinstallScriptlet>
-									<preremoveScriptlet>
-										<scriptFile>rpm/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 -->
 									</requires>
 								</configuration>
 							</execution>