X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=dist%2Fosgi-boot%2Fpom.xml;h=8588397edb462de5efcb7ca3351754152bafecdd;hb=a6ee8de2e85593de5204628c91b84bdee16e3dc7;hp=d6ad28142cc4208afd0ab9bca987e3aea72dbdd0;hpb=d7d3200adee3767cf6ea8ab3d18e2f37b2fc67a4;p=lgpl%2Fargeo-commons.git

diff --git a/dist/osgi-boot/pom.xml b/dist/osgi-boot/pom.xml
index d6ad28142..ec219490f 100644
--- a/dist/osgi-boot/pom.xml
+++ b/dist/osgi-boot/pom.xml
@@ -2,53 +2,62 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.argeo.commons</groupId>
-		<version>2.1.30</version>
+		<version>2.3.0</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-tp}</version>
+		</dependency>
+
+		<!-- OSGi Boot (and Equinox) -->
+		<dependency>
+			<groupId>org.argeo.commons</groupId>
+			<artifactId>org.argeo.osgi.boot</artifactId>
+			<version>2.3.0</version>
+		</dependency>
+	</dependencies>
 	<profiles>
 		<profile>
-			<id>rpmbuild</id>
+			<id>dist</id>
 			<build>
 				<plugins>
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-dependency-plugin</artifactId>
+						<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>copy-dependencies</id>
+								<id>assembly-base</id>
 								<phase>package</phase>
 								<goals>
-									<goal>copy</goal>
+									<goal>single</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>
+				</plugins>
+			</build>
+		</profile>
+		<profile>
+			<id>rpmbuild</id>
+			<build>
+				<plugins>
 					<plugin>
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>rpm-maven-plugin</artifactId>
@@ -60,92 +69,60 @@
 									<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>*-functions.sh</include>
-													</includes>
-												</source>
-											</sources>
-										</mapping>
-										<mapping>
-											<directory>/usr/sbin</directory>
-											<username>root</username>
-											<groupname>root</groupname>
-											<filemode>755</filemode>
-											<sources>
-												<source>
-													<location>src/main/rpm/usr/sbin</location>
-												</source>
-											</sources>
+											<dependency>
+												<stripVersion>true</stripVersion>
+												<includes>
+													<include>org.argeo.commons:org.argeo.osgi.boot</include>
+												</includes>
+											</dependency>
 										</mapping>
 										<mapping>
 											<directory>/usr/share/osgi/boot</directory>
 											<username>root</username>
 											<groupname>root</groupname>
 											<filemode>644</filemode>
+											<configuration>noreplace</configuration>
 											<directoryIncluded>false</directoryIncluded>
 											<sources>
 												<source>
-													<location>${project.build.directory}/lib</location>
+													<location>rpm/usr/share/osgi/boot</location>
 													<includes>
-														<include>org.argeo.osgi.boot.jar</include>
+														<include>*.args</include>
 													</includes>
 												</source>
 											</sources>
 										</mapping>
 									</mappings>
 									<requires>
-										<require>osgi-boot-equinox</require>
+										<require>argeo-osgi-boot-equinox</require>
 									</requires>
 								</configuration>
 							</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>
@@ -164,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>
@@ -173,14 +151,12 @@
 											<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>
 										</mapping>
 									</mappings>
 								</configuration>