X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=dist%2Fosgi-boot%2Fpom.xml;h=c6986c0310b0bc3fb5fe2195a2699a06f7620cec;hb=dfcc0a6154d21674e8b1d8a1ccb4eefbc8f8caa5;hp=24ad134a317ecfad6002713cabad252e7ce158f9;hpb=fce56bf316710a89cef6f84e92bfb4b820b10d64;p=lgpl%2Fargeo-commons.git

diff --git a/dist/osgi-boot/pom.xml b/dist/osgi-boot/pom.xml
index 24ad134a3..c6986c031 100644
--- a/dist/osgi-boot/pom.xml
+++ b/dist/osgi-boot/pom.xml
@@ -2,31 +2,58 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.argeo.commons</groupId>
-		<version>2.1.68</version>
+		<version>2.1.91</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.68</version>
+			<version>2.1.91</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>
@@ -42,79 +69,55 @@
 									<goal>rpm</goal>
 								</goals>
 								<configuration>
-									<name>osgi-boot</name>
+									<name>argeo-osgi-boot</name>
 									<mappings>
 										<mapping>
-											<directory>/etc/osgiboot</directory>
+											<directory>/usr/bin</directory>
 											<username>root</username>
 											<groupname>root</groupname>
-											<filemode>644</filemode>
-											<configuration>noreplace</configuration>
+											<filemode>755</filemode>
 											<directoryIncluded>false</directoryIncluded>
 											<sources>
 												<source>
-													<location>src/main/rpm/etc/osgiboot</location>
+													<location>rpm/usr/bin</location>
 													<includes>
-														<include>*-settings.sh</include>
+														<include>*</include>
 													</includes>
 												</source>
 											</sources>
 										</mapping>
 										<mapping>
-											<directory>/etc/osgiboot</directory>
+											<directory>/usr/share/osgi/boot</directory>
 											<username>root</username>
 											<groupname>root</groupname>
 											<filemode>644</filemode>
 											<directoryIncluded>false</directoryIncluded>
-											<sources>
-												<source>
-													<location>src/main/rpm/etc/osgiboot</location>
-													<includes>
-														<include>*.policy</include>
-														<include>*-functions.sh</include>
-													</includes>
-												</source>
-											</sources>
+											<dependency>
+												<stripVersion>true</stripVersion>
+												<includes>
+													<include>org.argeo.commons:org.argeo.osgi.boot</include>
+												</includes>
+											</dependency>
 										</mapping>
 										<mapping>
-											<directory>/usr/sbin</directory>
+											<directory>/usr/share/osgi/boot</directory>
 											<username>root</username>
 											<groupname>root</groupname>
-											<filemode>755</filemode>
+											<filemode>644</filemode>
+											<configuration>noreplace</configuration>
 											<directoryIncluded>false</directoryIncluded>
 											<sources>
 												<source>
-													<location>src/main/rpm/usr/sbin</location>
+													<location>rpm/usr/share/osgi/boot</location>
 													<includes>
-														<include>osgi-service</include>
+														<include>*.args</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>
+										<require>argeo-osgi-boot-equinox</require>
 									</requires>
 								</configuration>
 							</execution>
@@ -138,8 +141,9 @@
 									<goal>rpm</goal>
 								</goals>
 								<configuration>
-									<name>osgi-boot-equinox</name>
-									<projversion>${version.argeo-distribution}</projversion>
+									<name>argeo-osgi-boot-equinox</name>
+									<projversion>${version.argeo-tp}</projversion>
+									<release>${maven.build.timestamp}</release>
 									<mappings>
 										<mapping>
 											<directory>/usr/share/osgi/boot</directory>
@@ -153,14 +157,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>