commons: improve maven, new RPM structure

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

diff --git a/osgi/dist/osgi-boot/pom.xml b/osgi/dist/osgi-boot/pom.xml
index 952d3bb07adc8a8d74056de11f3e40207933372c..7847f0f8bed1a607269d49b2a606118507b8f2bc 100644 (file)
--- a/osgi/dist/osgi-boot/pom.xml
+++ b/osgi/dist/osgi-boot/pom.xml
@@ -47,25 +47,16 @@
                                        <plugin>
                                                <groupId>org.codehaus.mojo</groupId>
                                                <artifactId>rpm-maven-plugin</artifactId>
-                                               <version>2.1-alpha-1</version>
-                                               <extensions>true</extensions>
-                                               <configuration>
-                                                       <version>${project.version}</version>
-                                                       <release>r${buildNumber}.argeo</release>
-                                                       <copyright>2011 Argeo</copyright>
-                                                       <distribution>argeo</distribution>
-                                                       <packager>mbaudier@argeo.org</packager>
-                                                       <group>Applications/System</group>
-                                                       <prefix>/usr</prefix>
-                                               </configuration>
                                                <executions>
                                                        <execution>
-                                                               <id>rpm-sdk</id>
+                                                               <id>rpm-osgi-boot</id>
                                                                <phase>package</phase>
                                                                <goals>
-                                                                       <goal>attached-rpm</goal>
+                                                                       <goal>rpm</goal>
                                                                </goals>
                                                                <configuration>
+                                                                       <name>osgi-boot</name>
+                                                                       <copyright>2011 Argeo</copyright>
                                                                        <mappings>
                                                                                <mapping>
                                                                                        <directory>/etc/osgiboot</directory>
@@ -106,14 +97,11 @@
                                                                                        <sources>
                                                                                                <source>
                                                                                                        <location>src/main/rpm/usr/sbin</location>
-                                                                                                       <includes>
-                                                                                                               <include>*</include>
-                                                                                                       </includes>
                                                                                                </source>
                                                                                        </sources>
                                                                                </mapping>
                                                                                <mapping>
-                                                                                       <directory>/usr/share/osgiboot/lib</directory>
+                                                                                       <directory>/usr/share/osgi/boot</directory>
                                                                                        <username>root</username>
                                                                                        <groupname>root</groupname>
                                                                                        <filemode>644</filemode>
@@ -122,19 +110,80 @@
                                                                                                <source>
                                                                                                        <location>${project.build.directory}/lib</location>
                                                                                                        <includes>
-                                                                                                               <include>*.jar</include>
+                                                                                                               <include>org.argeo.osgi.boot.jar</include>
                                                                                                        </includes>
                                                                                                </source>
                                                                                        </sources>
                                                                                </mapping>
                                                                        </mappings>
                                                                        <requires>
-                                                                               <require>java</require>
+                                                                               <require>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>
+               <profile>
+                       <id>rpmbuild-tp</id>
+                       <build>
+                               <plugins>
+                                       <plugin>
+                                               <groupId>org.codehaus.mojo</groupId>
+                                               <artifactId>rpm-maven-plugin</artifactId>
+                                               <executions>
+                                                       <execution>
+                                                               <id>rpm-osgi-boot-equinox</id>
+                                                               <phase>package</phase>
+                                                               <goals>
+                                                                       <goal>rpm</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       <name>osgi-boot-equinox</name>
+                                                                       <projversion>${version.argeo-distribution}</projversion>
+                                                                       <mappings>
+                                                                               <mapping>
+                                                                                       <directory>/usr/share/osgi/boot</directory>
+                                                                                       <username>root</username>
+                                                                                       <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>
+                                                                               </mapping>
+                                                                       </mappings>
+                                                               </configuration>
+                                                       </execution>
+                                               </executions>
+                                       </plugin>
                                </plugins>
                        </build>
                </profile>