X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=dist%2Fosgi-boot%2Fpom.xml;h=e89182037def1c4aca22e308bbafa26cc2548959;hb=00a6fde50ed511b7052c3d2b01b9f8149f8eb67e;hp=d1de1009d012d1502afcb71b3f92e4e86254025b;hpb=f6004d83a3dfc17a46d0c103140fb0f26089121d;p=lgpl%2Fargeo-commons.git

diff --git a/dist/osgi-boot/pom.xml b/dist/osgi-boot/pom.xml
index d1de1009d..e89182037 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.46-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-distribution}</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.46-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 	<profiles>
@@ -43,6 +31,38 @@
 			<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>
@@ -82,6 +102,7 @@
 												<source>
 													<location>src/main/rpm/etc/osgiboot</location>
 													<includes>
+														<include>*.policy</include>
 														<include>*-functions.sh</include>
 													</includes>
 												</source>
@@ -92,9 +113,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>
@@ -104,14 +129,20 @@
 											<groupname>root</groupname>
 											<filemode>644</filemode>
 											<directoryIncluded>false</directoryIncluded>
-											<sources>
-												<source>
-													<location>${project.build.directory}/lib</location>
-													<includes>
-														<include>org.argeo.osgi.boot.jar</include>
-													</includes>
-												</source>
-											</sources>
+											<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>
@@ -121,25 +152,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>
@@ -167,14 +179,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>