Adapt OSGi Boot RPM build

git-svn-id: https://svn.argeo.org/commons/trunk@8669 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/dist/osgi-boot/pom.xml b/dist/osgi-boot/pom.xml
index 84fe6fe3b9d11a1e5394f2c2e6513fa30a039d3c..b010e7024267a001e6b72c1da8f16ad4e1d7339a 100644 (file)
--- a/dist/osgi-boot/pom.xml
+++ b/dist/osgi-boot/pom.xml
@@ -1,4 +1,5 @@
-<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>
@@ -12,43 +13,57 @@
        <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>
+               </dependency>
+
+               <!-- OSGi Boot (and Equinox) -->
+               <dependency>
+                       <groupId>org.argeo.commons</groupId>
+                       <artifactId>org.argeo.osgi.boot</artifactId>
+                       <version>2.1.31-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.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>
@@ -110,14 +125,19 @@
                                                                                        <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>
+                                                                                               <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>
@@ -127,25 +147,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>
@@ -173,14 +174,19 @@
                                                                                        <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>
+                                                                                               <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>