X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=dist%2Fosgi-boot%2Fpom.xml;h=860f1d6b4ebf05b4e25d7267436a1f2b80dd6795;hb=c3dbe275147ce8f2069848ef4142d425a35c29d6;hp=d1de1009d012d1502afcb71b3f92e4e86254025b;hpb=4cb4a2a22fea4379d4f99e391e75ecf7bdd0e82b;p=lgpl%2Fargeo-commons.git

diff --git a/dist/osgi-boot/pom.xml b/dist/osgi-boot/pom.xml
index d1de1009d..506ed130e 100644
--- a/dist/osgi-boot/pom.xml
+++ b/dist/osgi-boot/pom.xml
@@ -2,40 +2,28 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.argeo.commons</groupId>
-		<version>2.1.13-SNAPSHOT</version>
+		<version>2.1.72-SNAPSHOT</version>
 		<artifactId>dist</artifactId>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>osgi-boot</artifactId>
 	<packaging>pom</packaging>
-	<name>Commons OSGi Boot Distribution</name>
-	<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-dependencies</goal>
-						</goals>
-						<configuration>
-							<includeTypes>jar</includeTypes>
-							<stripVersion>true</stripVersion>
-							<outputDirectory>${project.build.directory}/lib</outputDirectory>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
+	<name>Commons Deployable OSGi Boot</name>
+	<properties>
+		<version.equinox>3.10.1.v20140909-1633</version.equinox>
+	</properties>
 	<dependencies>
+		<dependency>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>argeo-tp</artifactId>
+			<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.13-SNAPSHOT</version>
+			<version>2.1.72-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 	<profiles>
@@ -82,37 +70,63 @@
 												<source>
 													<location>src/main/rpm/etc/osgiboot</location>
 													<includes>
+														<include>*.policy</include>
 														<include>*-functions.sh</include>
 													</includes>
 												</source>
 											</sources>
 										</mapping>
 										<mapping>
-											<directory>/usr/sbin</directory>
+											<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/share/osgi/boot</directory>
+											<directory>/usr/sbin</directory>
 											<username>root</username>
 											<groupname>root</groupname>
-											<filemode>644</filemode>
+											<filemode>755</filemode>
 											<directoryIncluded>false</directoryIncluded>
 											<sources>
 												<source>
-													<location>${project.build.directory}/lib</location>
+													<location>src/main/rpm/usr/sbin</location>
 													<includes>
-														<include>org.argeo.osgi.boot.jar</include>
+														<include>osgi-service</include>
 													</includes>
 												</source>
 											</sources>
 										</mapping>
+										<mapping>
+											<directory>/usr/share/osgi/boot</directory>
+											<username>root</username>
+											<groupname>root</groupname>
+											<filemode>644</filemode>
+											<directoryIncluded>false</directoryIncluded>
+											<dependency>
+												<stripVersion>true</stripVersion>
+												<includes>
+													<include>org.argeo.commons:org.argeo.osgi.boot</include>
+												</includes>
+											</dependency>
+											<!-- <sources> -->
+											<!-- <source> -->
+											<!-- <location>${project.build.directory}/lib</location> -->
+											<!-- <includes> -->
+											<!-- <include>org.argeo.osgi.boot.jar</include> -->
+											<!-- </includes> -->
+											<!-- </source> -->
+											<!-- </sources> -->
+										</mapping>
 									</mappings>
 									<requires>
 										<require>osgi-boot-equinox</require>
@@ -121,25 +135,6 @@
 							</execution>
 						</executions>
 					</plugin>
-					<plugin>
-						<artifactId>maven-antrun-plugin</artifactId>
-						<executions>
-							<execution>
-								<phase>install</phase>
-								<goals>
-									<goal>run</goal>
-								</goals>
-								<configuration>
-									<target>
-										<copy todir="${rpm.stagingRepository}" verbose="true">
-											<fileset dir="${project.build.directory}/rpm" includes="*/RPMS/**/*.rpm" />
-											<flattenmapper />
-										</copy>
-									</target>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
 				</plugins>
 			</build>
 		</profile>
@@ -159,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>
@@ -167,14 +162,20 @@
 											<groupname>root</groupname>
 											<filemode>644</filemode>
 											<directoryIncluded>false</directoryIncluded>
-											<sources>
-												<source>
-													<location>${project.build.directory}/lib</location>
-													<includes>
-														<include>org.eclipse.osgi.jar</include>
-													</includes>
-												</source>
-											</sources>
+											<dependency>
+												<stripVersion>true</stripVersion>
+												<includes>
+													<include>org.argeo.tp.equinox:org.eclipse.osgi</include>
+												</includes>
+											</dependency>
+											<!-- <sources> -->
+											<!-- <source> -->
+											<!-- <location>${project.build.directory}/lib</location> -->
+											<!-- <includes> -->
+											<!-- <include>org.eclipse.osgi.jar</include> -->
+											<!-- </includes> -->
+											<!-- </source> -->
+											<!-- </sources> -->
 										</mapping>
 									</mappings>
 								</configuration>