X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=dist%2Fosgi-boot%2Fpom.xml;h=4a1b2fcb7f656d54ce4863971f1b0ef221f5d4f9;hb=ef37921501125dd54ead43d6bc35c8f31dea62b9;hp=5885a5e68be3e7078161393ace82b6e7628519a2;hpb=fe9873a64b0f617e6e332dca10079b504023a5de;p=lgpl%2Fargeo-commons.git

diff --git a/dist/osgi-boot/pom.xml b/dist/osgi-boot/pom.xml
index 5885a5e68..4a1b2fcb7 100644
--- a/dist/osgi-boot/pom.xml
+++ b/dist/osgi-boot/pom.xml
@@ -1,68 +1,65 @@
-<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</version>
+		<version>2.1.86-SNAPSHOT</version>
 		<artifactId>dist</artifactId>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>osgi-boot</artifactId>
 	<packaging>pom</packaging>
 	<name>Commons Deployable OSGi Boot</name>
-	<properties>
-		<version.equinox>3.10.1.v20140909-1633</version.equinox>
-	</properties>
+	<!-- <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>
+			<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.31</version>
+			<version>2.1.86-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 	<profiles>
+		<profile>
+			<id>dist</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-assembly-plugin</artifactId>
+						<configuration>
+							<finalName>osgi-boot-${project.version}</finalName>
+							<appendAssemblyId>false</appendAssemblyId>
+							<descriptors>
+								<descriptor>assembly/osgi-boot.xml</descriptor>
+							</descriptors>
+						</configuration>
+						<executions>
+							<execution>
+								<id>assembly-base</id>
+								<phase>package</phase>
+								<goals>
+									<goal>single</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
 		<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>
@@ -102,19 +99,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>
@@ -130,14 +147,6 @@
 													<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>
@@ -166,7 +175,8 @@
 								</goals>
 								<configuration>
 									<name>osgi-boot-equinox</name>
-									<projversion>${version.argeo-distribution}</projversion>
+									<projversion>${version.argeo-tp}</projversion>
+									<release>${maven.build.timestamp}</release>
 									<mappings>
 										<mapping>
 											<directory>/usr/share/osgi/boot</directory>
@@ -180,14 +190,6 @@
 													<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>