X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=dist%2Fosgi-boot%2Fpom.xml;h=506ed130e750d6410b397c60338181f30e4d5cce;hb=c3dbe275147ce8f2069848ef4142d425a35c29d6;hp=b73d07f78fb3da5acc5ec4267ea3ca6de79743c6;hpb=a5b49032fbf094cdc192516b9f8957b6ce39b3ad;p=lgpl%2Fargeo-commons.git

diff --git a/dist/osgi-boot/pom.xml b/dist/osgi-boot/pom.xml
index b73d07f78..506ed130e 100644
--- a/dist/osgi-boot/pom.xml
+++ b/dist/osgi-boot/pom.xml
@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.argeo.commons</groupId>
-		<version>2.1.32-SNAPSHOT</version>
+		<version>2.1.72-SNAPSHOT</version>
 		<artifactId>dist</artifactId>
 		<relativePath>..</relativePath>
 	</parent>
@@ -16,14 +16,14 @@
 		<dependency>
 			<groupId>org.argeo.tp</groupId>
 			<artifactId>argeo-tp</artifactId>
-			<version>${version.argeo-distribution}</version>
+			<version>${version.argeo-tp}</version>
 		</dependency>
 
 		<!-- OSGi Boot (and Equinox) -->
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.osgi.boot</artifactId>
-			<version>2.1.32-SNAPSHOT</version>
+			<version>2.1.72-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 	<profiles>
@@ -31,38 +31,6 @@
 			<id>rpmbuild</id>
 			<build>
 				<plugins>
-					<!-- <plugin> -->
-					<!-- <groupId>org.apache.maven.plugins</groupId> -->
-					<!-- <artifactId>maven-dependency-plugin</artifactId> -->
-					<!-- <executions> -->
-					<!-- <execution> -->
-					<!-- <id>copy-dependencies</id> -->
-					<!-- <phase>package</phase> -->
-					<!-- <goals> -->
-					<!-- <goal>copy</goal> -->
-					<!-- </goals> -->
-					<!-- <configuration> -->
-					<!-- <includeTypes>jar</includeTypes> -->
-					<!-- <stripVersion>true</stripVersion> -->
-					<!-- <outputDirectory>${project.build.directory}/lib</outputDirectory> -->
-					<!-- <artifactItems> -->
-					<!-- <artifactItem> -->
-					<!-- <groupId>org.argeo.commons</groupId> -->
-					<!-- <artifactId>org.argeo.osgi.boot</artifactId> -->
-					<!-- <version>${version.argeo-commons}</version> -->
-					<!-- <type>jar</type> -->
-					<!-- </artifactItem> -->
-					<!-- <artifactItem> -->
-					<!-- <groupId>org.argeo.tp.equinox</groupId> -->
-					<!-- <artifactId>org.eclipse.osgi</artifactId> -->
-					<!-- <version>${version.equinox}</version> -->
-					<!-- <type>jar</type> -->
-					<!-- </artifactItem> -->
-					<!-- </artifactItems> -->
-					<!-- </configuration> -->
-					<!-- </execution> -->
-					<!-- </executions> -->
-					<!-- </plugin> -->
 					<plugin>
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>rpm-maven-plugin</artifactId>
@@ -102,19 +70,39 @@
 												<source>
 													<location>src/main/rpm/etc/osgiboot</location>
 													<includes>
+														<include>*.policy</include>
 														<include>*-functions.sh</include>
 													</includes>
 												</source>
 											</sources>
 										</mapping>
+										<mapping>
+											<directory>/usr/bin</directory>
+											<username>root</username>
+											<groupname>root</groupname>
+											<filemode>755</filemode>
+											<directoryIncluded>false</directoryIncluded>
+											<sources>
+												<source>
+													<location>src/main/rpm/usr/sbin</location>
+													<includes>
+														<include>*</include>
+													</includes>
+												</source>
+											</sources>
+										</mapping>
 										<mapping>
 											<directory>/usr/sbin</directory>
 											<username>root</username>
 											<groupname>root</groupname>
 											<filemode>755</filemode>
+											<directoryIncluded>false</directoryIncluded>
 											<sources>
 												<source>
 													<location>src/main/rpm/usr/sbin</location>
+													<includes>
+														<include>osgi-service</include>
+													</includes>
 												</source>
 											</sources>
 										</mapping>
@@ -166,7 +154,7 @@
 								</goals>
 								<configuration>
 									<name>osgi-boot-equinox</name>
-									<projversion>${version.argeo-distribution}</projversion>
+									<projversion>${version.argeo-tp}</projversion>
 									<mappings>
 										<mapping>
 											<directory>/usr/share/osgi/boot</directory>