Remove or merge bundles

[lgpl/argeo-commons.git] / dist / osgi-boot / pom.xml

diff --git a/dist/osgi-boot/pom.xml b/dist/osgi-boot/pom.xml
index 7c67df4f7d66f1436d0105ae660735906e34abe9..9a81e9b1cf995f3731ac1c0430b99b8790e0f712 100644 (file)
--- a/dist/osgi-boot/pom.xml
+++ b/dist/osgi-boot/pom.xml
@@ -1,15 +1,17 @@
-<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.14-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.10.1.v20140909-1633</version.equinox>
+       </properties>
        <profiles>
                <profile>
                        <id>rpmbuild</id>
@@ -23,7 +25,7 @@
                                                                <id>copy-dependencies</id>
                                                                <phase>package</phase>
                                                                <goals>
-                                                                       <goal>copy-dependencies</goal>
+                                                                       <goal>copy</goal>
                                                                </goals>
                                                                <configuration>
                                                                        <includeTypes>jar</includeTypes>
@@ -33,7 +35,13 @@
                                                                                <artifactItem>
                                                                                        <groupId>org.argeo.commons</groupId>
                                                                                        <artifactId>org.argeo.osgi.boot</artifactId>
-                                                                                       <version>2.1.12-SNAPSHOT</version>
+                                                                                       <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>
@@ -130,8 +138,7 @@
                                                                <configuration>
                                                                        <target>
                                                                                <copy todir="${rpm.stagingRepository}" verbose="true">
-                                                                                       <fileset dir="${project.build.directory}/rpm"
-                                                                                               includes="*/RPMS/**/*.rpm" />
+                                                                                       <fileset dir="${project.build.directory}/rpm" includes="*/RPMS/**/*.rpm" />
                                                                                        <flattenmapper />
                                                                                </copy>
                                                                        </target>