X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=dist%2Fosgi-boot%2Fpom.xml;h=0715485dff921c05a6b3f12ca1455dba4a43f0b3;hb=3e10aa9a4fd178ed289d463e5af33a4d94bd16c4;hp=b010e7024267a001e6b72c1da8f16ad4e1d7339a;hpb=519ee8c660bcb4a5c28f1ab63bd0307481e370d7;p=lgpl%2Fargeo-commons.git

diff --git a/dist/osgi-boot/pom.xml b/dist/osgi-boot/pom.xml
index b010e7024..0715485df 100644
--- a/dist/osgi-boot/pom.xml
+++ b/dist/osgi-boot/pom.xml
@@ -1,9 +1,8 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.argeo.commons</groupId>
-		<version>2.1.31-SNAPSHOT</version>
+		<version>2.1.48-SNAPSHOT</version>
 		<artifactId>dist</artifactId>
 		<relativePath>..</relativePath>
 	</parent>
@@ -24,7 +23,7 @@
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.osgi.boot</artifactId>
-			<version>2.1.31-SNAPSHOT</version>
+			<version>2.1.48-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 	<profiles>
@@ -32,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>
@@ -103,6 +70,7 @@
 												<source>
 													<location>src/main/rpm/etc/osgiboot</location>
 													<includes>
+														<include>*.policy</include>
 														<include>*-functions.sh</include>
 													</includes>
 												</source>
@@ -113,9 +81,13 @@
 											<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>
@@ -126,6 +98,7 @@
 											<filemode>644</filemode>
 											<directoryIncluded>false</directoryIncluded>
 											<dependency>
+												<stripVersion>true</stripVersion>
 												<includes>
 													<include>org.argeo.commons:org.argeo.osgi.boot</include>
 												</includes>
@@ -175,6 +148,7 @@
 											<filemode>644</filemode>
 											<directoryIncluded>false</directoryIncluded>
 											<dependency>
+												<stripVersion>true</stripVersion>
 												<includes>
 													<include>org.argeo.tp.equinox:org.eclipse.osgi</include>
 												</includes>