Improve RPM packaging

diff --git a/dep/org.argeo.suite.dep.e4.rcp/pom.xml b/dep/org.argeo.suite.dep.e4.rcp/pom.xml
index 0c9c1f67d6f4096650bd096ea0eea7e758d869c9..09c2354c0a8006db1a7676afe089f66a69058172 100644 (file)
--- a/dep/org.argeo.suite.dep.e4.rcp/pom.xml
+++ b/dep/org.argeo.suite.dep.e4.rcp/pom.xml
@@ -98,7 +98,7 @@
                                                                        <goal>rpm</goal>
                                                                </goals>
                                                                <configuration>
-                                                                       <name>argeo-suite-e4</name>
+                                                                       <name>argeo-suite-e4-rcp</name>
                                                                        <mappings>
                                                                                <mapping>
                                                                                        <directory>/usr/share/osgi</directory>
@@ -117,7 +117,7 @@
                                                                                </mapping>
                                                                        </mappings>
                                                                        <requires>
-                                                                               <require>argeo-connect-e4-tp</require>
+                                                                               <require>argeo-connect-e4-rcp</require>
                                                                        </requires>
                                                                </configuration>
                                                        </execution>

diff --git a/dep/org.argeo.suite.platform/pom.xml b/dep/org.argeo.suite.platform/pom.xml
index 89489cad31cb303b291a71db1e9caf2e6f2c76b4..f4496a0bc78e5b68e93d61c92fae51c052b81248 100644 (file)
--- a/dep/org.argeo.suite.platform/pom.xml
+++ b/dep/org.argeo.suite.platform/pom.xml
@@ -45,86 +45,5 @@
                
        </dependencies>
        <profiles>
-               <profile>
-                       <id>rpmbuild</id>
-                       <build>
-                               <plugins>
-                                       <plugin>
-                                               <artifactId>maven-assembly-plugin</artifactId>
-                                               <executions>
-                                                       <execution>
-                                                               <id>prepare-source</id>
-                                                               <phase>package</phase>
-                                                               <goals>
-                                                                       <goal>single</goal>
-                                                               </goals>
-                                                               <configuration>
-                                                                       <descriptorRefs>
-                                                                               <descriptorRef>a2-source</descriptorRef>
-                                                                       </descriptorRefs>
-                                                               </configuration>
-                                                       </execution>
-                                               </executions>
-                                       </plugin>
-<!--                                   <plugin> -->
-<!--                                           <groupId>org.apache.maven.plugins</groupId> -->
-<!--                                           <artifactId>maven-dependency-plugin</artifactId> -->
-<!--                                           <executions> -->
-<!--                                                   <execution> -->
-<!--                                                           <id>copy-argeo</id> -->
-<!--                                                           <phase>package</phase> -->
-<!--                                                           <goals> -->
-<!--                                                                   <goal>copy-dependencies</goal> -->
-<!--                                                           </goals> -->
-<!--                                                           <configuration> -->
-<!--                                                                   <includeTypes>jar</includeTypes> -->
-<!--                                                                   <outputDirectory>${project.build.directory}/lib-argeo</outputDirectory> -->
-<!--                                                                   <includeGroupIds>org.argeo.suite</includeGroupIds> -->
-<!--                                                                   <includeTypes>jar</includeTypes> -->
-<!--                                                                   <includeScope>runtime</includeScope> -->
-<!--                                                                   <useRepositoryLayout>true</useRepositoryLayout> -->
-<!--                                                           </configuration> -->
-<!--                                                   </execution> -->
-<!--                                           </executions> -->
-<!--                                   </plugin> -->
-                                       <plugin>
-                                               <groupId>org.codehaus.mojo</groupId>
-                                               <artifactId>rpm-maven-plugin</artifactId>
-                                               <executions>
-                                                       <execution>
-                                                               <id>rpm-argeo</id>
-                                                               <phase>package</phase>
-                                                               <goals>
-                                                                       <goal>rpm</goal>
-                                                               </goals>
-                                                               <configuration>
-                                                                       <name>argeo-suite</name>
-                                                                       <mappings>
-                                                                               <mapping>
-                                                                                       <directory>/usr/share/osgi</directory>
-                                                                                       <username>root</username>
-                                                                                       <groupname>root</groupname>
-                                                                                       <filemode>644</filemode>
-                                                                                       <directoryIncluded>true</directoryIncluded>
-                                                                                       <sources>
-                                                                                               <source>
-                                                                                                       <location>${project.build.directory}/${project.artifactId}-${project.version}-a2-source</location>
-                                                                                                       <includes>
-                                                                                                               <include>**/*.jar</include>
-                                                                                                       </includes>
-                                                                                               </source>
-                                                                                       </sources>
-                                                                               </mapping>
-                                                                       </mappings>
-                                                                       <requires>
-                                                                               <require>argeo-connect</require>
-                                                                       </requires>
-                                                               </configuration>
-                                                       </execution>
-                                               </executions>
-                                       </plugin>
-                               </plugins>
-                       </build>
-               </profile>
        </profiles>
 </project>

diff --git a/dist/argeo-office/pom.xml b/dist/argeo-office/pom.xml
index ed611ba371e4a06cebf838a6fcebe2b6dba6f03c..554addbf2c019bac392cdf5abb8cede01b9e6f2f 100644 (file)
--- a/dist/argeo-office/pom.xml
+++ b/dist/argeo-office/pom.xml
@@ -11,6 +11,18 @@
        <artifactId>argeo-office</artifactId>
        <packaging>pom</packaging>
        <name>Argeo Office</name>
+       <dependencies>
+               <dependency>
+                       <groupId>org.argeo.suite</groupId>
+                       <artifactId>org.argeo.suite.standard</artifactId>
+                       <version>0.1.13-SNAPSHOT</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.suite</groupId>
+                       <artifactId>org.argeo.suite.tracker</artifactId>
+                       <version>0.1.13-SNAPSHOT</version>
+               </dependency>
+       </dependencies>
        <profiles>
                <profile>
                        <id>dist</id>
@@ -62,6 +74,23 @@
                        <id>rpmbuild</id>
                        <build>
                                <plugins>
+                                       <plugin>
+                                               <artifactId>maven-assembly-plugin</artifactId>
+                                               <executions>
+                                                       <execution>
+                                                               <id>prepare-source</id>
+                                                               <phase>package</phase>
+                                                               <goals>
+                                                                       <goal>single</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       <descriptorRefs>
+                                                                               <descriptorRef>a2-source</descriptorRef>
+                                                                       </descriptorRefs>
+                                                               </configuration>
+                                                       </execution>
+                                               </executions>
+                                       </plugin>
                                        <plugin>
                                                <groupId>org.codehaus.mojo</groupId>
                                                <artifactId>rpm-maven-plugin</artifactId>
@@ -92,6 +121,21 @@
                                                                                                </source>
                                                                                        </sources>
                                                                                </mapping>
+                                                                               <mapping>
+                                                                                       <directory>/usr/share/osgi</directory>
+                                                                                       <username>root</username>
+                                                                                       <groupname>root</groupname>
+                                                                                       <filemode>644</filemode>
+                                                                                       <directoryIncluded>true</directoryIncluded>
+                                                                                       <sources>
+                                                                                               <source>
+                                                                                                       <location>${project.build.directory}/${project.artifactId}-${project.version}-a2-source</location>
+                                                                                                       <includes>
+                                                                                                               <include>**/*.jar</include>
+                                                                                                       </includes>
+                                                                                               </source>
+                                                                                       </sources>
+                                                                               </mapping>
                                                                        </mappings>
                                                                        <requires>
                                                                                <require>argeo-node</require>

diff --git a/dist/pom.xml b/dist/pom.xml
index 516e3c37f45387aff670a0f19c9be9fa8e0dfb5e..e1251efcc86582c9975ab0d976a76509966d24fd 100644 (file)
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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.suite</groupId>
@@ -13,4 +15,21 @@
        <modules>
                <module>argeo-office</module>
        </modules>
+       <build>
+               <plugins>
+                       <plugin>
+                               <artifactId>maven-assembly-plugin</artifactId>
+                               <dependencies>
+                                       <dependency>
+                                               <groupId>org.argeo.commons</groupId>
+                                               <artifactId>assembly-descriptors</artifactId>
+                                               <version>${version.argeo-commons}</version>
+                                       </dependency>
+                               </dependencies>
+                               <configuration>
+                                       <attach>false</attach>
+                               </configuration>
+                       </plugin>
+               </plugins>
+       </build>
 </project>