X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=dist%2Fosgi-boot%2Fpom.xml;h=452f53b052c23bc86e3cef73a73635ddff59e063;hb=b20d9443fc46845df95ae47ead3ecf431689d311;hp=002e07546866eacd5183ffa7d2ab41fcc4a044dd;hpb=2452457b89f3b0d9470ae185abd43044abe16739;p=lgpl%2Fargeo-commons.git

diff --git a/dist/osgi-boot/pom.xml b/dist/osgi-boot/pom.xml
index 002e07546..82b93b910 100644
--- a/dist/osgi-boot/pom.xml
+++ b/dist/osgi-boot/pom.xml
@@ -1,55 +1,36 @@
-<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.12-SNAPSHOT</version>
+		<version>2.1.71-SNAPSHOT</version>
 		<artifactId>dist</artifactId>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>osgi-boot</artifactId>
 	<packaging>pom</packaging>
-	<name>Commons OSGi Boot Distribution</name>
+	<name>Commons Deployable OSGi Boot</name>
 	<properties>
-		<version.equinox>3.9.1.v20140110-1610</version.equinox>
+		<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.71-SNAPSHOT</version>
+		</dependency>
+	</dependencies>
 	<profiles>
 		<profile>
 			<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>
@@ -89,6 +70,7 @@
 												<source>
 													<location>src/main/rpm/etc/osgiboot</location>
 													<includes>
+														<include>*.policy</include>
 														<include>*-functions.sh</include>
 													</includes>
 												</source>
@@ -99,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>
@@ -111,14 +97,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>
@@ -128,26 +120,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,7 +139,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>
@@ -175,14 +147,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>